From 134e9cbe6ef2b58f900e17957d59ec072af2075f Mon Sep 17 00:00:00 2001
From: sszdot <szdot@qq.com>
Date: Thu, 12 Dec 2024 16:59:03 +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=20=E3=80=90=E8=BF=87=20=20=E7=A8=8B=E3=80=91=EF=BC=9A?=
 =?UTF-8?q?=E4=BB=8E=E5=95=86=E9=93=BA=E4=BF=A1=E6=81=AF=E9=87=8C=E9=9D=A2?=
 =?UTF-8?q?=20=E5=8F=96=E9=BB=98=E8=AE=A4=E8=BF=90=E8=B4=B9=20=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E8=B4=B9=E5=AD=97=E6=AE=B5=20=20=E4=BD=9C=E4=B8=BA?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E8=BF=90=E8=B4=B9=20=E5=92=8C=20?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E8=B4=B9=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：构建过程或辅助工具的变动
---
 pages/shop/order.vue | 30 ++++++++++++++++++++++++------
 pages/shop/pay.vue   |  5 +++++
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/pages/shop/order.vue b/pages/shop/order.vue
index 7f61f4f..7ee1ece 100644
--- a/pages/shop/order.vue
+++ b/pages/shop/order.vue
@@ -25,7 +25,7 @@
 			</view>
 			<view class="flex m-t-12 p-l-24 p-r-24 fz28 msb">
 				<view>送达时间</view>
-				<view>预估30分钟之后送达</view>
+				<view>预估{{estimated}}分钟之后送达</view>
 			</view>
 		</view>
 		<!-- 订单详情 -->
@@ -56,15 +56,15 @@
 			</view>
 			<view class="flex msb fz28 m-b-12">
 				<view>外送费</view>
-				<view>¥5.00</view>
+				<view>¥{{transportPrice | formatPrice}}</view>
 			</view>
 			<view class="flex msb fz28 m-b-24 p-b-24 borderBDas">
 				<view>打包服务费</view>
-				<view>¥2.00</view>
+				<view>¥{{packPrice | formatPrice}}</view>
 			</view>
 			<view class="flex mr mac">
 				<view class="fcb fz24">合计</view>
-				<view class="m-l-12 fz36 fb">¥{{total | formatPrice}}</view>
+				<view class="m-l-12 fz36 fb">¥{{fullPrice | formatPrice}}</view>
 			</view>
 		</view>
 		<!-- 客户备注 -->
@@ -81,7 +81,7 @@
 				合计
 			</view>
 			<view class="flex column m-r-12">
-				<view class="fb fz36">¥{{total | formatPrice}}</view>
+				<view class="fb fz36">¥{{fullPrice | formatPrice}}</view>
 				<view class="fz24">共{{totalCount}}件</view>
 			</view>
 			<view class="fz32 flex column mac mc fci rad8 m-r-24" style="width:220rpx;height:100rpx;"
@@ -117,6 +117,10 @@
 			shopCon() {
 				return this.$store.state.shopCon
 			},
+			//预估送达时间
+			estimated() {
+				return 30
+			},
 			//购物车列表
 			cartList() {
 				return this.$store.state.cartList
@@ -125,6 +129,14 @@
 			total() {
 				return this.totalPrice(this.$store.state.cartList)
 			},
+			//外送费
+			transportPrice() {
+				return Number(this.$store.state.shopCon.default_transport_price)
+			},
+			//打包服务费
+			packPrice() {
+				return Number(this.$store.state.shopCon.default_pack_price)
+			},
 			//购物车货品总数 ps:sku的总数 即单品总数
 			totalCount() {
 				let total = 0
@@ -135,6 +147,10 @@
 				}
 				return total
 			},
+			//所有总价包括 商品总价 打包费 等总和
+			fullPrice() {
+				return this.total + this.transportPrice + this.packPrice
+			},
 			//用户信息
 			userInfo() {
 				return this.$store.state.userInfo
@@ -153,7 +169,9 @@
 				uni.$u.http.post('/Api/Check/checkout', {
 					cartList: JSON.stringify(this.cartList), //购物车列表
 					shop_id: this.$store.state.shop_id, //商铺id
-					total: this.total, //总价格
+					total: this.total, //商品总价格
+					transport_price: this.transportPrice, //运费
+					pack_price: this.packPrice, //打包费
 					site_id: this.$store.state.site_id, //站点id
 					remark: this.remark //客户订单备注
 				}, {
diff --git a/pages/shop/pay.vue b/pages/shop/pay.vue
index 7a75fdf..464a733 100644
--- a/pages/shop/pay.vue
+++ b/pages/shop/pay.vue
@@ -6,6 +6,8 @@
 				<u-icon name="arrow-left" color="#fff" size="19"></u-icon>
 			</view>
 		</u-navbar>
+		<!-- 价格 -->
+		<view></view>
 		<button @click="pay" type="primary" style="margin-top:200rpx;">确认支付</button>
 	</view>
 </template>
@@ -19,6 +21,9 @@
 		},
 		onLoad(options) {
 			this.order_sn = options.order_sn; // 从提交订单页面传递过来的订单号
+		},
+		computed(){
+			
 		},
 		methods: {
 			// 支付方法