From a983a93c5d35d6c8500459208992949171d6e04a Mon Sep 17 00:00:00 2001
From: sszdot <szdot@qq.com>
Date: Tue, 24 Dec 2024 15:36:39 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afactor=20=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E6=9C=AA=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=20?=
 =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E6=94=AF=E4=BB=98=E6=8C=89=E9=92=AE=20?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=20=E3=80=90=E8=BF=87=20=20=E7=A8=8B=E3=80=91=EF=BC=9A=E7=BB=99?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=8A=A0=E8=B7=B3=E8=BD=AC=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=20=E6=8A=8A=E8=AE=A2=E5=8D=95=E5=8F=B7=20=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E6=80=BB=E5=92=8C=20=E4=BC=A0=E5=88=B0=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E5=B9=B6=E8=B7=B3=E8=BD=AC=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E9=A1=B5=E9=9D=A2=20=E3=80=90=E5=BD=B1=20=20=E5=93=8D?=
 =?UTF-8?q?=E3=80=91=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 components/orderItem/orderItem.vue | 32 ++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/components/orderItem/orderItem.vue b/components/orderItem/orderItem.vue
index 9f3d5f9..01e990a 100644
--- a/components/orderItem/orderItem.vue
+++ b/components/orderItem/orderItem.vue
@@ -7,7 +7,8 @@
 				<view class="fz32 l-h-18 fb">取餐点：{{order.receive_site_name}}</view>
 				<view class="m-t-12">
 					<scroll-view class="scroll-view_H" scroll-x="true">
-						<view class="scroll-view-item_H m-r-12" v-for="(ps,index) in order.product_snapshot" :key="index">
+						<view class="scroll-view-item_H m-r-12" v-for="(ps,index) in order.product_snapshot"
+							:key="index">
 							<u--image :src="ps.spu_photo[0]" width="147rpx" height="110rpx" radius="4rpx" />
 						</view>
 					</scroll-view>
@@ -16,15 +17,17 @@
 			<view class="flex1 flex column md">
 				<view class="fz28 fb fcm l-h-18">{{ orderStatusDisplay }}</view>
 				<view class="priceBox fz36 fb">
-					¥{{Number(order.transport_price) + Number(order.pack_price) + Number(order.total_price) | formatPrice}}
+					¥{{fullPrice}}
 				</view>
 				<view class="fz24 fcb">共{{order.total_num}}件</view>
 			</view>
 		</view>
 		<view class="m-t-24 flex mr">
-			<view v-if="showPayButton" class="nullBut bg-m fci rad8 fz28 flex mac mc m-l-24">
-				立即支付
-			</view>
+			<navigator :url="`/pages/shop/pay?order_sn=${order.order_sn}&fullPrice=${fullPrice}`" hover-class="navigator-hover">
+				<view v-if="showPayButton" class="nullBut bg-m fci rad8 fz28 flex mac mc">
+					立即支付
+				</view>
+			</navigator>
 			<view v-if="showPickupNumber" class="numberBut bg-m fci rad8 fz28 fb flex mac mc m-l-24">
 				{{ foodSn }}
 			</view>
@@ -61,23 +64,27 @@
 			clearInterval(this.intervalId);
 		},
 		computed: {
-			// 计算属性：是否显示 "立即支付" 按钮
+			//订单总价格
+			fullPrice(){
+				return this.formatPrice(Number(this.order.transport_price) + Number(this.order.pack_price) + Number(this.order.total_price))
+			},
+			// 是否显示 "立即支付" 按钮
 			showPayButton() {
 				return this.order.main_status === '未付款';
 			},
-			// 计算属性：是否显示 "取餐号"
+			// 是否显示 "取餐号"
 			showPickupNumber() {
 				return this.order.main_status === '已付款' && this.order.refund_status === '未申请';
 			},
-			// 计算属性：是否显示 "申请售后" 按钮
+			// 是否显示 "申请售后" 按钮
 			showAfterSaleButton() {
 				return this.order.main_status === '已付款' && this.order.refund_status === '未申请';
 			},
-			// 计算属性：是否显示 "退款详情" 按钮
+			// 是否显示 "退款详情" 按钮
 			showRefundDetailsButton() {
 				return this.order.refund_status !== '未申请' && this.order.main_status !== '已完成';
 			},
-			// 计算属性：显示订单状态
+			// 显示订单状态
 			orderStatusDisplay() {
 				if (this.order.main_status === '未付款') {
 					return '待支付';
@@ -98,7 +105,7 @@
 						return '';
 				}
 			},
-			// 计算属性：显示退款状态
+			// 显示退款状态
 			refundStatusDisplay() {
 				switch (this.order.refund_status) {
 					case '申请中':
@@ -114,6 +121,9 @@
 				}
 			},
 		},
+		methods:{
+			formatPrice //价格格式化
+		},
 		props: {
 			order: {
 				type: Object,