From fe441fc471e7f554fef996840a31818a85b90def Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 20 Nov 2024 14:51:39 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9C=B8=E7=8E=8B?=
 =?UTF-8?q?=E9=A4=90=E8=BE=93=E5=85=A5=E6=A1=86=E7=B1=BB=E5=9E=8B=E4=B8=BA?=
 =?UTF-8?q?number?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageBwc/index/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pageBwc/index/index.vue b/pageBwc/index/index.vue
index fe615a8..46b57a9 100644
--- a/pageBwc/index/index.vue
+++ b/pageBwc/index/index.vue
@@ -7,7 +7,7 @@
 			</view>
 			<view class="boxconstantbox_tow">
 				<text>用户消费结账时，成功充值</text>
-				<input class="text" v-model="form.rechargeTimes"></input>
+				<input class="number" v-model="form.rechargeTimes"></input>
 				<text>倍的金额本单即可享受免单</text>
 			</view>
 		</view>
@@ -17,7 +17,7 @@
 			</view>
 			<view class="boxconstantbox_tow">
 				<text>订单支付金额需满</text>
-				<input class="text" v-model="form.rechargeThreshold"></input>
+				<input class="number" v-model="form.rechargeThreshold"></input>
 				<text> 元，才能使用</text>
 			</view>
 		</view>

From 0ff2e8f770fd3b497792ba41737c62aaaa91cafd Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 20 Nov 2024 14:52:01 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BC=98=E6=83=A0=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 | 92 ++++++++++++++++-----------
 1 file changed, 55 insertions(+), 37 deletions(-)

diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index 6e7506e..3ef1731 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -58,7 +58,12 @@
 								<view class="u-text-right u-m-t-28">
 									<template v-if="isTui(item)">
 										<view>￥0.00</view>
-										<view class="line-th color-666 ">￥{{returnTotalMoney(item)}}
+										<template
+											v-if="user.isVip&&item.isMember&&returnVipMoney(item)>0&&returnVipMoney(item)!=returnTotalMoney(item)">
+											<view class="line-th color-666 ">{{returnVipMoney(item)}}</view>
+											
+										</template>
+										<view class="line-th color-666 " v-else>￥{{returnTotalMoney(item)}}
 										</view>
 									</template>
 									<template v-else-if="isGift(item)||item.userCouponId">
@@ -67,7 +72,8 @@
 										</view>
 									</template>
 									<template v-else>
-										<template v-if="user.isVip&&item.isMember&&returnVipMoney(item)>0&&returnVipMoney(item)!=returnTotalMoney(item)">
+										<template
+											v-if="user.isVip&&item.isMember&&returnVipMoney(item)>0&&returnVipMoney(item)!=returnTotalMoney(item)">
 											<view>￥{{returnVipMoney(item)}}</view>
 											<view class=" color-666 line-th">
 												￥{{returnTotalMoney(item)}}</view>
@@ -120,21 +126,21 @@
 
 				<view class="u-flex">
 					<view class="u-flex u-m-r-24" v-if="youhuiAllPrice>0">
-						<view class="color-red u-m-r-6 " >
+						<view class="color-red u-m-r-6 ">
 							已优惠￥{{youhuiAllPrice}}
 						</view>
 						<up-icon name="info-circle" color="#999" :size="14" @click="youhuiDetailShow"></up-icon>
 					</view>
-					
+
 					<view>
 						<text>小计￥</text>
 						<text class="font-bold u-font-32">{{allPrice}}</text>
 					</view>
-				
+
 				</view>
 			</view>
 
-			<template v-if="orderInfo.status=='refund'">
+			<template v-if="orderInfo.refundAmount">
 				<view class="u-flex u-row-between u-m-t-32">
 					<view>退款金额</view>
 					<view class="color-999">
@@ -165,7 +171,7 @@
 				<my-button @tap="printOrder" type="cancel" :color="color.ColorMain">重新打印</my-button>
 			</view>
 		</view>
-		<up-popup :round="10" :show="pop.youhui" mode="center" closeOnClickOverlay @close="youhuiDetailHide" >
+		<up-popup :round="10" :show="pop.youhui" mode="center" closeOnClickOverlay @close="youhuiDetailHide">
 			<view class="u-p-30" style="width: 80vw;">
 				<view class="font-bold  u-text-center">优惠详情</view>
 				<view class="u-m-t-32">
@@ -183,14 +189,15 @@
 							<text>{{orderInfo.discountAmount}}</text>
 						</view>
 					</view>
-					<view class="u-flex u-row-between "  v-if="orderInfo.fullCouponDiscountAmount*1>0">
+					<view class="u-flex u-row-between " v-if="orderInfo.fullCouponDiscountAmount*1>0">
 						<view>满减券抵扣</view>
 						<view class="color-red">
 							<text>￥</text>
 							<text>{{orderInfo.fullCouponDiscountAmount}}</text>
 						</view>
 					</view>
-					<view class="u-flex u-row-between u-m-t-18" v-if="orderInfo.productCouponDiscountAmount||productCoupPrice">
+					<view class="u-flex u-row-between u-m-t-18"
+						v-if="orderInfo.productCouponDiscountAmount||productCoupPrice">
 						<view>商品券抵扣</view>
 						<view class="color-red">
 							<text>￥</text>
@@ -204,7 +211,7 @@
 							<text>{{orderInfo.pointsDiscountAmount}}</text>
 						</view>
 					</view>
-					
+
 				</view>
 			</view>
 		</up-popup>
@@ -213,26 +220,30 @@
 
 <script setup>
 	import {
-		computed, reactive
+		computed,
+		reactive
 	} from 'vue';
 	import color from '@/commons/color.js'
 	import {
 		hasPermission
 	} from '@/commons/utils/hasPermission.js'
 	import {
-		isTui,isGift,
+		isTui,isTuiCai,
+		isGift,
 		canTuiKuan,
 		canTuicai,
 		numSum
 	} from '@/commons/utils/goodsUtil.js'
-	const pop=reactive({
-		youhui:false
+	const pop = reactive({
+		youhui: false
 	})
-	function youhuiDetailShow(){
-		pop.youhui=true
+
+	function youhuiDetailShow() {
+		pop.youhui = true
 	}
-	function youhuiDetailHide(){
-		pop.youhui=false
+
+	function youhuiDetailHide() {
+		pop.youhui = false
 	}
 	const props = defineProps({
 		orderInfo: {
@@ -311,12 +322,13 @@
 		}, 0)
 		return goodsPrice.toFixed(2)
 	})
-	
+
 	const freePrice = computed(() => {
 		const goodsPrice = props.data.reduce((prve, cur) => {
-			const curTotal = cur.info.filter(v => v.gift == true || isTui(v)).reduce((a,
+			const curTotal = cur.info.filter(v => v.gift == true || isGift(v)).reduce((a,
 				b) => {
-				return a + (b.num * b.price)
+					const price=(b.isMember && b.memberPrice)?b.memberPrice:b.price
+				return a + (b.num * price)
 			}, 0)
 			return prve + curTotal
 		}, 0)
@@ -327,35 +339,41 @@
 			return 0
 		}
 		const goodsPrice = props.data.reduce((prve, cur) => {
-			const curTotal = cur.info.filter(v => v.gift != true && v.status !== "return" &&!v.userCouponId&&(v.isMember&&v.memberPrice)&&(v.memberPrice!=v.price)).reduce((a,
+			const curTotal = cur.info.filter(v => v.gift != true && v.status !== "return" && !v
+				.userCouponId && (v.isMember && v.memberPrice) && (v.memberPrice != v.price)).reduce((
+				a,
 				b) => {
-				return a + (b.num * (b.price-b.memberPrice))
+				return a + (b.num * (b.price - b.memberPrice))
 			}, 0)
 			return prve + curTotal
 		}, 0)
 		return goodsPrice.toFixed(2)
 	})
-	
-	const productCoupPrice=computed(()=>{
-		if(props.orderInfo.status=='closed'){
+
+	const productCoupPrice = computed(() => {
+		if (props.orderInfo.status == 'closed') {
 			return props.orderInfo.productCouponDiscountAmount
 		}
 		const goodsPrice = props.data.reduce((a, b) => {
-			const curTotal = b.info.filter(v => v.gift != true&& v.userCouponId).reduce((prve,
+			const curTotal = b.info.filter(v => v.gift != true && v.userCouponId).reduce((prve,
 				cur) => {
-					const isVip=props.user.isVip&&cur.isMember
-					const memberPrice=cur.memberPrice?cur.memberPrice:cur.price
-					const price=isVip?memberPrice:cur.price
-					const curTotal=price*cur.num
-				return prve+curTotal
+				const isVip = props.user.isVip && cur.isMember
+				const memberPrice = cur.memberPrice ? cur.memberPrice : cur.price
+				const price = isVip ? memberPrice : cur.price
+				const curTotal = price * cur.num
+				return prve + curTotal
 			}, 0)
 			return a + curTotal
 		}, 0)
 		return goodsPrice.toFixed(2)
 	})
-	
-	const youhuiAllPrice=computed(()=>{
-		return (freePrice.value*1+vipDiscountPrice.value*1+props.orderInfo.fullCouponDiscountAmount+props.orderInfo.pointsDiscountAmount+productCoupPrice.value*1+(props.orderInfo.discountAmount||0)).toFixed(2)
+
+	const youhuiAllPrice = computed(() => {
+		console.log(freePrice.value * 1 , vipDiscountPrice.value * 1 , props.orderInfo.fullCouponDiscountAmount ,props
+			.orderInfo.pointsDiscountAmount , productCoupPrice.value * 1 , props.orderInfo.discountAmount);
+		return (freePrice.value * 1 + vipDiscountPrice.value * 1 + props.orderInfo.fullCouponDiscountAmount + props
+			.orderInfo.pointsDiscountAmount + productCoupPrice.value * 1 + (props.orderInfo.discountAmount ||
+				0)).toFixed(2)
 	})
 	const packFee = computed(() => {
 		const goodsPrice = props.data.reduce((prve, cur) => {
@@ -369,8 +387,8 @@
 
 	})
 	const allPrice = computed(() => {
-		const n=goodsOriginAllPrice.value-youhuiAllPrice.value
-		return (n<0?0:n).toFixed(2)
+		const n = goodsOriginAllPrice.value - youhuiAllPrice.value
+		return (n < 0 ? 0 : n).toFixed(2)
 	})
 
 	const goodsNumber = computed(() => {

From d588fd16ce3c2cccc6e4ae0f508ea9566a0d73e0 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 20 Nov 2024 14:53:03 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=80=80=E8=8F=9C=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 commons/utils/goodsUtil.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/commons/utils/goodsUtil.js b/commons/utils/goodsUtil.js
index 8c7a802..11a9921 100644
--- a/commons/utils/goodsUtil.js
+++ b/commons/utils/goodsUtil.js
@@ -21,6 +21,9 @@ export function canTuiKuan(orderInfo, item) {
 	return orderInfo.status == 'closed' && item.status != 'return' && item.status != 'refund' && item.status !=
 		'refunding' && !item.userCouponId
 }
+export function isTuiCai(item) {
+	return item.status == 'return' 
+}
 export function isTui(item) {
 	return item.status == 'return' || item.status == 'refund' || item.status == 'refunding'
 }

From b0986065f457afffa42b875cdb5ccfffdc9e4f13 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 20 Nov 2024 15:06:27 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BC=98=E6=83=A0=E8=AE=A1=E7=AE=97=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesOrder/detail/components/list.vue | 30 +++++++++++++--------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index 3ef1731..9e9912f 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -58,12 +58,7 @@
 								<view class="u-text-right u-m-t-28">
 									<template v-if="isTui(item)">
 										<view>￥0.00</view>
-										<template
-											v-if="user.isVip&&item.isMember&&returnVipMoney(item)>0&&returnVipMoney(item)!=returnTotalMoney(item)">
-											<view class="line-th color-666 ">{{returnVipMoney(item)}}</view>
-											
-										</template>
-										<view class="line-th color-666 " v-else>￥{{returnTotalMoney(item)}}
+										<view class="line-th color-666 " >￥{{returnTotalMoney(item)}}
 										</view>
 									</template>
 									<template v-else-if="isGift(item)||item.userCouponId">
@@ -175,25 +170,25 @@
 			<view class="u-p-30" style="width: 80vw;">
 				<view class="font-bold  u-text-center">优惠详情</view>
 				<view class="u-m-t-32">
-					<!-- <view class="u-flex u-row-between u-m-b-18">
+					<view class="u-flex u-row-between u-m-b-18">
 						<view>会员优惠</view>
 						<view class="color-red">
 							<text>￥</text>
 							<text>{{vipDiscountPrice}}</text>
 						</view>
-					</view> -->
+					</view>
 					<view class="u-flex u-row-between u-m-b-18" v-if="orderInfo.discountAmount*1>0">
 						<view>打折</view>
 						<view class="color-red">
 							<text>￥</text>
-							<text>{{orderInfo.discountAmount}}</text>
+							<text>{{to2(orderInfo.discountAmount) }}</text>
 						</view>
 					</view>
 					<view class="u-flex u-row-between " v-if="orderInfo.fullCouponDiscountAmount*1>0">
 						<view>满减券抵扣</view>
 						<view class="color-red">
 							<text>￥</text>
-							<text>{{orderInfo.fullCouponDiscountAmount}}</text>
+							<text>{{to2(orderInfo.fullCouponDiscountAmount) }}</text>
 						</view>
 					</view>
 					<view class="u-flex u-row-between u-m-t-18"
@@ -201,14 +196,14 @@
 						<view>商品券抵扣</view>
 						<view class="color-red">
 							<text>￥</text>
-							<text>{{orderInfo.productCouponDiscountAmount||productCoupPrice}}</text>
+							<text> {{to2(orderInfo.productCouponDiscountAmount||productCoupPrice) }}</text>
 						</view>
 					</view>
 					<view class="u-flex u-row-between u-m-t-18" v-if="orderInfo.pointsDiscountAmount">
 						<view>积分抵扣</view>
 						<view class="color-red">
 							<text>￥</text>
-							<text>{{orderInfo.pointsDiscountAmount}}</text>
+							<text>{{to2(orderInfo.pointsDiscountAmount) }}</text>
 						</view>
 					</view>
 
@@ -228,7 +223,8 @@
 		hasPermission
 	} from '@/commons/utils/hasPermission.js'
 	import {
-		isTui,isTuiCai,
+		isTui,
+		isTuiCai,
 		isGift,
 		canTuiKuan,
 		canTuicai,
@@ -327,7 +323,7 @@
 		const goodsPrice = props.data.reduce((prve, cur) => {
 			const curTotal = cur.info.filter(v => v.gift == true || isGift(v)).reduce((a,
 				b) => {
-					const price=(b.isMember && b.memberPrice)?b.memberPrice:b.price
+				const price = (b.isMember && b.memberPrice) ? b.memberPrice : b.price
 				return a + (b.num * price)
 			}, 0)
 			return prve + curTotal
@@ -369,11 +365,13 @@
 	})
 
 	const youhuiAllPrice = computed(() => {
-		console.log(freePrice.value * 1 , vipDiscountPrice.value * 1 , props.orderInfo.fullCouponDiscountAmount ,props
-			.orderInfo.pointsDiscountAmount , productCoupPrice.value * 1 , props.orderInfo.discountAmount);
+		// console.log(freePrice.value * 1 , vipDiscountPrice.value * 1 , props.orderInfo.fullCouponDiscountAmount ,props
+		// 	.orderInfo.pointsDiscountAmount , productCoupPrice.value * 1 , props.orderInfo.discountAmount);
 		return (freePrice.value * 1 + vipDiscountPrice.value * 1 + props.orderInfo.fullCouponDiscountAmount + props
 			.orderInfo.pointsDiscountAmount + productCoupPrice.value * 1 + (props.orderInfo.discountAmount ||
 				0)).toFixed(2)
+
+
 	})
 	const packFee = computed(() => {
 		const goodsPrice = props.data.reduce((prve, cur) => {