细节优化

components/toolBox/toolBox.vue

@@ -18,6 +18,9 @@
 			value:{
 				type:Boolean,
 				default:true
+			},
+			storeId:{
+				type: [String, Number]
 			}
 		},
 		data() {
@@ -58,7 +61,8 @@
 				],
 				timer:null,
 				orderInfo:{},
-				servicePhone:''
+				servicePhone:'',
+				
 			};
 		},
 		watch:{
@@ -74,7 +78,6 @@
 				}else{
 					this.show = val
 				}
-				
 			}
 		},
 		mounted() {
@@ -100,9 +103,9 @@
 					this.onGetOrderByAvailable(val.value)
 					return
 				}
-				if(val.routePath){
+				if(val.value===1){
 					uni.navigateTo({
-						url:val.routePath
+						url:val.routePath+'?storeId='+this.storeId
 					})
 				}
 			},

pages/couponCheck/couponCheck.vue

@@ -124,8 +124,11 @@
 				return moment(val).format("YYYY-MM-DD HH:mm:ss") 
 			}
 		},
-		onLoad() {
-			 // this.$refs.popup.open();
+		onLoad(option) {
+			console.log(option,"canshu")
+			if(option&&option.storeId){
+				this.storeId = option.storeId;
+			}
 			 this.eventChannel = this.getOpenerEventChannel();
 			 this.eventChannel.on('acceptDataFromOpenerPage', (data) => {
 				 console.log(data,99999)
@@ -156,6 +159,7 @@
 					title:'加载中...'
 				})
 				getStoreListByCouponCode({
+					storeId: uni.getStorageSync('storeId') || this.storeId,
 					code: this.qrCode,
 					longitude:uni.getStorageSync("longitude"),
 					latitude:uni.getStorageSync("latitude")

pages/index/index.vue

@@ -153,7 +153,7 @@
 				</view>
 			</view>
 		</scroll-view>
-		<ToolBox v-model="show" />
+		<ToolBox v-model="show" :storeId="storeInfo.id" />
 		<uni-popup ref="popup" type="bottom">
 			<view class="flex-col location-box">
 				<view class="flex-col content-box">
@@ -237,7 +237,9 @@
 				scrollTop: 0,
 				storeId: '',
 				storeList: [],
-				storeInfo: {},
+				storeInfo: {
+					id:''
+				},
 				statusBarHeight: this.statusBarHeight,
 				hostUrl: config.hostUrl,
 				assetsPath: config.assetsPath,

pages/order/order.vue

@@ -1374,7 +1374,7 @@
 			onNavToCheckedCoupon() {
 				let that = this;
 				uni.navigateTo({
-					url: "/pages/couponCheck/couponCheck?openShopUuid=" + this.roomInfo.openShopUuid,
+					url: "/pages/couponCheck/couponCheck?storeId=" + this.roomInfo.storeId,
 					success: (res) => {
 						res.eventChannel.emit('acceptDataFromOpenerPage', { 
 							orderPage:true ,