From 933bd0d64ebcb1184bd0c267ae72df7013446fad Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Wed, 9 Jul 2025 01:00:50 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=88=86=E4=BA=AB=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/MyOrder/index.vue      |  8 +++++---
 pages/order/OrderDetails/index.vue | 12 ++++++------
 pages/shop/GoodsCon/index.vue      |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index b60b640..55a1ac1 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -158,14 +158,14 @@
         </view>
         <view class="bottom" v-else>
           <view class="v12-font-24 v12-grey tips-text" >
-            {{ Number(order.status) === 0 ? '待支付' : Number(order.status) === 9 ? '已取消' : getGiftTips(order.giftCardInfo) }}
+            {{ Number(order.status) === 0 ? '待支付'  : getGiftTips(order.giftCardInfo) }}
           </view>
           <view class="flex jc-between ai-center">
             <view class="bnt btn-service flex jc-center ai-center v12-font-24" @click="goRoom(order)"
                   v-if="order.merName">联系商家
             </view>
             <view class="v12-align-center">
-              <button v-if="Number(order.status) !== 0 && getGiftTips(order.giftCardInfo) && order.giftCardInfo.giftCardStatus !== 2 && order.giftCardInfo.giftNum !== order.giftCardInfo.receiveNum"  open-type="share" @click="shareGift(order)" class="gift-btn service v12-primary-text v12-primary-border" >送给朋友</button>
+              <button v-if="Number(order.status) !== 0 && order.giftCardInfo.giftCardStatus !== 9 && getGiftTips(order.giftCardInfo) && order.giftCardInfo.giftCardStatus !== 2 && order.giftCardInfo.giftNum !== order.giftCardInfo.receiveNum"  open-type="share" @click="shareGift(order)" class="gift-btn service v12-primary-text v12-primary-border" >送给朋友</button>
               <button v-if="Number(order.status) === 0 " @click="subscribePay(order)" class="gift-btn service v12-primary-text v12-primary-border" >立即支付</button>
               <!-- 查看详情 -->
               <view class="bnt service v12-primary-text v12-primary-border" @click="goOrderDetails(order)">查看详情</view>
@@ -326,7 +326,7 @@ export default {
     })
     return {
       title: this.giftItem.message || '礼笺轻启，礼藏心意',
-      path: `/pkg_user/views/gift/receive?code=${this.giftItem.code}`,
+      path: `/pkg_user/views/gift/receive?code=${this.giftItem.giftCardInfo.code}`,
       imageUrl: this.giftItem.cartInfo[0].productInfo.image
     }
   },
@@ -352,6 +352,8 @@ export default {
         return giftCardInfo.giftNum === giftCardInfo.receiveNum ? '礼品已全部被好友领取，不支持取消哦！' : '礼品已领取' + giftCardInfo.receiveNum + '/' + giftCardInfo.giftNum + '份，不支持取消哦！'
       } else if (giftCardInfo.giftCardStatus === 2) {
         return '该礼包已退款'
+      } else {
+        return '已取消'
       }
     },
     handleBody() {
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 44508e6..b2dcdd0 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -137,7 +137,7 @@
           </view>
         </view>
         <view class=""  v-if="orderInfo.cartInfo &&( d === orderInfo.cartInfo.length - 1)">
-          <view class="v12-justify-between v12-mt-3 v12-dark-text">
+          <view class="v12-justify-between v12-align-center v12-mt-3 v12-dark-text">
             <view class="v12-font-24 v12-dark-text">
               商品总价
             </view>
@@ -148,7 +148,7 @@
               </text>
             </view>
           </view>
-          <view class="v12-justify-between v12-mt-3" v-if="orderInfo.payPostage > 0">
+          <view class="v12-justify-between v12-align-center v12-mt-3" v-if="orderInfo.payPostage > 0">
             <view class="v12-font-24 v12-dark-text">
               运费
             </view>
@@ -159,7 +159,7 @@
             </text>
             </view>
           </view>
-          <view class="v12-justify-between v12-mt-3" v-if="orderInfo.couponPrice > 0">
+          <view class="v12-justify-between v12-align-center v12-mt-3" v-if="orderInfo.couponPrice > 0">
             <view class="v12-font-24 v12-dark-text">
               满减优惠
             </view>
@@ -171,7 +171,7 @@
               </text>
             </view>
           </view>
-          <view class="v12-justify-between v12-mt-3" v-if="orderInfo.discountPrice > 0">
+          <view class="v12-justify-between v12-align-center v12-mt-3" v-if="orderInfo.discountPrice > 0">
             <view class="v12-font-24 v12-dark-text">
               商品折扣
             </view>
@@ -183,7 +183,7 @@
               </text>
             </view>
           </view>
-          <view class="v12-justify-between v12-mt-3"  v-if="orderInfo.useIntegral > 0">
+          <view class="v12-justify-between v12-align-center v12-mt-3"  v-if="orderInfo.useIntegral > 0">
             <view class="v12-font-24 v12-dark-text">
               积分抵扣
             </view>
@@ -196,7 +196,7 @@
             </view>
           </view>
           <u-divider></u-divider>
-          <view class="v12-justify-between v12-mt-3">
+          <view class="v12-justify-between v12-align-center v12-mt-3">
             <view class="v12-font-28 v12-font-bold v12-dark-text">
               实付款
             </view>
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 4e291d6..9a8ad16 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -2184,7 +2184,7 @@ export default {
   width: 100%;
 }
 .ll-text{
-  margin-left: 280rpx;
+  margin-left: 250rpx;
   word-break: keep-all;
 }
 </style>