Merge branch 'master' of http://140.143.224.240:8100/hooloo/mp/user

components/OrderQrCode/index.vue

@@ -128,7 +128,7 @@ export default {
 			if(this.showMask) {
 				this.qrCode = '';
 			} else {
-				this.qrCode = 'https://t7.baidu.com/it/u=192737963,550444895&fm=218&app=126&size=f242,150&n=0&f=PNG?s=18AAE7177DCBF747466A567D03008078&sec=1656608400&t=2fa7a10f21b5f54a2aefd0fde2db3bb9';
+				this.qrCode = path;
 			}
 		},
 		jsonParse(json) {

menuSubPackage/pages/goodsDetail/goodsDetail.vue

@@ -292,8 +292,6 @@ export default {
 
 				const newInfo = JSON.parse(JSON.stringify(newgoods))
 				newInfo.category = this.goodInfo.category
-				// newInfo.skus.map(res=>res.state = '2')
-				// newInfo.skus[0].state = '2'
 				this.goodInfo = {...newInfo}
 				this.initInfo(this.goodInfo)
 
@@ -306,13 +304,6 @@ export default {
 					Utils.getallNum(goods)
 					uni.switchTab({ url: '/pages/menu/menu' })
 				}
-				// return
-				// const { data } = await Order.checkSku({skuId:goods.skuId})
-				// else{
-				// 	goods.num = this.size;
-				// 	Utils.getallNum(goods)
-				// 	uni.switchTab({ url: '/pages/menu/menu' })
-				// }
 			}
 		},
 		async getallNum(e) {
@@ -327,8 +318,6 @@ export default {
 			
 			const newInfo = JSON.parse(JSON.stringify(newgoods))
 			newInfo.category = this.goodInfo.category
-			// newInfo.skus.map(res=>res.state = '2')
-			// newInfo.skus[0].state = '2'
 			this.goodInfo = {...newInfo}
 			this.initInfo(this.goodInfo)
 

orderSubPackage/pages/orderInfo/index.vue

@@ -123,7 +123,7 @@ export default {
 		console.log(Authorization)
 		if(orderId){
 			if(!Authorization){
-				uni.switchTab({ url: '/pages/order/order' })
+				this.goBack()
 				return
 			}else{
 				oId = orderId
@@ -174,6 +174,7 @@ export default {
 			return rpx * (wx.getSystemInfoSync().windowWidth / 750);
 		},
 		goBack(){
+			console.log('退出订单详情',this.backFlag)
 			if(!this.backFlag){
 				uni.switchTab({ url: '/pages/order/order' })
 			}