From f439dca343295411eb341ab94a373939f4dc4d5d Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 11 Oct 2024 17:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=80=BB=E6=8A=80=E4=BF=9D=E6=8C=81=E4=B8=A4=E4=BD=8D?=
 =?UTF-8?q?=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesOrder/detail/components/list.vue | 11 ++++++--
 pagesOrder/pay-order/pay-order.vue    | 37 +++++++++++++++++++++++----
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index 8b2eaee..2f6edad 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -106,7 +106,7 @@
 				<view></view>
 				<view>
 					<text>总计￥</text>
-					<text class="font-bold u-font-32">{{allPrice*1+seatFeePrice*1}}</text>
+					<text class="font-bold u-font-32">{{to2(allPrice*1+seatFeePrice*1) }}</text>
 				</view>
 			</view>
 			<view class="u-m-t-30">
@@ -122,7 +122,14 @@
 	} from 'vue';
 	import color from '@/commons/color.js'
 	const emits = defineEmits(['tuicai', 'tuikuan', 'printOrder'])
-
+	
+	function to2(n){
+		if(!n){
+			return 0
+		}
+		return n.toFixed(2)
+	}
+	
 	function tuicai(item, index) {
 		emits('tuicai', item, index)
 	}
diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue
index 95c9daf..1753d68 100644
--- a/pagesOrder/pay-order/pay-order.vue
+++ b/pagesOrder/pay-order/pay-order.vue
@@ -125,11 +125,13 @@
 	let option = {isNowPay:false}
 	let payFinish=ref(false)
 	onBackPress(() => {
-		if (option.isNowPay&&!payFinish.value) {
-			infoBox.showToast('先付费模式，请先结算订单')
-			return true
-		}
-		return false
+		console.log('onBackPress');
+		uni.$emit('update:createOrderIndex')
+		// if (option.isNowPay&&!payFinish.value) {
+		// 	infoBox.showToast('先付费模式，请先结算订单')
+		// 	return true
+		// }
+		// return false
 	})
 	let payStatus = ref(null) //loading success
 
@@ -158,6 +160,31 @@
 			selIndex: 0
 		}
 	})
+	
+	function chooseUser() {
+		go.to('PAGES_CHOOSE_USER')
+	}
+	//更新选择用户
+	function setUser(par) {
+		console.log(option);
+		const submitPar = {
+			masterId: option.masterId,
+			tableId: table.value.tableId,
+			vipUserId: user.value.id ? user.value.id : '',
+			type: user.value.id ? 0 : 1 //0 设置 1 取消
+		}
+		Object.assign(submitPar, par)
+		return Api.$setUser(submitPar)
+	}
+	function watchChooseuser() {
+		uni.$off('choose-user')
+		uni.$on('choose-user', (data) => {
+			console.log(data);
+			user.value = data
+			setUser()
+		})
+	}
+	
 
 	watch(() => pays.selIndex, (newval) => {
 		clearInterval(timer)