From 16b8ad101e892b240a3c575ed4bf8d0f9c214956 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Tue, 24 Jun 2025 18:08:06 +0800
Subject: [PATCH] =?UTF-8?q?Feat=EF=BC=9A=20=E6=8A=98=E6=89=A3=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/GoodsCon/index.vue | 10 ++++++++--
 pkg_user/views/gift/gift.vue  | 25 +++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index cc3a2f4..3e2d027 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -73,6 +73,7 @@
             :style="giftBg ? 'background: url(' + giftBg + ') no-repeat center/cover' : ''"
             :class="giftBg ? '' : 'v12-primary'"
           >
+            <text v-if="storeInfo.discount > 0" class="v12-font-24 v12-yellow-text ll-text">平台补贴限时{{ storeInfo.discount }}%</text>
             <view class="v12-font-28 v12-align-center" style="height: 74rpx; opacity: 0;">
               <image class="gift-img" :src="webUrl + '/orderIcon/gift.png'" mode="widthFix" ></image>
               支持礼包赠送
@@ -1457,7 +1458,8 @@ export default {
             path: "/pages/order/OrderSubmission/index",
             query: {
               id: res.data.cartId,
-              couponId: that.couponId // 优惠券ID
+              couponId: that.couponId, // 优惠券ID
+              discount: that.storeInfo.discount,
             }
           })
           return
@@ -1465,7 +1467,7 @@ export default {
         if(news === 2) {
           const coupId = that.couponId ? that.couponId : (that.couponList.usable[0] && that.couponList.usable[0].id || '')
           uni.navigateTo({
-            url: '/pkg_user/views/gift/gift?cartId=' + res.data.cartId + '&couponId=' + coupId
+            url: '/pkg_user/views/gift/gift?cartId=' + res.data.cartId + '&couponId=' + coupId + (that.storeInfo.discount ? '&discount=' + that.storeInfo.discount : '')
           })
         }
         if(news === 0) {
@@ -2181,4 +2183,8 @@ export default {
   left: 0;
   width: 100%;
 }
+.ll-text{
+  margin-left: 280rpx;
+  word-break: keep-all;
+}
 </style>
diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
index 7d8b9ae..23523ee 100644
--- a/pkg_user/views/gift/gift.vue
+++ b/pkg_user/views/gift/gift.vue
@@ -95,6 +95,13 @@
         <u-switch v-model="canTransfer" ></u-switch>
       </view>
     </view>
+    <view class="price-wrap">
+      <view class="v12-font-28 v12-dark-text v12-font-bold">价格明细</view>
+      <view class="v12-justify-between v12-align-center v12-font-28 v12-mt-1">
+        <view>商品总价：</view>
+        <view>1224</view>
+      </view>
+    </view>
     <button v-if="isPayOk" open-type="share" class="share-btn" >
       <view class="v12-font-28 v12-primary-text v12-align-center">
         <u-icon :name="webUrl + '/icon/gift-primary.png'" size="18"></u-icon>
@@ -181,12 +188,14 @@ export default {
       giftKey: '',
       payPrice: 0,
       orderId: '',
-      defaultIndex:0
+      defaultIndex:0,
+      discount: null
     }
   },
   onLoad(opts) {
     this.cartId = opts.cartId
     this.couponId = opts.couponId
+    this.discount = opts.discount
     this.getGift()
   },
   computed: mapGetters(["userInfo"]),
@@ -248,7 +257,10 @@ export default {
       const params = {
         cartId: this.cartId,
         couponId: this.couponId,
-        cartNum : num, 
+        cartNum : num
+      }
+      if(this.discount) {
+        params.discount = this.discount
       }
       getGiftCardSendOrderAmount(this.orderKey, params).then(res => {
         this.payPrice = res.data.result.payPrice
@@ -553,4 +565,13 @@ export default {
 .share-btn::after {
   border: none;
 }
+.price-wrap{
+  width: 100%;
+  height: 320rpx;
+  background: #fff;
+  border-radius: 20rpx;
+  margin-top: 30rpx;
+  padding: 20rpx;
+  box-sizing: border-box;
+}
 </style>
\ No newline at end of file