From d774abbbc24b4974fb0b5951bae475218bf4e343 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Tue, 15 Jul 2025 15:03:31 +0800
Subject: [PATCH] =?UTF-8?q?Fix(=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85):[#402?=
 =?UTF-8?q?6]=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=85=B7=E4=BD=93=E9=A2=86=E5=8F=96=E8=AE=B0=E5=BD=95=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/MyOrder/index.vue      | 22 ++++++++++++++++++----
 pages/order/OrderDetails/index.vue | 10 ++++++++--
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index e15c010..412adfe 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -165,8 +165,22 @@
                   v-if="order.merName">联系商家
             </view>
             <view class="v12-align-center">
-              <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>
+              <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"
+                class="gift-btn service v12-primary-text v12-primary-border"
+                @click="shareGift(order)"
+              >送给朋友</button>
+              <button
+                v-if="Number(order.status) === 0"
+                class="gift-btn service v12-primary-text v12-primary-border"
+                @click="subscribePay(order)"
+              >立即支付</button>
               <!-- 查看详情 -->
               <view class="bnt service v12-primary-text v12-primary-border" @click="goOrderDetails(order)">查看详情</view>
             </view>
@@ -470,9 +484,9 @@ export default {
         path: "/pages/order/OrderDetails/index",
         query: {
           id: order.orderId,
-          isGift: order.isGiftCardSend ? 1 : '',
+          isGift: order.isGiftCardSend ? 1 : ''
         }
-      });
+      })
     },
     setOfflinePayStatus: function (status) {
       let that = this;
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 0a80b1c..174bdbb 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -328,13 +328,19 @@
         <text class="money font-color-red">￥{{ force2Decimal(orderInfo.payPrice) }}</text>
       </view>
     </view>
-    <view class="gift-wrap" v-if="order.isGiftCardSend || order.isGiftCardReceive">
+    <view
+      v-if="isGift"
+      class="gift-wrap"
+    >
       <view class="v12-justify-between v12-align-center">
         <view class="v12-font-28 v12-font-bold v12-align-center">
           <u-icon :name="webUrl + '/icon/gift-primary.png'" size="24"></u-icon>
           {{ `已领取${orderInfo.giftCardInfo.receiveNum}/${orderInfo.giftCardInfo.giftNum}份礼包` }}
         </view>
-        <view class="v12-font-bold v12-primary-text v12-font-24">{{ `剩余${orderInfo.giftCardInfo.refundNum}份已退回` }}</view>
+        <view
+          v-if="orderInfo.giftCardInfo.refundNum > 0"
+          class="v12-font-bold v12-primary-text v12-font-24"
+        >{{ `剩余${orderInfo.giftCardInfo.refundNum}份已退回` }}</view>
       </view>
       <view 
         v-for="(receive, index) in orderInfo.giftCardInfo.receiveInfo"