From 9a3937e98793f06223733f66d1eaba6756585e59 Mon Sep 17 00:00:00 2001 From: jia <1451658316@qq.com> Date: Mon, 4 Sep 2023 18:07:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=88=91=E7=9A=84=E5=BA=97=E9=93=BA=E7=B1=BB=E5=9E=8B=EF=BC=8C?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8D=E4=BC=98=E7=89=B9=E4=BA=A7=20?= =?UTF-8?q?=E3=80=81=E7=89=B9=E8=89=B2=E6=96=87=E6=97=85=E3=80=81=E5=BD=93?= =?UTF-8?q?=E5=9C=B0=E7=BE=8E=E9=A3=9F=E7=AD=89=E7=95=8C=E9=9D=A2=E5=8F=8A?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BB=8E=E4=BE=9B=E5=BA=94=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E8=BF=9B=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/zbpSwiper.vue | 20 +- pages.json | 10 + pages/columnGoods/goods_search_con/index.vue | 6 +- pages/gather/gather.vue | 26 +- pages/index/index.vue | 28 +- pages/nongKe/supply_chain/suppliers.vue | 1144 ++++++++++++++++++ pages/supply_chains/supply_chains.vue | 46 +- pages/users/online_warehousing/index.vue | 16 +- 8 files changed, 1237 insertions(+), 59 deletions(-) create mode 100644 pages/nongKe/supply_chain/suppliers.vue diff --git a/components/zbpSwiper.vue b/components/zbpSwiper.vue index 941ae5c..dc15f5e 100644 --- a/components/zbpSwiper.vue +++ b/components/zbpSwiper.vue @@ -31,7 +31,7 @@ indicator-active-color="#fff"> - + @@ -115,9 +115,6 @@ }, mounted() { - uni.$on('add', (res) => { - this.street = res.split(',')[0] - }) this.$bus.$on('value-updated', (newValue) => { // 更新组件的值 this.street = newValue.split(',')[0] @@ -142,17 +139,12 @@ this.$emit('selectPlce', e) this.$emit('change', e) this.street = e.value[1].name - // this.$nextTick(() => { - // uni.$emit('add', e.value[1].name + ',' + e.value[1].code) - // this.$bus.$emit('value-updated', - // e.value[1].name + ',' + - // e.value[1].code); - // }) + this.$nextTick(() => { + this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code); + + }) - uni.$emit('add', e.value[1].name + ',' + e.value[1].code) - this.$bus.$emit('value-updated', - e.value[1].name + ',' + - e.value[1].code); + }, changeHandler(e) { diff --git a/pages.json b/pages.json index f21afa3..1c66d0a 100644 --- a/pages.json +++ b/pages.json @@ -216,6 +216,16 @@ "navigationStyle": "custom" } + }, + { + "path": "supply_chain/suppliers", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#e93323", + "navigationStyle": "custom" + } + }, { "path": "supply_chain/maps", "style": { diff --git a/pages/columnGoods/goods_search_con/index.vue b/pages/columnGoods/goods_search_con/index.vue index 9cf093b..cdd6ad6 100644 --- a/pages/columnGoods/goods_search_con/index.vue +++ b/pages/columnGoods/goods_search_con/index.vue @@ -559,9 +559,10 @@ limit: this.sotreParam.limit, order: this.sotreParam.order, category_id: this.sotreParam.category_id, - type_id: 10 + type_id: this.sotreParam.type_id } + console.log(this.sotreParam.category_id) if (this.latitude) { serachData.location = this.latitude + ',' + this.longitude } @@ -576,7 +577,7 @@ this.storeList = this.storeList.concat(res.data.list) this.count = res.data.count this.loading = false - console.log(this.storeList); + }) }, // 店铺排序 @@ -682,6 +683,7 @@ }, // 组件确定 confirm2(data) { + let arr1 = [], arr2 = [] if (data.storeTypeArr.length == 0) { diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index 503b70d..ef7c1dc 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -16,10 +16,10 @@ - - - + + 更多功能 {{editFlag?'完成':'编辑'}} @@ -57,6 +57,7 @@ + @@ -168,6 +169,10 @@ this.getUserInfo() uni.stopPullDownRefresh() }, + beforeDestroy () { + // 销毁监听事件 + this.$bus.$off('value-updated') + }, mounted() { if (this.street.length <= 0) { this.appLocation() @@ -333,11 +338,11 @@ }, confirm(e) { this.street = e.value[1].name - uni.setStorageSync('ADRESS_LOCATION', - e.value[1].name + ',' + e.value[1].name + ',' + - - e.value[1].code - ) + + this.$nextTick(() => { + this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code); + + }) this.showPicker = false }, appLocation() { @@ -357,7 +362,10 @@ let town = res.data.address_reference.town.title let street_id = res.data.address_reference.town.id this.street = res.data.address_component.street - uni.$emit('add', this.street + ',' + street_id) + this.$nextTick(() => { + this.$bus.$emit('value-updated',this.street + ',' +street_id); + + }) }).catch(err => { uni.showToast({ diff --git a/pages/index/index.vue b/pages/index/index.vue index d228d46..7f25d1b 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -44,22 +44,22 @@ - + - + - + {{item.title}} + mode="aspectFit" class="g_img"> {{item.author && item.author.nickname}} @@ -85,14 +85,14 @@ - + {{item.title}} + mode="aspectFit" class="g_img"> {{item.author && item.author.nickname}} @@ -401,11 +401,11 @@ confirm(e) { this.street = e.value[1].name - uni.setStorageSync('ADRESS_LOCATION', - e.value[1].name + ',' + - e.value[1].code - ) - uni.$emit('init', 1); + + this.$nextTick(() => { + this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code); + + }) this.showPicker = false }, changeHandler(e) { @@ -543,10 +543,12 @@ }).then(res => { let town = res.data.address_reference.town.title let street_id = res.data.address_reference.town.id - this.street = res.data.address_component.street - uni.$emit('add',town+','+street_id) + this.$nextTick(() => { + this.$bus.$emit('value-updated',this.street + ',' +street_id); + + }) }).catch(err => { uni.showToast({ title: err, diff --git a/pages/nongKe/supply_chain/suppliers.vue b/pages/nongKe/supply_chain/suppliers.vue new file mode 100644 index 0000000..d6dc7e4 --- /dev/null +++ b/pages/nongKe/supply_chain/suppliers.vue @@ -0,0 +1,1144 @@ + + + + + \ No newline at end of file diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue index 4f7fae3..9f1b4a5 100644 --- a/pages/supply_chains/supply_chains.vue +++ b/pages/supply_chains/supply_chains.vue @@ -95,7 +95,7 @@ - + - - + + - + - + + + + 已导入 + + + + 立即导入 + +