From 3a547b90cd7a5cbc7dff83b7c23a7d741249f8cb Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 27 Oct 2023 15:58:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E4=BD=8D=E4=B8=8D?=
 =?UTF-8?q?=E5=88=B0=E6=97=B6=E6=97=A0=E6=B3=95=E6=8E=A8=E8=8D=90=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/supply_chains/supply_chains.vue | 28 ++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 87784d2..e0e05c5 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -140,7 +140,7 @@
 			<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
 				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
 			</view>
-      <view class='loadingicon acea-row row-center-wrapper' v-else>
+      <view class='loadingicon acea-row row-center-wrapper' v-if='productList2.length > 0||loading2'>
       	<text class='loading iconfont icon-jiazai' :hidden='loading2==false'></text>{{loadTitle2}}
       </view>
 			<view class="empty_wrapper" v-if="emptyShow">
@@ -291,7 +291,6 @@
 		},
 		
 		onReachBottom() {
-      console.log('ss');
 			if (this.productList.length > 0) {
 				setTimeout(() => {
 					this.list(false, this.street_id);
@@ -353,12 +352,20 @@
 			},
 			//获取商品列表
 			list(isPage, id) {
-        if(!id) return that.list2(true, ''); // 定位没有获取到时,直接推荐
+        // if(!id) return that.list2(true, ''); // 定位没有获取到时,直接推荐
 				let that = this;
 				if (that.loadend) return;
 				if (that.loading) return;
 
-				if (isPage === true) that.$set(that, 'productList', []);
+				if (isPage === true) {
+				  that.$set(that, 'productList', []);
+				  that.$set(that, 'where', {
+				    category_id: 0,
+				    page: 1,
+				    limit: 6
+				  })
+				}
+        that.$set(that, 'productList2', []);
 
 				that.loading = true;
 				that.loadTitle = '';
@@ -393,7 +400,15 @@
       	if (that.loadend2) return;
       	if (that.loading2) return;
       
-      	if (isPage === true) that.$set(that, 'productList2', []);
+      	if (isPage === true) {
+          that.$set(that, 'productList2', []);
+          that.$set(that, 'where2', {
+            category_id: 0,
+            page: 1,
+            limit: 6
+          })
+        }
+        that.$set(that, 'productList', []);
       
       	that.loading2 = true;
       	that.loadTitle2 = '';
@@ -573,6 +588,7 @@
 			selfLocation() {
 				if (uni.getStorageSync('loction') == true) {
 					this.isshow = false
+          this.list2(true,'')
 				} else {
 					this.isshow = true
 					uni.setStorageSync('loction', true);
@@ -603,6 +619,7 @@
 
 						}).catch(err => {
 							this.isshow = false
+              this.list2(true,'')
 							uni.showToast({
 								title: err,
 								icon: 'none'
@@ -610,6 +627,7 @@
 						})
 					},
 					fail: (err) => {
+            console.log('定位失败');
 						this.isshow = false
 						// uni.showToast({
 						// 	title: "获取定位超时",