合并扫码点餐

pages/index/components/diamond.vue

@@ -38,42 +38,35 @@
 						});
 						break;
 					case 'relative':
-						uni.pro.navigateTo(item.absUrl,item);
+						uni.pro.navigateTo(item.absUrl, item);
 						break;
 					case 'scan':
 						if (!uni.utils.pluschooseImage()) {
 							return false
 						}
-						// #ifdef H5
-						if (this.wxSdk) {
-							wx.scanQRCode({
-								needResult: 1, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
-								scanType: ['qrCode', 'barCode'], // 可以指定扫二维码还是一维码，默认二者都有
-								success: res => {
-									// 当needResult 为 1 时，扫码返回的结果
-									console.log(res.resultStr, res)
-								}
-							});
-						} else {
-							uni.showModal({
-								title: '注意',
-								content: '微信sdk初始化失败，请重新加载',
-								success: res => {
-									window.location.reload();
-								}
-							});
-						}
-						// #endif
 						// #ifdef APP || MP-WEIXIN
 						uni.scanCode({
-							success: res => {
-								console.log(res.result, res)
+							success: (res) => {
+								let tableCode = this.getQueryString(decodeURIComponent(res.result), 'code')
+								if (tableCode) {
+									uni.pro.navigateTo('order_food/order_food', {
+										tableCode: tableCode,
+									})
+								}
 							}
 						});
 						// #endif
 						break;
 				}
-			}
+			},
+			getQueryString(url, name) { //解码
+				var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')
+				var r = url.substr(1).match(reg)
+				if (r != null) {
+					return r[2]
+				}
+				return null;
+			},
 		}
 	};
 </script>