下单页面增加生日有礼弹窗，关注公众号弹窗，订单结算增加满减活动，修改霸王餐，增加结算成功私域引流和公众号弹窗

stores/pay.js

@@ -23,10 +23,7 @@ export const Memberpay = defineStore('memberpay', {
 			return new Promise(async (resolve, reject) => {
 				try {
 					let res = await APIpayltPayVip({
-						shopId: data.shopId,
-						shopUserId: data.shopUserId,
-						amount: data.amount,
-						activateId: data.activateId,
+						...data,
 						// #ifdef MP-WEIXIN
 						payType: 'wechatPay',
 						openId: uni.cache.get('userInfo').wechatOpenId,
@@ -35,11 +32,6 @@ export const Memberpay = defineStore('memberpay', {
 						payType: 'aliPay',
 						openId: uni.cache.get('userInfo').wechatOpenId,
 						// #endif
-						returnUrl: data.returnUrl ? data.returnUrl : '',
-						buyerRemark: data.buyerRemark ? data.buyerRemark : '',
-						orderId: data.orderId,
-						userAllPack: data.userAllPack,
-						seatNum:data.seatNum
 					})
 					if (res) {
 						uni.showLoading({
@@ -67,20 +59,20 @@ export const Memberpay = defineStore('memberpay', {
 									title: "支付成功"
 								})
 								console.log('支付成功')
-								setTimeout(() => {
-									uni.navigateBack()
-								}, 1000)
-								resolve(res)
+								// setTimeout(() => {
+								// 	uni.navigateBack()
+								// }, 1000)
+								resolve(true)
 								// #endif
 								// #ifdef MP-ALIPAY
 								if (res.resultCode == '9000') {
 									uni.showToast({
 										title: "支付成功"
 									})
-									setTimeout(() => {
-										uni.navigateBack()
-									}, 1000)
-									resolve(res)
+									// setTimeout(() => {
+									// 	uni.navigateBack()
+									// }, 1000)
+									resolve(true)
 								} else {
 									uni.showToast({
 										title: "支付失败"
@@ -163,14 +155,14 @@ export const Memberpay = defineStore('memberpay', {
 									title: "支付成功"
 								})
 								console.log('支付成功')
-								resolve(res)
+								resolve(true)
 								// #endif
 								// #ifdef MP-ALIPAY
 								if (res.resultCode == '9000') {
 									uni.showToast({
 										title: "支付成功"
 									})
-									resolve(res)
+									resolve(true)
 								} else {
 									uni.showToast({
 										title: "支付失败"

stores/user.js

@@ -104,6 +104,7 @@ export const productStore = defineStore('product', {
 		},
 		// 扫码请求
 		scanCodeactions(q) {
+			console.log('扫码内容', q)
 			return new Promise(async (resolve, reject) => {
 				if (q) {
 					console.log(q)
@@ -121,7 +122,7 @@ export const productStore = defineStore('product', {
 					// 储存卓玛
 					uni.cache.set('tableCode', tableCode)
 					if (tableCode) {
-						console.log(uni.cache.get('tableCode'));
+						console.log('台桌码', uni.cache.get('tableCode'));
 						let data = await this.actionsproductqueryShop(tableCode)
 						
 						console.log('data', data)
@@ -194,6 +195,7 @@ export const productStore = defineStore('product', {
 
 		// /通过桌码获取当前店铺信息
 		actionsproductqueryShop(tableCode) {
+			console.log('台桌码',tableCode);
 			return new Promise(async (resolve, reject) => {
 				// try {
 				try {
@@ -213,7 +215,7 @@ export const productStore = defineStore('product', {
 
 						resolve(res)
 					} else {
-						console.log(res)
+						console.error('通过桌码获取当前店铺信息失败' ,res)
 						reject()
 					}