From 50652f789e98ef54b27b6dbc4b1119e5ae4b249d Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Fri, 14 Mar 2025 11:25:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/sangdai/sangdai.vue | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/pages/sangdai/sangdai.vue b/pages/sangdai/sangdai.vue
index fefecab..9f3ed06 100644
--- a/pages/sangdai/sangdai.vue
+++ b/pages/sangdai/sangdai.vue
@@ -86,7 +86,9 @@
 							<view class="pic">
 								<image :src="a.goodslist_imgurl" lazy-load></image>
 								<view class="num center">×{{ a.prize_num }}</view>
-								<view class="num" style="left:auto;right:0;border-radius:0rpx 0rpx 0rpx 15rpx;background: #FF4D1E;" v-if="a.fh_status==1">已发货</view>
+								<view class="num"
+									style="left:auto;right:0;border-radius:0rpx 0rpx 0rpx 15rpx;background: #FF4D1E;"
+									v-if="a.fh_status==1">已发货</view>
 							</view>
 
 							<view class="title hang1">
@@ -232,11 +234,11 @@
 						</view>
 					</view>
 					<view class="freight border">
-						<view>快递(满{{ freightData.free_post }}件包邮)</view>
+						<view>快递(满288包邮,当前货物价值：{{nowChooseMoney}})</view>
 						<view>
 							<text>
 								{{
-								  nowChooseNum >= freightData.free_post
+								  nowChooseMoney >= 288
 									? '包邮'
 									: `¥${freightData.post_money}`
 								}}
@@ -441,10 +443,37 @@
 				if (this.tabList[this.tabCur].id != 1) return
 
 				const arr = this.getChooseGoods()
+				var mon = 0;
+				arr.forEach(item => {
+					console.log(item);
+					if (item.goodslist_money > 0) {
+						let m = item.goodslist_money / 100;
+						mon += m;
+					}
+				});
+				return arr.reduce((pre, item) => {
 
-				return arr.reduce((pre, item) => pre + Number(item.chooseNum), 0)
+					return pre + Number(item.chooseNum)
+
+				}, 0)
+				// return mon;
 			},
+			/* 当前选中数量 */
+			nowChooseMoney() {
+				if (this.tabList[this.tabCur].id != 1) return
 
+				const arr = this.getChooseGoods()
+				var mon = 0;
+				arr.forEach(item => {
+					// console.log(item);
+					if (item.goodslist_money > 0 && item.chooseNum > 0) {
+						let m = item.goodslist_money / 100 * item.chooseNum;
+						mon += m;
+					}
+				});
+
+				return mon;
+			},
 			/* 当前赏品总数 */
 			nowNum() {
 				if (this.tabList[this.tabCur].id != 1) return