From 32ab643a6bb09915bba47a4d333fd4dac899ab22 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Mon, 13 Jan 2025 13:32:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=A4=96=E5=B8=A6=E8=AE=A2=E5=8D=95=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4table=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/member/memberdetails.vue          |  7 ++++++-
 pagesOrder/components/paymentMethod.vue | 12 ++++++++++--
 pagesOrder/confirm_order/index.vue      |  2 +-
 pagesOrder/order_detail/index.vue       |  3 ++-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/pages/member/memberdetails.vue b/pages/member/memberdetails.vue
index 73307ce..a47810b 100644
--- a/pages/member/memberdetails.vue
+++ b/pages/member/memberdetails.vue
@@ -27,7 +27,7 @@
 					<view class="card_bom_item" @click="itemClick(1)">
 						<text>{{shopUserInfo.amount || '0.00'}}</text><text>储值</text>
 					</view>
-					<view class="card_bom_item">
+					<view class="card_bom_item" @click="itemClick(2)">
 						<text>{{shopUserInfo.accountPoints || '0'}}</text><text>积分</text>
 					</view>
 					<view class="card_bom_item"  @click="itemClick(3)">
@@ -134,6 +134,11 @@
 						shopId: this.shopId,
 						type: 'index',
 					})
+				} else if ( type == 2 ) {
+					uni.pro.navigateTo('/pagesPoints/index/index', {
+						shopId: this.shopId,
+						type: 'member',
+					})
 				} else if ( type == 3 ) {
 					uni.pro.navigateTo('user/coupon', {
 						shopId: this.shopId,
diff --git a/pagesOrder/components/paymentMethod.vue b/pagesOrder/components/paymentMethod.vue
index 6e5f1ac..bca72fa 100644
--- a/pagesOrder/components/paymentMethod.vue
+++ b/pagesOrder/components/paymentMethod.vue
@@ -86,11 +86,19 @@
 			payAmount:{
 				immediate: true,
 				handler (newVal) {
+					if ( this.amountVIP.amount < newVal) {
+						// #ifdef MP-WEIXIN
+						this.radiovalue = 2
+						// #endif
+						// #ifdef MP-ALIPAY
+						this.radiovalue = 3
+						// #endif
+					}
 					if ( newVal <= 0 ) {
 						this.radiovalue = 1
-						let name = this.paymentMethodName[this.radiovalue-1].name;
-						this.$emit("groupChange",{type:this.radiovalue ,name: name })
 					}
+					let name = this.paymentMethodName[this.radiovalue-1].name;
+					this.$emit("groupChange",{type:this.radiovalue ,name: name })
 				}
 			},
 			rechargeFreeChecked:{
diff --git a/pagesOrder/confirm_order/index.vue b/pagesOrder/confirm_order/index.vue
index 6cde1d9..a609723 100644
--- a/pagesOrder/confirm_order/index.vue
+++ b/pagesOrder/confirm_order/index.vue
@@ -880,7 +880,6 @@
 				}
 				
 				let params = {
-					"tableId": this.tableCode , //桌台码
 					"shopId": uni.cache.get('shopId'),
 					"userId": uni.cache.get('userInfo').id,
 					"sendType": this.sendType,
@@ -892,6 +891,7 @@
 				if ( this.userCouponInfos ) {
 					params.userCouponInfos = this.userCouponInfos
 				}
+				if ( this.tableCode && this.sendType == "table") { params.tableId = this.tableCode; }
 				let res = await this.api.creatOrder(params)
 				this.listinfoid = res.data.id;
 				if ( this.storeInfo.registerType == 'restaurant') {
diff --git a/pagesOrder/order_detail/index.vue b/pagesOrder/order_detail/index.vue
index 5dbd98b..f5bc5a9 100644
--- a/pagesOrder/order_detail/index.vue
+++ b/pagesOrder/order_detail/index.vue
@@ -138,7 +138,8 @@
 					this.$refs.orderInfoAfterRef.childOnShow();
 				})
 			}
-			if ( this.listinfo ) {
+			console.log(JSON.stringify(this.listinfo))
+			if ( JSON.stringify(this.listinfo) != '{}' ) {
 				this.getAount();
 			}
 		},