订单支付详情修改部分逻辑

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(() => {