优惠卷和商品卷

2025-03-10 16:33:43 +08:00
parent 70edc6756d
commit 5342133cbd
30 changed files with 2820 additions and 3338 deletions
--- a/stores/user.js
+++ b/stores/user.js
@@ -95,46 +95,75 @@ export const productStore = defineStore('product', {
 			return null;
 		},
 		// 扫码请求
-		scanCodeactions() {
+		scanCodeactions(q) {
 			return new Promise(async (resolve, reject) => {
-				// #ifdef APP || MP-WEIXIN || MP-ALIPAY
-				uni.scanCode({
-					success: async (res) => {
-						let tableCode = this.getQueryString(
-							decodeURIComponent(res
-								.result),
-							'code')
-						// 储存卓玛
-						uni.cache.set('tableCode', tableCode)
-						if (tableCode) {
-							let data = await this.actionsproductqueryShop()
-							// -4请求登录
-							const store = Storelogin()
-							if (data.code == '-4') {
-								if (await store.actionslogin()) {
-									// 成功 接着在调用
-									await this.actionsproductqueryShop()
-								}
-							}
-							// 是否免除桌位费 0否1是
-							if (uni.cache.get('shopInfo').isTableFee == 0) {
-								uni.pro.navigateTo('product/choosetable')
-							} else {
-								uni.pro.navigateTo(
-									'product/index', {
-										tableCode: tableCode,
-									})
-							}
+				if (q) {
+					// #ifdef MP-WEIXIN
+					let tableCode = this.getQueryString(decodeURIComponent(q), 'code')
+					// #endif
+					// #ifdef MP-ALIPAY
+					let tableCode = q
+					// #endif

+					// 储存卓玛
+					uni.cache.set('tableCode', tableCode)
+					if (tableCode) {
+						let data = await this.actionsproductqueryShop()
+						// -4请求登录
+						const store = Storelogin()
+						if (data.code == '-4') {
+							if (await store.actionslogin()) {
+								// 成功 接着在调用
+								await this.actionsproductqueryShop()
+							}
 						}
-					},
-					fail: (res) => {
-						console.log(res)
+						// 是否免除桌位费 0否1是
+						if (uni.cache.get('shopInfo').isTableFee == 0) {
+							uni.pro.navigateTo('product/choosetable')
+						} else {
+							uni.pro.navigateTo(
+								'product/index', {
+									tableCode: tableCode,
+								})
+						}
+
 					}
-				});
-				// #endif
-
+				} else {
+					// #ifdef APP || MP-WEIXIN || MP-ALIPAY
+					uni.scanCode({
+						success: async (res) => {
+							let tableCode = this.getQueryString(
+								decodeURIComponent(res.result), 'code')
+							// 储存卓玛
+							uni.cache.set('tableCode', tableCode)
+							if (tableCode) {
+								let data = await this.actionsproductqueryShop()
+								// -4请求登录
+								const store = Storelogin()
+								if (data.code == '-4') {
+									if (await store.actionslogin()) {
+										// 成功 接着在调用
+										await this.actionsproductqueryShop()
+									}
+								}
+								// 是否免除桌位费 0否1是
+								if (uni.cache.get('shopInfo').isTableFee == 0) {
+									uni.pro.navigateTo('product/choosetable')
+								} else {
+									uni.pro.navigateTo(
+										'product/index', {
+											tableCode: tableCode,
+										})
+								}

+							}
+						},
+						fail: (res) => {
+							console.log(res)
+						}
+					});
+					// #endif
+				}
 				// #ifdef H5
 				if (uni.cache.get('tableCode')) {
 					let data = await this.actionsproductqueryShop()