From 251c8d5cb6f8f29164d292a193e2002d37f08787 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sun, 3 Mar 2024 18:29:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=85=92=E9=81=93?=
 =?UTF-8?q?=E9=A6=86=E7=99=BB=E5=BD=95=E5=90=8E=20=E7=AB=8B=E5=8D=B3?=
 =?UTF-8?q?=E8=BF=9B=E8=B4=A7=E8=8E=B7=E5=8F=96=E5=95=86=E6=88=B7id?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=EF=BC=8C=E5=AF=BC=E8=87=B4=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E4=B8=8B=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/users/order_confirm/index.vue | 6 +++++-
 store/modules/app.js                | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 0136e56..042edb7 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -421,7 +421,9 @@
 </template>
 <script>
 
-	let app = getApp();
+	import Cache from "../../../utils/cache";
+
+  let app = getApp();
   import {createOrder, getOrderConfirm} from '@/api/order.js';
   import {getAddressDetail, getAddressList, getAgreementApi, getUserInfo} from '@/api/user.js';
   import {openPaySubscribe} from '@/utils/SubscribeMessage.js';
@@ -644,6 +646,8 @@
 		onLoad: function(options) {
       this.is_with_goods = options.is_with_goods || 0;
       if(this.is_with_goods){
+        console.log('shopmerid：', this.shopMerId)
+        console.log('shopmerid-cache：', Cache.get('SHOP_MER_ID') || null)
         getStoreDetail(this.shopMerId).then(res => {
           this.withGoodsMerInfo = res.data;
         });
diff --git a/store/modules/app.js b/store/modules/app.js
index b9eeb17..25d4249 100644
--- a/store/modules/app.js
+++ b/store/modules/app.js
@@ -34,9 +34,10 @@ const mutations = {
 		uni.removeStorageSync('auth_token');
 	},
 	SHOP_LOGIN(state, opt) {
+		state.shopToken = opt.token;
+		state.shopMerId = opt.shop_mer_id;
 		Cache.set('SHOP_LOGIN_STATUS_TOKEN', opt.token, opt.time);
 		Cache.set('SHOP_MER_ID', opt.shop_mer_id);
-		state.shopToken = opt.token;
 	},
 	SETUID(state,val){
 		state.uid = val;