From 0f2e79155702227c18593c26616885dde65528e5 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Sat, 23 Nov 2024 09:35:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesOrder/detail/components/list.vue | 23 ++++++++++++++-----
 pagesOrder/pay-order/pay-order.vue    | 33 +++++++++++++++++++++++----
 2 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index 3230e8a..1a529a3 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -168,10 +168,19 @@
 			</template>
 			<view class="u-flex u-row-between u-m-t-20">
 				<view></view>
-				<view>
-					<text>总计￥</text>
-					<text class="font-bold u-font-32">{{to2(allPrice*1+seatFeePrice*1+packFee*1) }}</text>
-				</view>
+				<template v-if="orderInfo.status=='unpaid'">
+					<view>
+						<text>总计￥</text>
+						<text class="font-bold u-font-32">{{to2(allPrice*1+seatFeePrice*1+packFee*1) }}</text>
+					</view>
+				</template>
+				<template v-else>
+					<view>
+						<text>总计￥</text>
+						<text class="font-bold u-font-32">{{orderInfo.amount}}</text>
+					</view>
+				</template>
+				
 			</view>
 			<!-- <view class="u-flex u-row-between u-m-t-20" v-if="orderInfo.status=='closed'">
 				<view></view>
@@ -466,7 +475,8 @@
 
 	const youhuiAllPrice = computed(() => {
 		if(props.orderInfo.status!='unpaid'){
-			return (goodsOriginAllPrice.value-allPrice.value-discountAmount.value).toFixed(2)
+			const seatfee=(props.orderInfo.amount==0&&allPrice.value==0)?seatFeePrice.value:0
+			return (goodsOriginAllPrice.value-allPrice.value-discountAmount.value+seatfee*1).toFixed(2)
 		}
 		return (freePrice.value * 1 + vipDiscountPrice.value * 1 + props.orderInfo.fullCouponDiscountAmount + props
 			.orderInfo.pointsDiscountAmount + (props.orderInfo.status == 'unpaid' ? productCoupPrice.value :
@@ -494,7 +504,8 @@
 		const seatFee=props.orderInfo.seatInfo?(props.orderInfo.seatInfo.priceAmount||props.orderInfo.seatInfo.returnAmount):0
 		console.log('seatFee');
 		console.log(seatFee);
-		return (props.orderInfo.amount-seatFee).toFixed(2)
+		const total=props.orderInfo.amount-seatFee
+		return (total<=0?0:total).toFixed(2)
 	})
 
 	const goodsNumber = computed(() => {
diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue
index 8e85467..93eb161 100644
--- a/pagesOrder/pay-order/pay-order.vue
+++ b/pagesOrder/pay-order/pay-order.vue
@@ -91,7 +91,8 @@
 										<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'&&user.id" @click.stop="chooseUser">
+										<view class="u-m-r-20" v-if="item.payType=='vipPay'&&user.id"
+											@click.stop="chooseUser">
 											<view>
 												<text>会员：</text>
 												<text class="u-m-r-4">{{user.telephone||user.nickName}}</text>
@@ -210,6 +211,7 @@
 
 		<edit-accountPoints @confirm="pointsConfirm" :price="accountPoints.num" :accountPoints="accountPoints"
 			ref="refPoints"></edit-accountPoints>
+
 	</view>
 </template>
 
@@ -257,6 +259,14 @@
 	})
 
 	function confirmModelCancel() {
+		if (modal.key == 'fullCoupon') {
+			// 取消改价
+			discount.discount = 100
+			discount.value = 0
+		}
+		confirmModelClose()
+	}
+	function confirmModelClose() {
 		modal.show = false
 		modal.key = ''
 		modal.data = ''
@@ -271,6 +281,13 @@
 		if (modal.key == 'cash') {
 			await pay()
 			confirmModelCancel()
+			return
+		}
+		if (modal.key == 'fullCoupon') {
+			//删除满减券
+			const index = pays.quan.findIndex(v => v.type == 1)
+			pays.quan.splice(index, 1)
+			return
 		}
 	}
 
@@ -310,7 +327,7 @@
 		}
 		const res = await Api.$calcUsablePoints({
 			memberId: order.memberId,
-			orderAmount:payPrice.value
+			orderAmount: payPrice.value
 		})
 		accountPoints.calcRes = res
 		accountPoints.num = res.maxUsablePoints
@@ -535,6 +552,14 @@
 			...form,
 			value: form.price - form.currentPrice
 		})
+		const fullCoupon = pays.quan.find(v => v.type == 1)
+		if (fullCoupon && form.currentPrice < fullCoupon.fullAmount) {
+			modal.content = '改价后价格不满足满减券最低满减需求' + fullCoupon.fullAmount + '元'
+			modal.key = 'fullCoupon'
+			modal.show = true
+			modal.cancelText = '取消改价'
+			modal.confirmText = '删除满减券'
+		}
 		getPayUrl()
 	}
 
@@ -553,7 +578,7 @@
 			return infoBox.showToast(item.payName + '不可用')
 		}
 		pays.payTypes.selIndex = i
-		if (item.payType == 'vipPay'&&!user.value.id) {
+		if (item.payType == 'vipPay' && !user.value.id) {
 			chooseUser()
 		}
 	}
@@ -732,7 +757,7 @@
 	})
 	const pointCanDicountPrice = computed(() => {
 		const total = (order.amount || 0) - productCouponDiscountAmount.value - discount.value -
-			fullCouponDiscountAmount.value 
+			fullCouponDiscountAmount.value
 		return (total < 0 ? 0 : total).toFixed(2)
 	})
 	watch(() => pointCanDicountPrice.value, (newval) => {