From a06c32334e5dd9d66094766e20357c3ae3ebc07e Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 28 Oct 2024 17:06:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=80=80=E6=AC=BE=E6=89=93=E5=8C=85=E7=AD=89?=
 =?UTF-8?q?tag=E6=A0=87=E7=AD=BE=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesOrder/detail/components/list.vue     | 91 +++++++++++++++--------
 pagesOrder/index/compoents/order-item.vue |  6 +-
 2 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index 7499ef6..dc2dbc3 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -23,30 +23,39 @@
 
 								<view class="">
 									<view class="u-flex">
-										<view class="tui" v-if="item.status=='return'">
+										<view class="tui" v-if="item.status=='return'||item.status=='refund'">
 											已退
 										</view>
-										<view :class="{'line-th':item.status=='return'}">{{item.name||item.productName}}
+										<view :class="{'line-th':item.status=='return'||item.status=='refund'}">{{item.name||item.productName}}
+										</view>
+									</view>
+									<view class="u-flex u-m-t-8">
+										<view class="u-m-r-20 u-flex " v-if="item.gift">
+											<uni-tag text="赠送"
+												custom-style="background-color: #FFF0DF; border-color: #FFF0DF; color: #FF9F2E;">
+											</uni-tag>
+										</view>
+										<view class="u-m-r-20 u-flex" v-if="item.pack">
+											<uni-tag
+												custom-style="background-color: #E6F0FF; border-color: #E6F0FF; color: #318AFE;"
+												size="small" text="打包" inverted type="success" />
 										</view>
 									</view>
 									<view class="color-999 u-font-24 u-m-t-8">{{item.productSkuName||''}}</view>
+
+
 									<view class="u-m-t-12 color-666 u-font-24" v-if="item.note">
 										备注：{{item.note}}
 									</view>
 								</view>
 								<view class="u-text-right u-m-t-28">
-									<template v-if="item.status=='return'">
+									<template v-if="item.status=='return'||item.gift||item.status=='refund'">
 										<view>￥0.00</view>
-										<view class="line-th color-666 ">￥{{item.salePrice||item.price}}</view>
+										<view class="line-th color-666 ">￥{{returnTotalMoney(item)}}
+										</view>
 									</template>
 									<template v-else>
-										<template v-if="item.priceAmount<=0">
-											<view>￥0.00</view>
-											<view class="line-th color-666 ">￥{{returnTotalMoney(item)}}</view>
-										</template>
-										<template v-else>
-											<view>￥{{item.priceAmount}}</view>
-										</template>
+										<view>￥{{returnTotalMoney(item)}}</view>
 									</template>
 									<view class="u-m-t-22 color-999 u-font-24">X{{item.number||item.num}}</view>
 								</view>
@@ -56,11 +65,11 @@
 					<template v-if="orderInfo.status=='unpaid'&&orderInfo.useType!='dine-in-before'">
 						<view class="u-flex u-row-right gap-20 u-m-t-24" v-if="item.status!='return'">
 							<!-- <my-button :height="60" color="#333" plain type="cancel" shape="circle">更多操作</my-button> -->
-							<my-button :width="128" :height="48" plain shape="circle"
-								@tap="tuicai(item,index)"><text class="no-wrap">退菜</text></my-button>
+							<my-button :width="128" :height="48" plain shape="circle" @tap="tuicai(item,index)"><text
+									class="no-wrap">退菜</text></my-button>
 						</view>
 					</template>
-					<template v-if="item.status!='refund'">
+					<template v-if="item.status!='refund'&&!item.gift">
 						<template v-if="orderInfo.status=='closed'||orderInfo.status=='refund'">
 							<view class="u-flex u-row-right gap-20 u-m-t-20" v-if="item.status!='return'">
 								<my-button :width="128" :height="48" plain shape="circle"
@@ -68,7 +77,7 @@
 							</view>
 						</template>
 					</template>
-					
+
 				</view>
 			</view>
 			<!-- <view class="bg-gray u-p-20 u-m-t-20" v-if="orderInfo.remark">
@@ -97,7 +106,7 @@
 					<text class="font-bold u-font-32">{{allPrice}}</text>
 				</view>
 			</view>
-			
+
 			<template v-if="orderInfo.status=='refund'">
 				<view class="u-flex u-row-between u-m-t-32">
 					<view>退款金额</view>
@@ -122,7 +131,7 @@
 				<view></view>
 				<view>
 					<text>总计￥</text>
-					<text class="font-bold u-font-32">{{to2(allPrice*1+seatFeePrice*1) }}</text>
+					<text class="font-bold u-font-32">{{to2(allPrice*1+seatFeePrice*1+packFee*1) }}</text>
 				</view>
 			</view>
 			<view class="u-m-t-24">
@@ -137,26 +146,29 @@
 		computed
 	} from 'vue';
 	import color from '@/commons/color.js'
-	import {hasPermission} from '@/commons/utils/hasPermission.js'
+	import {
+		hasPermission
+	} from '@/commons/utils/hasPermission.js'
 	const emits = defineEmits(['tuicai', 'tuikuan', 'printOrder'])
-	
-	function returnTotalMoney(item){
-		return (item.price*item.num).toFixed(2)
+
+	function returnTotalMoney(item) {
+		return (item.price * item.num).toFixed(2)
 	}
-	function to2(n){
-		if(!n){
+
+	function to2(n) {
+		if (!n) {
 			return 0
 		}
 		return n.toFixed(2)
 	}
-	
+
 	function tuicai(item, index) {
 		emits('tuicai', item, index)
 	}
 
 	function tuikuan(item, index) {
-		hasPermission('允许退款').then(res=>{
-			if(res){
+		hasPermission('允许退款').then(res => {
+			if (res) {
 				emits('tuikuan', item, index)
 			}
 		})
@@ -190,9 +202,11 @@
 
 	const allPrice = computed(() => {
 		const goodsPrice = props.data.reduce((prve, cur) => {
-			const curTotal = cur.info.filter(v => v.isGift !== "true" && v.status !== "return").reduce((a,
+			const curTotal = cur.info.filter(v => v.gift != true && v.status !== "return").reduce((a,
 				b) => {
-				return a + b.priceAmount*1
+				// return a +  b.priceAmount*1||(b.num*b.price+b.packAmount*1)
+				// return a +  (b.num*b.price+b.packAmount*1)
+				return a + (b.num * b.price)
 			}, 0)
 			return prve + curTotal
 		}, 0)
@@ -200,6 +214,19 @@
 
 	})
 
+	const packFee = computed(() => {
+		const goodsPrice = props.data.reduce((prve, cur) => {
+			const curTotal = cur.info.filter(v => v.gift != true && v.status !== "return").reduce((a,
+				b) => {
+				return a + b.packAmount
+			}, 0)
+			return prve + curTotal
+		}, 0)
+		return goodsPrice.toFixed(2)
+
+	})
+
+
 	const goodsNumber = computed(() => {
 		let result = 0
 		result = props.data.reduce((a, b) => {
@@ -222,9 +249,11 @@
 	.border-top {
 		border-color: #F6F6F6;
 	}
-	.border-r-24{
+
+	.border-r-24 {
 		border-radius: 24rpx;
 	}
+
 	.border-bottom {
 		// border-color: rgb(240, 240, 240);
 		border-color: #F6F6F6;
@@ -238,11 +267,13 @@
 		padding: 4rpx 8rpx 2rpx 10rpx;
 		border-radius: 8rpx;
 		font-size: 24rpx;
+
 		&.no-pay {
 			background-color: rgb(170, 170, 170);
 			color: #fff;
 		}
-		&.refund{
+
+		&.refund {
 			background-color: #FCE7E7;
 			padding: 8rpx 20rpx 6rpx 22rpx;
 			color: #EB4F4F;
diff --git a/pagesOrder/index/compoents/order-item.vue b/pagesOrder/index/compoents/order-item.vue
index f35e154..8b51174 100644
--- a/pagesOrder/index/compoents/order-item.vue
+++ b/pagesOrder/index/compoents/order-item.vue
@@ -54,12 +54,12 @@
 				</view>
 
 			</view>
-			<view class="border-bottom">
-				<view class="u-flex u-row-between  u-m-t-32  u-col-top" v-if="data.packFee>0">
+			<view class="border-bottom u-p-t-32 u-p-b-32" v-if="data.packFee>0||(data.seatInfo&&data.seatInfo.priceAmount>0)">
+				<view class="u-flex u-row-between    u-col-top" v-if="data.packFee>0">
 					<view class="no-wrap u-m-r-32">打包费</view>
 					<view>￥{{data.packFee||0}}</view>
 				</view>
-				<view class="u-flex u-row-between  u-m-t-32 u-p-b-32 u-col-top" v-if="data.seatInfo&&data.seatInfo.priceAmount>0">
+				<view class="u-flex u-row-between   u-m-t-32 u-col-top" v-if="data.seatInfo&&data.seatInfo.priceAmount>0">
 					<view class="no-wrap u-m-r-32">{{data.seatInfo.productName}}</view>
 					<view>￥{{data.seatInfo.priceAmount}}</view>
 				</view>