diff --git a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue
index 4fbafa4d8..4b520501f 100644
--- a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue
+++ b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue
@@ -374,7 +374,7 @@ export default {
shippingRegion() {
logistics.shippingRegion({ tempId: this.tempId }).then(res => {
res.data.forEach((item, index) => {
- item.title = JSON.parse(item.title)
+ // item.title = JSON.parse(item.title)
item.city_ids = item.title
})
this.ruleForm.region = res.data
diff --git a/yudao-ui-app/pages.json b/yudao-ui-app/pages.json
index f8d4d0e20..2d84fc156 100644
--- a/yudao-ui-app/pages.json
+++ b/yudao-ui-app/pages.json
@@ -589,15 +589,15 @@
{
"pagePath": "pages/index/index",
"iconPath": "static/images/tabbar/nav_icon_shop.png",
- "selectedIconPath": "static/images/1-002.png",
+ "selectedIconPath": "static/images/tabbar/nav_icon_shop_active.png",
"text": "商城"
},
- // {
- // "pagePath": "pages/goods_cate/goods_cate",
- // "iconPath": "static/images/tabbar/nav_icon_sort.png",
- // "selectedIconPath": "static/images/2-002.png",
- // "text": "分类"
- // },
+ {
+ "pagePath": "pages/goods_cate/goods_cate",
+ "iconPath": "static/images/tabbar/nav_icon_sort.png",
+ "selectedIconPath": "static/images/tabbar/nav_icon_sort_active.png",
+ "text": "分类"
+ },
{
"pagePath": "pages/member_application/index",
"iconPath": "static/images/tabbar/nav_icon_member.png",
diff --git a/yudao-ui-app/pages/member_application/index.vue b/yudao-ui-app/pages/member_application/index.vue
index 92b2bcd13..076524845 100644
--- a/yudao-ui-app/pages/member_application/index.vue
+++ b/yudao-ui-app/pages/member_application/index.vue
@@ -58,16 +58,6 @@
},
data() {
return {
- // list: [
- // {
- // name:'购买记录',
- // fontSize:'28'
- // },
- // {
- // name:'为他人充值',
- // fontSize:'28'
- // },
- // ],
memberData: [],
payInfo: {
userPhone: '',
@@ -106,7 +96,7 @@
const res = await memberGradeInfo()
if(res.data.some((item) => !!parseInt(item.isExist))){
uni.setTabBarItem({
- index: 0,
+ index: 2,
pagePath: '/pages/member_equity/index'
})
uni.switchTab({
@@ -114,7 +104,7 @@
})
}else{
uni.setTabBarItem({
- index: 0,
+ index: 2,
pagePath: '/pages/member_application/index'
})
}
diff --git a/yudao-ui-app/pages/member_back/index.vue b/yudao-ui-app/pages/member_back/index.vue
new file mode 100644
index 000000000..188fd6127
--- /dev/null
+++ b/yudao-ui-app/pages/member_back/index.vue
@@ -0,0 +1,419 @@
+
+
+
+
+ {{memberDetail.grade}}
+
+ {{userInfo.mobile}}
+ 会员积分:{{memberDetail.integral}}
+
+ 再升1级即可获得【XX】等6项权益
+
+
+ 购买记录
+
+
+
+ 为他人充值
+
+
+
+
+
+
+ 会员等级{{vipData.findIndex((item) => item == memberDetail.grade) +1}}级
+
+
+
+
+
+
+
+ 我的会员权益
+
+ 查看权益>
+
+
+
+
+ 办理日期:{{item.startTime}}
+
+
+
+ 已返回金额(元)
+
+ {{item.totalMoney}}
+ 查看明细>
+
+
+
+ 带返还金额 (元)
+ {{list[list.findIndex((i) => item.gear == i.name)].name-item.totalMoney}}
+
+
+ 带返还期额
+ {{item.frequency}}x12
+
+
+ 返费结束时间
+ {{item.endTime}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yudao-ui-app/pages/member_equity/index.vue b/yudao-ui-app/pages/member_equity/index.vue
index 31cf1db87..c928c5bbf 100644
--- a/yudao-ui-app/pages/member_equity/index.vue
+++ b/yudao-ui-app/pages/member_equity/index.vue
@@ -103,12 +103,12 @@
const resful = await memberGradeInfo()
if(resful.data.some((item) => !!parseInt(item.isExist))){
uni.setTabBarItem({
- index: 0,
+ index: 2,
pagePath: '/pages/member_equity/index'
})
}else{
uni.setTabBarItem({
- index: 0,
+ index: 2,
pagePath: '/pages/member_application/index'
})
uni.switchTab({
@@ -117,8 +117,7 @@
}
const res = await memberHeadInfo()
this.memberDetail = res.data
- // this.userInfo.mobile
- const equity = await query(13668261228)
+ const equity = await query(this.userInfo.mobile)
this.equityData = equity.data
},
methods: {