Merge branch 'wwz_x' of e.coding.net:g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_d

pages/index/components/diamond.vue

@@ -54,9 +54,7 @@
 								let tableCode = this.getQueryString(decodeURIComponent(res.result), 'code')
 								uni.cache.set('tableCode', tableCode)
 								if (tableCode) {
-									uni.pro.navigateTo('order_food/order_food', {
-										tableCode: tableCode,
-									})
+									uni.pro.navigateTo('order_food/order_food')
 								}
 							}
 						});

pages/login/login.vue

@@ -34,10 +34,10 @@
 					</view>
 				</view>
 			</view>
-			<view class="top_box_tow flex-between" v-if="showbox">
+			<!-- <view class="top_box_tow flex-between" v-if="showbox">
 				<text @click="register">注册账号</text>
 				<text @click="passwords">忘记密码？</text>
-			</view>
+			</view> -->
 			<!-- #ifdef MP-WEIXIN -->
 			<button class="toLogin" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber" v-if="!showbox">手机号快速登录
 			</button>
@@ -150,7 +150,6 @@
 				this.agreeShow = false;
 			},
 			blurinput(e) {
-				console.log(e);
 				uni.conf.baseUrl = e;
 				this.baseUrl = e;
 				this.showpopup = false;
@@ -235,7 +234,6 @@
 				}
 			},
 			rightClick() {
-				console.log(11);
 				uni.switchTab({
 					url: '/pages/device_shop/index'
 				});
@@ -269,13 +267,13 @@
 					});
 					return false;
 				}
-				if (this.radioChangeItem == false) {
-					uni.showToast({
-						icon: 'none',
-						title: '请先阅读《用户协议》和《隐私政策》'
-					});
-					return;
-				}
+				// if (this.radioChangeItem == false) {
+				// 	uni.showToast({
+				// 		icon: 'none',
+				// 		title: '请先阅读《用户协议》和《隐私政策》'
+				// 	});
+				// 	return;
+				// }
 				let res = await this.api.loginapplogin({
 					username: this.form.loginName,
 					password: this.form.password,
@@ -352,11 +350,9 @@
 									}
 								},
 								fail: (err) => {
-									console.log(err)
 								}
 							});
 						} catch (e) {
-							console.log(e)
 						}
 					}
 				});

pages/order_detail/order_detail.vue

@@ -171,7 +171,7 @@
 						以优惠¥{{emitorderfoodform.couponsPrice}}
 					</view>
 				</view>
-				<view class="fixedview_tow" @tap="fangdouevent">
+				<view class="fixedview_tow" @tap="$u.debounce(showpopupclick, 1000)">
 					立即付款
 				</view>
 			</view>
@@ -340,10 +340,8 @@
 					orderId: this.listinfoid
 				})
 			},
-		 
 			// 去结算
 			showpopupclick() {
-				console.log(1212121)
 				if (this.numValue == 0) {
 					let data = { //定义socket数据传参
 						"skuId": '',

pages/order_food/order_food.vue

@@ -274,21 +274,21 @@
 		},
 		async onLoad(e) {
 			if (e.q) {
-				this.tableCode = this.getQueryString(decodeURIComponent(e.q), 'code')
-				uni.cache.set('tableCode', this.tableCode)
+				let tableCode = this.getQueryString(decodeURIComponent(e.q), 'code')
+				uni.cache.set('tableCode', tableCode)
 				// this.scanCodehandle()
-				uni.pro.navigateTo('login/login', {
-					type: 0
-				})
-			} else {
-				this.tableCode = uni.cache.get('tableCode')
-				this.productqueryShopIdByTableCode() //获取shop User id
 			}
-
+			if (!uni.cache.get('token') && uni.cache.get('tableCode')) {
+				uni.reLaunch({
+					url: '/pages/login/login?type=' + 0
+				});
+				// uni.pro.navigateTo('login/login', {
+				// 	type: 0
+				// })
+			}
 			uni.$on('message', this.getMessage)
-
 			this.$nextTick(() => {
-				this.countTitleTopNum();
+				this.countTitleTopNum(); //导航栏
 			});
 		},
 		onUnload() {
@@ -296,7 +296,7 @@
 			uni.$off('message')
 		},
 		onShow() {
-			if (uni.cache.get('token')) {
+			if (uni.cache.get('token') && uni.cache.get('tableCode')) {
 				this.productqueryShopIdByTableCode() //获取shop User id
 			}
 		},
@@ -429,7 +429,7 @@
 										uni.cache.set('miniAppOpenId', res.data.userInfo
 											.miniAppOpenId)
 										uni.cache.set('userInfo', res.data.userInfo);
-										this.productqueryShopIdByTableCode()//获取shop User id
+										this.productqueryShopIdByTableCode() //获取shop User id
 									}
 								},
 								fail: (err) => {
@@ -479,7 +479,7 @@
 			},
 			async productqueryProduct() { //list  数据
 				let res = await this.api.productqueryProduct({
-					code:uni.cache.get('tableCode'),
+					code: uni.cache.get('tableCode'),
 					productGroupId: ''
 				})
 				if (res.code == 0) {