From 8105e633d4e9e03ecc9a5b43f8c902d78d26f041 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Sat, 4 Nov 2023 19:24:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/gather/gather.vue | 12 +++---- pages/nongKe/supply_chain/supplier.vue | 10 ++++-- pages/store/settled/index.vue | 45 +++++++++++++++++++------- pages/supply_chains/supply_chains.vue | 3 +- pages/user/index.vue | 3 +- 5 files changed, 49 insertions(+), 24 deletions(-) diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index 913bc68..4853fa3 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -403,12 +403,12 @@ case 1: uniMP.loadMP(data); break; - // case 2: uniMP.loadMPx(data); break; - case 2: - // this.navigator(data); - // uniMP.loadMPx(data); - that.navigator(`/pages/moreProject/moreProject`); - break; + case 2: uniMP.loadMPx(data); break; + // case 2: + // // this.navigator(data); + // // uniMP.loadMPx(data); + // that.navigator(`/pages/moreProject/moreProject`); + // break; case 3: uniMP.loadMPurl(data); diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue index 53f0a58..911fa8a 100644 --- a/pages/nongKe/supply_chain/supplier.vue +++ b/pages/nongKe/supply_chain/supplier.vue @@ -95,9 +95,9 @@ :key="index"> + > {{item.category_name}} + style="display: block;font-size: 26.29rpx;">{{item.category_name}} @@ -1013,7 +1013,11 @@ .menu_li { margin-right: 50rpx; // background-color: red; - width: 50vw; + // width: 50vw; + display: flex; + flex-direction: column; + align-items: center; + min-width: 15vw; // width: 120rpx; // display: inline-block; } diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index 4c09a5b..b643a76 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -68,8 +68,7 @@ 商户分类 - + @@ -275,6 +274,7 @@ create, verify, merClassifly, + getCategoryList, getGoodsDetails, updateGoodsRecord, getStoreTypeApi, @@ -353,6 +353,7 @@ category_name: '', merchant_category_id: '' }], + bindPickerChangeidx: 0, storeTypeArr: [{ type_name: '', mer_type_id: '' @@ -596,11 +597,17 @@ }, bindPickerChange: function(e) { this.index = e.target.value - let idx = e.target.value + let idx = e.target.value; this.merchantData.classification = this.array[idx]['merchant_category_id'] this.mer_classification = this.array[idx]['category_name'] this.validateBtn() }, + columnchange(e){ + // console.log(e.detail); + if(e.detail.column==0){ + this.bindPickerChangeidx = e.detail.value; + } + }, bindPickerChange1: function(e) { this.index1 = e.target.value @@ -647,15 +654,29 @@ }, // 获取商户分类 getClassfication: function() { - merClassifly() - .then(res => { - this.array = res.data - }) - .catch(res => { - this.$util.Tips({ - title: res - }); - }); + // merClassifly() + // .then(res => { + // this.array = res.data + // }) + // .catch(res => { + // this.$util.Tips({ + // title: res + // }); + // }); + getCategoryList() + .then(res => { + console.log(res); + res.data.list.forEach(item=>{ + item.category_name = item.cate_name; + item.merchant_category_id = item.store_category_id; + }) + this.array = res.data.list; + }) + .catch(res => { + this.$util.Tips({ + title: res + }); + }); }, // 获取店铺类型 getStoreType: function() { diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue index 6109390..41f84cd 100644 --- a/pages/supply_chains/supply_chains.vue +++ b/pages/supply_chains/supply_chains.vue @@ -609,12 +609,11 @@ this.isshow = false this.town = res.data.address_reference.town.title this.street_id = res.data.address_reference.town.id - this.street = res.data.address_component.street + this.street = res.data.address_reference.town.title; this.list(true,this.street_id) this.$nextTick(() => { this.$bus.$emit('value-updated', this.street + ',' + this .street_id); - }) }).catch(err => { diff --git a/pages/user/index.vue b/pages/user/index.vue index a1430db..b3bd460 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -602,8 +602,9 @@ orderData().then(({ data }) => { + // console.log(data); this.orderMenu.forEach((item, index) => { - // console.log('item') + // console.log(item) switch (item.title) { case '待付款': item.num = data.noPay