From 65ed6707da0b7f4276a29899479ac78c85b5c937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B0=8F=E5=BC=A0?= <1085577365@qq.com> Date: Wed, 24 May 2023 19:15:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=90=8E=E5=8F=B0--=E8=BF=90=E8=B4=B9?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=9A=E9=85=8D=E9=80=81=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../express/ShippingTemplatesFreeMapper.xml | 18 +++++++++++++++++- .../ShippingTemplatesNoDeliveryMapper.xml | 18 +++++++++++++++++- .../express/ShippingTemplatesRegionMapper.xml | 18 +++++++++++++++++- 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml index 31a4a8431..b82a15ce5 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml @@ -3,6 +3,22 @@ diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml index c1b34165a..6b042f88e 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml @@ -3,6 +3,22 @@ diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml index 190b3e935..1aefe98c4 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml @@ -3,6 +3,22 @@ From 6fadb15d270178e2519c531f8e09c184dd1715a7 Mon Sep 17 00:00:00 2001 From: Jruome <2559028966@qq.com> Date: Wed, 24 May 2023 19:59:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?uniapp=20=E8=AF=9D=E8=B4=B9=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../freightSet/creatTemplates.vue | 13 +- yudao-ui-app/pages/member_back/index.vue | 184 +++++------------- yudao-ui-app/pages/member_equity/index.vue | 14 +- yudao-ui-app/pages/member_record/index.vue | 38 ++-- 4 files changed, 85 insertions(+), 164 deletions(-) diff --git a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue index 4b520501f..c32814375 100644 --- a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue +++ b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue @@ -375,7 +375,7 @@ export default { logistics.shippingRegion({ tempId: this.tempId }).then(res => { res.data.forEach((item, index) => { // item.title = JSON.parse(item.title) - item.city_ids = item.title + item.city_ids = JSON.parse(item.title) }) this.ruleForm.region = res.data }) @@ -385,10 +385,9 @@ export default { logistics.shippingFree({ tempId: this.tempId }).then(res => { res.data.forEach((item, index) => { // item.title = JSON.parse(item.title) - item.city_ids = item.cityId.split(',') + item.city_ids = JSON.parse(item.title) }) this.ruleForm.free = res.data - console.log(this.ruleForm.free ) }) }, @@ -462,9 +461,11 @@ export default { } this.ruleForm.region.forEach((el, index) => { if(el.city_ids.length > 0){ - el.cityId = JSON.stringify(el.city_ids) + el.title = JSON.stringify(el.city_ids) + el.cityId = el.city_ids.join(",") }else{ el.cityId = 'all' + el.title = 0 } }) param.shippingTemplatesRegionRespVOList = this.ruleForm.region @@ -484,9 +485,11 @@ export default { if (this.ruleForm.appoint) { this.ruleForm.free.forEach((el, index) => { if(el.city_ids.length > 0){ - el.cityId = JSON.stringify(el.city_ids) + el.title = JSON.stringify(el.city_ids) + el.cityId = el.city_ids.join(",") }else{ el.cityId = 'all' + el.title = 0 } }) param.shippingTemplatesFreeRespVOList = this.ruleForm.free diff --git a/yudao-ui-app/pages/member_back/index.vue b/yudao-ui-app/pages/member_back/index.vue index 188fd6127..6eded3d16 100644 --- a/yudao-ui-app/pages/member_back/index.vue +++ b/yudao-ui-app/pages/member_back/index.vue @@ -1,30 +1,16 @@ @@ -81,15 +67,15 @@ list: [ { img:'../../static/images/member240.png', - name:'360' + name:360 }, { img:'../../static/images/member400.png', - name:'600' + name:600 }, { img:'../../static/images/member960.png', - name:'900' + name:900 }, ], vipData:['普通会员','中级会员','高级会员'], @@ -99,24 +85,8 @@ }; }, computed: mapGetters(['userInfo']), - async onLoad() { - const resful = await memberGradeInfo() - if(resful.data.some((item) => !!parseInt(item.isExist))){ - uni.setTabBarItem({ - index: 0, - pagePath: '/pages/member_equity/index' - }) - }else{ - uni.setTabBarItem({ - index: 0, - pagePath: '/pages/member_application/index' - }) - uni.switchTab({ - url:'/pages/member_application/index' - }) - } - const res = await memberHeadInfo() - this.memberDetail = res.data + async onLoad(options) { + this.memberDetail = options const equity = await query(this.userInfo.mobile) this.equityData = equity.data }, @@ -153,7 +123,7 @@