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

pages/order_food/order_food.vue

@@ -395,7 +395,7 @@
 			handlemessage() {
 				this.socketTicket ? this.socketTicket.Close() : null //调用前先判断是否有socket正在进行 先关闭后链接
 				this.socketTicket = new webSocketUtils(
-					`${uni.conf.baseUrlwws}/websocket/table/${this.tableCode}/${uni.cache.get('shopUser')}/${uni.cache.get('userInfo').id}`,
+					`${uni.conf.baseUrlwws}/websocket/table/${uni.cache.get('tableCode')}/${uni.cache.get('shopUser')}/${uni.cache.get('userInfo').id}`,
 					5000)
 
 			},
@@ -479,7 +479,7 @@
 			},
 			async productqueryProduct() { //list  数据
 				let res = await this.api.productqueryProduct({
-					code: this.tableCode,
+					code:uni.cache.get('tableCode'),
 					productGroupId: ''
 				})
 				if (res.code == 0) {