From b8a0a13ad3425e8e0cc71dc7d026f06c66c4acc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AF=85?= <1335909236@qq.com>
Date: Wed, 8 Oct 2025 14:56:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8=E5=95=86?=
=?UTF-8?q?=E5=93=81=E4=BB=B7=E6=A0=BC=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/advertising/goodsSubmit/index.vue | 23 +++++++------
packages/advertising/index/index.vue | 2 ++
packages/advertising/shopCar/index.vue | 39 ++++++++++++----------
3 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/packages/advertising/goodsSubmit/index.vue b/packages/advertising/goodsSubmit/index.vue
index 1b2c113b..5ac8dc16 100644
--- a/packages/advertising/goodsSubmit/index.vue
+++ b/packages/advertising/goodsSubmit/index.vue
@@ -163,7 +163,7 @@
- {{ '￥' + item.commodity_goods_info.sales_price }}
+ {{ '￥' + item.price }}
/{{ item.commodity_goods_info.goods_unit }}
@@ -553,16 +553,17 @@ export default {
} else {
let total = 0;
this.orderList2.forEach(goods => {
- // 团购活动时间判断
- const startTime = new Date(goods.commodity_goods_info.group_buy_activity_info?.start_time).getTime();
- const endTime = new Date(goods.commodity_goods_info.group_buy_activity_info?.end_time).getTime();
- if (currentTime >= startTime && currentTime <= endTime) {
- // total += goods.commodity_goods_info.group_buy_price * goods.count + goods.commodity_goods_info.freight;
- total += goods.commodity_goods_info.group_buy_price * goods.count;
- } else {
- // total += goods.commodity_goods_info.sales_price * goods.count + goods.commodity_goods_info.freight;
- total += goods.commodity_goods_info.sales_price * goods.count;
- }
+ // // 团购活动时间判断
+ // const startTime = new Date(goods.commodity_goods_info.group_buy_activity_info?.start_time).getTime();
+ // const endTime = new Date(goods.commodity_goods_info.group_buy_activity_info?.end_time).getTime();
+ // if (currentTime >= startTime && currentTime <= endTime) {
+ // // total += goods.commodity_goods_info.group_buy_price * goods.count + goods.commodity_goods_info.freight;
+ // total += goods.commodity_goods_info.group_buy_price * goods.count;
+ // } else {
+ // // total += goods.commodity_goods_info.sales_price * goods.count + goods.commodity_goods_info.freight;
+ // total += goods.commodity_goods_info.sales_price * goods.count;
+ // }
+ total += goods.price * goods.count;
});
// 加运费
return total.toFixed(2);
diff --git a/packages/advertising/index/index.vue b/packages/advertising/index/index.vue
index 33fe0878..81f2bbc0 100644
--- a/packages/advertising/index/index.vue
+++ b/packages/advertising/index/index.vue
@@ -172,6 +172,7 @@ export default {
{
goods_id: item.goods_id,
count: item.quantity,
+ price: item.promotional_price,
},
],
adver_id: item.adver_id
@@ -195,6 +196,7 @@ export default {
{
goods_id: item.goods_id,
count: item.quantity,
+ price: item.promotional_price,
},
],
adver_id: item.adver_id
diff --git a/packages/advertising/shopCar/index.vue b/packages/advertising/shopCar/index.vue
index 6061d6f9..d5dd3bb6 100644
--- a/packages/advertising/shopCar/index.vue
+++ b/packages/advertising/shopCar/index.vue
@@ -70,7 +70,7 @@
- ￥{{ getPrice(item) }}
+ ￥{{ item.price }}
@@ -154,7 +154,7 @@
- ￥{{ getPrice(item) }}
+ ￥{{ item.price }}
@@ -491,14 +491,15 @@ export default {
this.isDayCarList.forEach(carItem => {
carItem.commodity_cart_and_goods_model.forEach(goods => {
if (goods.checked) {
- // 团购活动时间判断
- const startTime = new Date(goods.commodity_goods_info.group_buy_activity_info?.start_time).getTime();
- const endTime = new Date(goods.commodity_goods_info.group_buy_activity_info?.end_time).getTime();
- if (currentTime >= startTime && currentTime <= endTime) {
- total += goods.commodity_goods_info.group_buy_price * goods.count;
- } else {
- total += goods.commodity_goods_info.sales_price * goods.count;
- }
+ // // 团购活动时间判断
+ // const startTime = new Date(goods.commodity_goods_info.group_buy_activity_info?.start_time).getTime();
+ // const endTime = new Date(goods.commodity_goods_info.group_buy_activity_info?.end_time).getTime();
+ // if (currentTime >= startTime && currentTime <= endTime) {
+ // total += goods.commodity_goods_info.group_buy_price * goods.count;
+ // } else {
+ // total += goods.commodity_goods_info.sales_price * goods.count;
+ // }
+ total += goods.price * goods.count
}
});
});
@@ -507,14 +508,15 @@ export default {
this.shopCarList.forEach(carItem => {
carItem.commodity_cart_and_goods_model.forEach(goods => {
if (goods.checked) {
- // 团购活动时间判断
- const startTime = new Date(goods.commodity_goods_info.group_buy_activity_info?.start_time).getTime();
- const endTime = new Date(goods.commodity_goods_info.group_buy_activity_info?.end_time).getTime();
- if (currentTime >= startTime && currentTime <= endTime) {
- total += goods.commodity_goods_info.group_buy_price * goods.count;
- } else {
- total += goods.commodity_goods_info.sales_price * goods.count;
- }
+ // // 团购活动时间判断
+ // const startTime = new Date(goods.commodity_goods_info.group_buy_activity_info?.start_time).getTime();
+ // const endTime = new Date(goods.commodity_goods_info.group_buy_activity_info?.end_time).getTime();
+ // if (currentTime >= startTime && currentTime <= endTime) {
+ // total += goods.commodity_goods_info.group_buy_price * goods.count;
+ // } else {
+ // total += goods.commodity_goods_info.sales_price * goods.count;
+ // }
+ total += goods.price * goods.count
}
});
});
@@ -718,6 +720,7 @@ export default {
goods_id_and_count: [{
goods_id: item.goods_id,
count: val,
+ price: item.price,
},],
};
request(apiArr.updateCar, "POST", params).then((res) => {