From f63e22e9ba2aada2422ac2aded6eda24437f9cf4 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Wed, 8 Nov 2023 10:56:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=98=E5=8C=96,=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WaterfallsFlowItemo.vue | 4 +- pages.json | 3 +- pages/index/index.vue | 1 - pages/nongKe/cloud_entrepot/indexa.vue | 4 +- pages/nongKe/supply_chain/supplier.vue | 93 ++++++++++++++++-- pages/nongKe/supply_chain/supplierA.vue | 97 ++++++++++++++++--- pages/supply_chains/supply_chains.vue | 4 +- 7 files changed, 178 insertions(+), 28 deletions(-) diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue b/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue index 81ce532..e99906e 100644 --- a/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue +++ b/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue @@ -25,6 +25,9 @@ {{item.reply_count}}评论 + + {{item.merchant&&item.merchant.distance}} + ￥{{item.price.split('.')[0]}}.{{item.price.split('.')[1]}} @@ -156,7 +159,6 @@ font-family: SF Pro Display-Regular Italic, SF Pro Display; font-weight: 600; color: #FF6D20; - } .relase-two { diff --git a/pages.json b/pages.json index f1d6895..63d5e01 100644 --- a/pages.json +++ b/pages.json @@ -140,7 +140,8 @@ "style": { "navigationBarTitleText": "供应", "enablePullDownRefresh": true, - "navigationStyle": "custom" + "navigationStyle": "custom", + "onReachBottomDistance": 300 } }, { diff --git a/pages/index/index.vue b/pages/index/index.vue index a78079e..99c04e7 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -686,7 +686,6 @@ export default { uni.setStorageSync('loction', true); } if(this.$store.state.storage.location.lat){ - console.log('定位失败'); this.isshow = false let latitude, longitude; latitude = this.$store.state.storage.location.lat.toString(); diff --git a/pages/nongKe/cloud_entrepot/indexa.vue b/pages/nongKe/cloud_entrepot/indexa.vue index 3c7e693..7804e76 100644 --- a/pages/nongKe/cloud_entrepot/indexa.vue +++ b/pages/nongKe/cloud_entrepot/indexa.vue @@ -243,7 +243,7 @@ - @@ -556,7 +556,7 @@ order: this.type, keyword: this.keyword, page: this.page_num, - location: this.location + location: this.location }).then(res => { if (res.data.list.length == 0) { this.status = "nomore" diff --git a/pages/nongKe/supply_chain/supplier.vue b/pages/nongKe/supply_chain/supplier.vue index d5e2fa5..c6b5af8 100644 --- a/pages/nongKe/supply_chain/supplier.vue +++ b/pages/nongKe/supply_chain/supplier.vue @@ -95,7 +95,7 @@ - {{item.category_name}} @@ -117,11 +117,18 @@ style="font-weight: normal;font-size: 19.28rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}} - - 5.0 + + + + + + + + {{item.service_score}} 月销{{item.sales}} - 距离{{item.distance}} + {{item.distance}} @@ -363,7 +370,9 @@ getDiy } from '@/api/api.js' - + import { + HTTP_REQUEST_URL + } from '@/config/app'; import Cache from '@/utils/cache'; const app = getApp(); @@ -375,6 +384,7 @@ }, data() { return { + domain: HTTP_REQUEST_URL, defaInd: [0, 0], columnData: [], showSerch: false, @@ -479,7 +489,7 @@ this.street_id = options.street_id this.street = options.townName this.product_type = options.product_type ?? 0 - if(this.$store.state.storage.location.lat){ + if(this.$store.state.storage?.location?.lat){ this.latitude = this.$store.state.storage.location.lat; this.longitude = this.$store.state.storage.location.long; } @@ -531,7 +541,7 @@ mer_location: 0, store_street_theme: 1, hide_mer_status: '', - }, mapGetters(['viewColor'])), + }, mapGetters(['viewColor', 'keyColor'])), }, methods: { selectLocation() { @@ -776,15 +786,40 @@ }, selfLocation() { let self = this - if (uni.getStorageSync('RejectTarget')) return - uni.getLocation({ + if (uni.getStorageSync('RejectTarget')) return; + if(this.$store?.state?.storage?.location?.lat){ + this.latitude = this.$store?.state?.storage?.location?.lat; + this.longitude = this.$store?.state?.storage?.location?.long; + getGeocoder({ + lat: this.latitude, + long: this.longitude + }).then(res => { + // console.log(res) + this.detaile_address = res.data.address; + this.location_address = res.data.address; + this.recommend_address = res.data.address.length > 4 ? res.data.address + .slice(0, 4) + '...' : + res.data.address + }).catch(err => { + uni.showToast({ + title: err, + icon: 'none' + }) + }) + } + else uni.getLocation({ type: 'gcj02', success: (res) => { + console.log('定位'); let latitude, longitude; latitude = res.latitude.toString(); longitude = res.longitude.toString(); this.latitude = res.latitude.toFixed(6); this.longitude = res.longitude.toFixed(6); + this.$store.commit('setLocation', { + lat: res.latitude.toFixed(6), + long: res.longitude.toFixed(6), + }); getGeocoder({ lat: latitude, long: longitude @@ -1628,4 +1663,42 @@ box-sizing: border-box; padding: 0 20rpx; } + .score { + display: flex; + align-items: center; + font-weight: 500; + font-size: 24rpx; + line-height: 1; + color: #000; + + .score-title { + margin-right: 15rpx; + + } + .score_text{ + color: #fd5d2e; + } + + .star { + position: relative; + width: 111rpx; + height: 19rpx; + margin-right: 10rpx; + background: url(../../columnGoods/images/star.png) left top/100% 100% no-repeat; + overflow: hidden; + + view { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: url(../../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat; + + &.star_purple { + background: url(../../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat; + } + } + } + } \ No newline at end of file diff --git a/pages/nongKe/supply_chain/supplierA.vue b/pages/nongKe/supply_chain/supplierA.vue index 028538e..2caf81f 100644 --- a/pages/nongKe/supply_chain/supplierA.vue +++ b/pages/nongKe/supply_chain/supplierA.vue @@ -63,10 +63,16 @@ style="font-weight: normal;font-size: 19.28rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}} - - 5.0 - 月销2000+ + + + + + + + {{item.service_score}} + 月销{{item.sales}} + {{item.distance}} { + // console.log(res) + this.detaile_address = res.data.address; + this.location_address = res.data.address; + this.recommend_address = res.data.address.length > 4 ? res.data.address + .slice(0, 4) + '...' : + res.data.address + }).catch(err => { + uni.showToast({ + title: err, + icon: 'none' + }) + }) + } + else uni.getLocation({ type: 'gcj02', success: (res) => { let latitude, longitude; latitude = res.latitude.toString(); longitude = res.longitude.toString(); - this.latitude = res.latitude - this.longitude = res.longitude + this.latitude = res.latitude; + this.longitude = res.longitude; + this.$store.commit('setLocation', { + lat: res.latitude.toFixed(6), + long: res.longitude.toFixed(6), + }); getGeocoder({ lat: latitude, long: longitude @@ -1341,4 +1378,42 @@ transform: translateY(-50%); } + .score { + display: flex; + align-items: center; + font-weight: 500; + font-size: 24rpx; + line-height: 1; + color: #000; + + .score-title { + margin-right: 15rpx; + + } + .score_text{ + color: #fd5d2e; + } + + .star { + position: relative; + width: 111rpx; + height: 19rpx; + margin-right: 10rpx; + background: url(../../columnGoods/images/star.png) left top/100% 100% no-repeat; + overflow: hidden; + + view { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background: url(../../columnGoods/images/star_active.png) left top/111rpx 19rpx no-repeat; + + &.star_purple { + background: url(../../columnGoods/images/star_active_purple.png) left top/111rpx 19rpx no-repeat; + } + } + } + } \ No newline at end of file diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue index e9ca1fd..8d2cd5c 100644 --- a/pages/supply_chains/supply_chains.vue +++ b/pages/supply_chains/supply_chains.vue @@ -298,12 +298,12 @@ setTimeout(() => { this.list(false, this.street_id); this.productList2 = []; - }, 500) + }, 50) } else if (this.productList2.length > 0) { setTimeout(() => { this.list2(false, ''); - }, 500) + }, 50) } }, beforeDestroy() {