From 1d6ef747819e61cc02b6503878ed0327bd03febc Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Tue, 24 Dec 2024 16:16:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=8C=E5=8F=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../confirm-order/rotatingTables.vue          | 60 ++++++++++---------
 pagesOrder/detail/components/list.vue         |  9 +--
 pagesOrder/detail/components/tuicai.vue       |  5 +-
 pagesOrder/detail/detail.vue                  |  4 +-
 4 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/pagesCreateOrder/confirm-order/rotatingTables.vue b/pagesCreateOrder/confirm-order/rotatingTables.vue
index b40a224..8f1cbd5 100644
--- a/pagesCreateOrder/confirm-order/rotatingTables.vue
+++ b/pagesCreateOrder/confirm-order/rotatingTables.vue
@@ -25,43 +25,47 @@
 			</view>
 			<checkbox-group @change="checkboxChange">
 				<label class="uni-list-cell uni-list-cell-pd" v-for="(item,index) in datas.item" :key="index">
-					<view class="u-flex u-m-t-48 u-m-b-48" style="justify-content: space-between;align-items: center;">
-						<view class="u-flex">
-							<checkbox :value="item.cartId" />
-							<image class="img" v-if="item.coverImg" :src="item.coverImg" mode=""></image>
-							&nbsp;&nbsp;
-							{{item.name}}
-						</view>
-						<view class="">
-							<view class=" u-relative">
-								<template v-if="item.isGift">
-									<text class="line-th color-999">￥{{formatPrice(item.salePrice*item.number) }}</text>
-									<view class="u-absolute" style="right: 0;bottom: 100%;">
-										<text class="font-bold">￥0</text>
-									</view>
-								</template>
-								<template v-else>
-									<template v-if="isVip&&item.memberPrice&&item.memberPrice*1!=item.salePrice*1">
+					<template v-if="item.status=='unpaid'">
+						<view class="u-flex u-m-t-48 u-m-b-48"
+							style="justify-content: space-between;align-items: center;">
+							<view class="u-flex">
+								<checkbox :value="item.cartId" />
+								<image class="img" v-if="item.coverImg" :src="item.coverImg" mode=""></image>
+								&nbsp;&nbsp;
+								{{item.name}}
+							</view>
+							<view class="">
+								<view class=" u-relative">
+									<template v-if="item.isGift">
 										<text
 											class="line-th color-999">￥{{formatPrice(item.salePrice*item.number) }}</text>
 										<view class="u-absolute" style="right: 0;bottom: 100%;">
-											<text
-												class="font-bold">￥{{formatPrice(item.memberPrice*item.number) }}</text>
+											<text class="font-bold">￥0</text>
 										</view>
 									</template>
 									<template v-else>
-										<view class="font-bold">
-											<text>￥</text>
-											<text class="">{{formatPrice(item.salePrice*item.number) }}</text>
-										</view>
-									</template>
+										<template v-if="isVip&&item.memberPrice&&item.memberPrice*1!=item.salePrice*1">
+											<text
+												class="line-th color-999">￥{{formatPrice(item.salePrice*item.number) }}</text>
+											<view class="u-absolute" style="right: 0;bottom: 100%;">
+												<text
+													class="font-bold">￥{{formatPrice(item.memberPrice*item.number) }}</text>
+											</view>
+										</template>
+										<template v-else>
+											<view class="font-bold">
+												<text>￥</text>
+												<text class="">{{formatPrice(item.salePrice*item.number) }}</text>
+											</view>
+										</template>
 
-								</template>
+									</template>
+								</view>
+								<view class="color-999 u-text-right u-font-24 u-m-t-12">×{{item.number}}</view>
 							</view>
-							<view class="color-999 u-text-right u-font-24 u-m-t-12">×{{item.number}}</view>
+							<!-- <text class="  color-999">￥{{formatPrice(item.salePrice*item.number) }}</text> -->
 						</view>
-						<!-- <text class="  color-999">￥{{formatPrice(item.salePrice*item.number) }}</text> -->
-					</view>
+					</template>
 				</label>
 			</checkbox-group>
 		</view>
diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index 4bc885f..ad25a0d 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -4,7 +4,7 @@
 			<text class="">桌号：</text>
 			<text class="">{{orderInfo.tableName||""}}</text>
 		</view>
-		<view class=" font-bold u-p-b-32 border-bottom u-m-b-24" v-if="orderInfo.tableName">
+		<view class=" font-bold u-p-b-32 border-bottom u-m-b-24" v-if="orderInfo.tableName&&orderInfo.status=='unpaid'">
 			<view class="block" @tap="rotatingTables"
 				style="display: flex;align-items: center;justify-content: space-between;">
 				<view>转桌/并桌</view>
@@ -397,7 +397,7 @@
 	})
 
 	function returnCanTuiMoney(item) {
-		return props.orderInfo.status == 'unpaid' ? item.priceAmount : item.canReturnAmount
+		return props.orderInfo.status == 'unpaid' ? item.priceAmount : item.priceAmount
 		if (props.orderInfo.status == 'unpaid') {
 			return returnTotalMoney(item)
 		} else {
@@ -427,7 +427,7 @@
 			if (res) {
 				emits('tuikuan', {
 					...item,
-					priceAmount: item.canReturnAmount
+					priceAmount: item.priceAmount
 				}, index)
 			}
 		})
@@ -541,7 +541,8 @@
 		const goodsPrice = props.data.reduce((prve, cur) => {
 			const curTotal = cur.info.reduce((a,
 				b) => {
-				return a + (b.status == 'unpaid' ? b.priceAmount : b.status == 'return' ? 0 : b.canReturnAmount * 1)
+				return a + (b.status == 'unpaid' ? b.priceAmount : b.status == 'return' ? 0 : b
+					.priceAmount * 1)
 			}, 0)
 			return prve + curTotal
 		}, 0)
diff --git a/pagesOrder/detail/components/tuicai.vue b/pagesOrder/detail/components/tuicai.vue
index b6ad1a6..1e9e89c 100644
--- a/pagesOrder/detail/components/tuicai.vue
+++ b/pagesOrder/detail/components/tuicai.vue
@@ -103,8 +103,7 @@
 	let timer = null
 
 	function parseIntNumber(val, isNow) {
-		console.log(val);
-		let newval = parseInt(val)
+		let newval = val * 1
 		if (newval > props.data.num) {
 			newval = props.data.num
 		}
@@ -115,7 +114,7 @@
 			}
 		}
 		if (isNow) {
-			number.value = parseInt(newval)
+			number.value = newval * 1
 			return
 		}
 		timer = setTimeout(() => {
diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index 76c574f..3c15c5f 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -94,7 +94,7 @@
 	}
 	
 	async function onSeatFeeTuiKuan(seatFee) {
-		console.log(seatFee);
+		console.log(seatFee,'调试1');
 		const canTuikuan=await hasTuiKuan()
 		if(!canTuikuan){
 			return
@@ -174,7 +174,7 @@
 		if(!canTuikuan){
 			return
 		}
-		console.log(goods);
+		console.log(goods,'debug');
 		const {
 			id,
 			productId,