From 0ad11a9866faf4a6e1fdd3229901ee6123b4e594 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 4 Nov 2024 14:23:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=88=87=E6=8D=A2=E7=94=A8=E6=88=B7=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=B0=86=E4=B9=8B=E5=89=8D=E7=9A=84userId=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAmemberId=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesOrder/detail/detail.vue       |  9 +++++----
 pagesOrder/pay-order/pay-order.vue | 25 +++++++++++++++----------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index a3405f3..18059ef 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -221,7 +221,7 @@
 		if(!canJieZhang){
 			return 
 		}
-		const userId=orderDetail.info.userId||''
+		const memberId=orderDetail.info.memberId||''
 		clearEmit()
 		go.to('PAGES_ORDER_PAY', {
 			tableId: options.tableId|| orderDetail.info.tableId,
@@ -229,7 +229,7 @@
 			masterId: options.masterId,
 			orderId: orderDetail.info.id,
 			discount: 1,
-			userId
+			memberId
 		})
 	}
 
@@ -243,8 +243,8 @@
 	const options = reactive({})
 	async function init() {
 		const res = await orderApi.tbOrderInfoDetail(options.id)
-		if(res.userId){
-			queryAllShopUser({id:res.userId}).then(res=>{
+		if(res.memberId){
+			queryAllShopUser({id:res.memberId}).then(res=>{
 				if(res.content[0]){
 					user.value=res.content[0]
 				}
@@ -320,6 +320,7 @@
 	//更新选择用户
 	function setUser(par) {
 		const submitPar = {
+			orderId:options.id||'',
 			masterId: options.masterId,
 			tableId: options.tableId|| orderDetail.info.tableId,
 			vipUserId: user.value.id ? user.value.id : '',
diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue
index 551888e..50c53d9 100644
--- a/pagesOrder/pay-order/pay-order.vue
+++ b/pagesOrder/pay-order/pay-order.vue
@@ -42,13 +42,18 @@
 								<view class="u-flex u-row-between u-p-t-30 u-p-b-30 border-bottom">
 									<view class="u-flex">
 										<image class="icon" :src="item.icon" mode=""></image>
-										<text class="u-m-l-10">{{item.payName}}</text>
+										<text class="u-m-l-10 no-wrap">{{item.payName}}</text>
 									</view>
 									<view class="u-flex color-999 u-font-24">
 										<view class="u-m-r-20" v-if="item.payType=='vipPay'">
-											<text class="u-m-r-4">{{user.telephone||user.nickName}}</text>
-											<text>余额：</text>
-											<text>￥{{user.amount||'0'}}</text>
+											<view>
+												<text>会员：</text>
+												<text class="u-m-r-4">{{user.telephone||user.nickName}}</text>
+											</view>
+											<view>
+												<text>余额：</text>
+												<text>￥{{user.amount||'0'}}</text>
+											</view>
 										</view>
 										<my-radio @click="changePayType(index,item)"
 											:modelValue="index==pays.payTypes.selIndex">
@@ -195,7 +200,7 @@
 				 type: data.id ? 0 : 1 //0 设置 1 取消
 			 }).then(res=>{
 				 user.value = data
-				 order.userId=data.id
+				 order.memberId=data.id
 			 })
 		})
 	}
@@ -286,7 +291,7 @@
 			masterId: order.masterId,
 			orderId: order.id || order.orderId,
 			payType,
-			vipUserId: order.userId,
+			vipUserId: order.memberId,
 			discount: 1,
 			code: ''
 		})
@@ -337,11 +342,11 @@
 	})
 	let payCodeUrl = ref('')
 	async function init() {
-		const res = await orderApi.tbOrderInfoDetail(order.orderId)
-		Object.assign(order, res)
-		if (order.userId) {
+		const orderRes = await orderApi.tbOrderInfoDetail(order.orderId)
+		Object.assign(order, orderRes)
+		if (orderRes.memberId) {
 			queryAllShopUser({
-				id: order.userId
+				id: orderRes.memberId
 			}).then(res => {
 				if(res.content[0]){
 					user.value =res.content[0]