修改调整页面样式

pagesOrder/detail/detail.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="min-page bg-gray u-font-28 u-p-30">
 		<user-vue :orderInfo="orderDetail.info" :user="user"></user-vue>
-		<view class="default-box-padding bg-fff border-r-12 u-m-t-32">
+		<!-- <view class="default-box-padding bg-fff border-r-12 u-m-t-32">
 			<text class="">桌位号：</text>
 			<text class="">{{orderDetail.info.tableName}}</text>
-		</view>
+		</view> -->
 		<goods-list @printOrder="onPrintOrder" @tuikuan="onTuikuan" :orderInfo="orderDetail.info"
 			:data="orderDetail.goodsList" :seatFee="orderDetail.seatFee" @tuicai="onTuiCai"></goods-list>
 		<template v-if="orderDetail.seatFee.totalNumber&&orderDetail.seatFee.totalAmount">
@@ -17,7 +17,7 @@
 		<view class="u-fixed bottom bg-fff ">
 			<view class="u-flex u-abso">
 				<template v-if="orderDetail.info.useType=='takeout'">
-					<view class="u-flex-1">
+					<view class="u-flex-1" v-if="orderDetail.info.status=='unpaid'">
 						<my-button @tap="toPay" borderRadius="100rpx" shape="circle"
 							type="primary">结账</my-button>
 					</view>
@@ -25,11 +25,11 @@
 				<template v-else>
 					<template v-if="orderDetail.info.status=='unpaid'">
 						<view class="u-flex-1">
-							<my-button @tap="diancan" color="#fff" bgColor="rgb(57,53,52)" borderRadius="100rpx 0 0 100rpx" fontWeight="700" fontSize="32"
+							<my-button @tap="diancan" color="#fff" bgColor="rgb(57,53,52)" borderRadius="100rpx 0 0 100rpx" fontWeight="700" 
 								shape="circle" plain type="primary">加菜</my-button>
 						</view>
 						<view class="u-flex-1">
-							<my-button @tap="toPay" borderRadius="0 100rpx 100rpx 0" shape="circle" fontWeight="700" fontSize="32"
+							<my-button @tap="toPay" borderRadius="0 100rpx 100rpx 0" shape="circle" fontWeight="700" 
 								type="primary">结账</my-button>
 						</view>
 					</template>
@@ -120,9 +120,10 @@
 		tuicai.show = true
 		tuicai.selGoods = goods
 	}
-	async function tuicaiConfirm() {
+	async function tuicaiConfirm(e) {
 		console.log(tuicai.selGoods);
 		const res = await Api.$returnCart({
+			...e,
 			cartId: tuicai.selGoods.hasOwnProperty('cartId') ? tuicai.selGoods.cartId : tuicai.selGoods.id,
 			tableId: orderDetail.info.tableId,
 		})
@@ -199,6 +200,7 @@
 	}, 1500)
 
 	function diancan() {
+		clearEmit()
 		go.to('PAGES_CREATE_ORDER', {
 			tableId: options.tableId || orderDetail.info.tableId,
 			name: options.name || orderDetail.info.tableName,
@@ -208,6 +210,7 @@
 
 	function toPay() {
 		const userId=orderDetail.info.userId||''
+		clearEmit()
 		go.to('PAGES_ORDER_PAY', {
 			tableId: options.tableId|| orderDetail.info.tableId,
 			tableName: options.name,
@@ -310,7 +313,13 @@
 		Object.assign(submitPar, par)
 		return Api.$setUser(submitPar)
 	}
-
+	
+	
+	 function clearEmit(){
+		uni.$off('choose-user')
+		uni.$off('orderDetail:update')
+	}
+	
 	function watchChooseuser() {
 		uni.$off('choose-user')
 		uni.$on('choose-user', (data) => {