From c2ff506543adda27a56012622ef0726bf0bbfe60 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Wed, 28 Aug 2024 17:07:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E5=BC=B9=E7=AA=97=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/popupad.vue          | 1 +
 pages/index/index.vue           | 4 +---
 pages/index/indexs.vue          | 6 +++++-
 pages/member/index.vue          | 2 +-
 pages/member/memberdetails.vue  | 3 ++-
 pages/order/order.vue           | 1 +
 pages/order_food/order_food.vue | 6 +++++-
 pages/user/user.vue             | 4 +++-
 8 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/components/popupad.vue b/components/popupad.vue
index af3224e..e5498fb 100644
--- a/components/popupad.vue
+++ b/components/popupad.vue
@@ -53,6 +53,7 @@
 		},
 		watch: {
 		    forceUpdate(val,oldval) {
+				console.log(val,oldval)
 				// 在 forceUpdate 改变时执行更新操作
 				let time = uni.cache.get('popUpTime') ? new Date().getTime() - uni.cache.get('popUpTime') : 1000;
 				if ( time >= 1000 ) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 447c437..e78771f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -338,7 +338,6 @@
 		},
 		async onShow() {
 			// 判断显示那个页面
-			
 			if (uni.cache.get('shopUser') && uni.cache.get('token')) {
 				this.showindex = false
 				uni.cache.set('types', 'index');
@@ -351,10 +350,9 @@
 					uni.cache.set('shopUserInfo',this.usershopUserinfo)
 				}
 				this.loginwxuserInfo()  //个人信息接口
-				if ( !uni.cache.get('forceUpdate') ) {
+				if (  uni.cache.get('forceUpdate') == 1) {
 					this.forceUpdate = !this.forceUpdate;
 				}
-				uni.cache.set('forceUpdate',false)
 				this.getShopExtend()
 				this.timersetInterval = '0'
 			} else {
diff --git a/pages/index/indexs.vue b/pages/index/indexs.vue
index 151bba3..9650131 100644
--- a/pages/index/indexs.vue
+++ b/pages/index/indexs.vue
@@ -62,18 +62,22 @@
 		methods: {
 			scanCodehandle(i) {
 				console.log(1)
+				setTimeout(()=>{
+					uni.cache.set('forceUpdate',2)
+				},200)
 				if (i == 0) {
 					uni.scanCode({
 						success: (res) => {
 							let tableCode = this.getQueryString(decodeURIComponent(res.result), 'code')
 							uni.cache.set('tableCode', tableCode)
 							if (tableCode) {
-								uni.cache.set('forceUpdate',true)
 								uni.pro.navigateTo('order_food/order_food', {
 									// shopId_id: uni.cache.get('shopUser'),
 								})
 							}
 
+						},
+						fail: () => {
 						}
 					})
 				} else {
diff --git a/pages/member/index.vue b/pages/member/index.vue
index 98c817c..17970a5 100644
--- a/pages/member/index.vue
+++ b/pages/member/index.vue
@@ -126,7 +126,7 @@
 			// 	this.shopId = e.shopId;
 			// 	this.init();
 			// }
-			console.log(e)
+			uni.cache.set('forceUpdate',1)
 			if (e.q) {
 				this.shopId = this.getQueryString(decodeURIComponent(e.q), 'shopId')
 				this.tokenShow = false;
diff --git a/pages/member/memberdetails.vue b/pages/member/memberdetails.vue
index ce852db..a9e2303 100644
--- a/pages/member/memberdetails.vue
+++ b/pages/member/memberdetails.vue
@@ -99,7 +99,8 @@
 			}
 		},
 		onLoad(e) {
-			this.shopId_id = e.shopId_id
+			this.shopId_id = e.shopId_id;
+			uni.cache.set('forceUpdate',1)
 		},
 		onShow() {
 			this.init();
diff --git a/pages/order/order.vue b/pages/order/order.vue
index a6c7567..5a795bd 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -209,6 +209,7 @@
 			}
 			this.swiperCurrent = ''
 			this.init_fn()
+			uni.cache.set('forceUpdate',1)
 		},
 		onReachBottom() {
 			if (this.navtabindex == 1) {
diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue
index 7e96b6f..cbe261a 100644
--- a/pages/order_food/order_food.vue
+++ b/pages/order_food/order_food.vue
@@ -474,8 +474,8 @@
 		},
 		async onShow() {
 			let _this = this;
-			this.forceUpdate = !this.forceUpdate;
 			this.orderdetailFlag = true;
+		
 			uni.pageScrollTo({
 				scrollTop: 0,
 				duration: 0
@@ -1115,6 +1115,10 @@
 					setTimeout(() => {
 						this.getElementTop();
 					}, 500);
+					this.forceUpdate = !this.forceUpdate;
+					setTimeout(()=>{
+						uni.cache.set('forceUpdate',1);
+					},300)
 				}
 			},
 
diff --git a/pages/user/user.vue b/pages/user/user.vue
index f24a532..02d6c8a 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -73,7 +73,9 @@
 				shopExtend: null,
 			};
 		},
-		onLoad() {},
+		onLoad() {
+			uni.cache.set('forceUpdate',1)
+		},
 		computed: {
 			HeighT() { //手机类型的尺寸
 				return this.$store.getters.is_BarHeight