修复：酒道馆登录后 立即进货获取商户id失败，导致不能正常下单

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;
         });

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;