From c3d6b25a5ec2f013d735be7bcee0a0ed44cd1754 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Fri, 28 Feb 2025 16:03:30 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A3315=20=E3=80=90=E7=A4=BC=E5=93=81?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E3=80=91=E5=BE=85=E5=8F=91=E8=B4=A7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=80=80=E6=AC=BE=E8=AF=A6=E6=83=85=E9=A1=B5=E4=B8=8D?=
 =?UTF-8?q?=E8=A6=81=E6=98=BE=E7=A4=BA=E7=89=A9=E6=B5=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/gift.js                                   |  8 +++
 pages/order/OrderDetails/index.vue            |  3 +-
 .../views/gift/components/CoverPicker.vue     | 12 ++++-
 pkg_user/views/gift/components/GiftCard.vue   |  2 +-
 pkg_user/views/gift/components/giftTips.vue   | 14 +++--
 pkg_user/views/gift/gift.vue                  | 54 +++++++++++++------
 6 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/api/gift.js b/api/gift.js
index a2dcbc5..a8b60ac 100644
--- a/api/gift.js
+++ b/api/gift.js
@@ -47,4 +47,12 @@ export function getGiftCardSendNotice(data) {
  */
 export function getGiftCardSendOrderAmount(key, data) {
   return request.post("giftCard/computed/" + key, data); 
+}
+
+/**
+ * 再送一份
+ * @param {*} data
+ */
+export function getGiftCardResend(data) {
+  return request.post("/giftCard/makeAgain", data); 
 }
\ No newline at end of file
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 5a16356..7ed5c0f 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -29,7 +29,7 @@
       </view>
     </view>
     <!-- <view class="reject-reason" v-if="orderInfo._status._type==-3 && orderInfo.refundRejectReason">驳回原因：{{ orderInfo.refundRejectReason }}</view> -->
-    <view v-if="orderInfo._status._type == -1 || orderInfo._status._type == -2 || orderInfo._status._type == 4 || orderInfo._status._type == 3 || (orderInfo._status._type == 2 && orderInfo.isTickets!==1)">
+    <view v-if="orderInfo.deliveryId !== null && orderInfo._status._type == -1 || orderInfo._status._type == -2 || orderInfo._status._type == 4 || orderInfo._status._type == 3 || (orderInfo._status._type == 2 && orderInfo.isTickets!==1)">
       <view v-if="index < 2 || showMoreDeliver" v-for="(delivery, index) in orderInfo.deliveryInfo" :key="index" class="v12-radius-20 v12-white v12-pa-3 v12-mt-4">
         <view>
           <text class="v12-secondary-dark-text v12-font-28">{{ delivery.deliveryName }}：{{ delivery.deliveryId }}</text>
@@ -554,6 +554,7 @@ export default {
       // this.$forceUpdate()
     },
     getExpressInfo(delivery, i) {
+      if(delivery.deliveryId === null) return
       let params = {
         orderCode: this.orderInfo.id,
         shipperCode: delivery.deliverySn,
diff --git a/pkg_user/views/gift/components/CoverPicker.vue b/pkg_user/views/gift/components/CoverPicker.vue
index 9aa5e9a..86e5ae7 100644
--- a/pkg_user/views/gift/components/CoverPicker.vue
+++ b/pkg_user/views/gift/components/CoverPicker.vue
@@ -9,6 +9,7 @@
     <view class="cover-picker">
       <view class="cover-title">选择封面</view>
       <swiper
+        :current="currentIndex"
         :autoplay="false"
         :circular="true"
         :indicator-dots="false"
@@ -43,6 +44,10 @@
 <script>
 export default {
   props: {
+    index: {
+      type: Number,
+      default: 0
+    },
     show: {
       type: Boolean,
       default: true
@@ -62,7 +67,12 @@ export default {
   },
   data() {
     return {
-      currentIndex: 0
+      currentIndex: this.index
+    }
+  },
+  watch: {
+    index(val) {
+      this.currentIndex = val
     }
   },
   methods: {
diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index 2a997c9..ffed8c7 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -236,7 +236,7 @@ export default {
 }
 .auto-text-color {
   color: #fff;
-  font-size: 28rpx;
+  font-size: 32rpx;
   opacity: 0.8;
   margin-top: 150rpx;
   width: 400rpx;
diff --git a/pkg_user/views/gift/components/giftTips.vue b/pkg_user/views/gift/components/giftTips.vue
index e19f98f..a09aec9 100644
--- a/pkg_user/views/gift/components/giftTips.vue
+++ b/pkg_user/views/gift/components/giftTips.vue
@@ -12,7 +12,9 @@
         <!-- 标题 -->
         <view class="title">赠礼须知</view>
         <!-- 富文本内容 -->
-        <u-parse :content="richText" />
+        <view class="text-wrap">
+          <u-parse :content="richText" />
+        </view>
       </view>
     </u-popup>
   </view>
@@ -36,10 +38,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.popup-content {
-  width: 600rpx;
+.text-wrap{
   height: 800rpx;
   overflow: auto;
+}
+.popup-content {
+  width: 600rpx;
   padding:0 40rpx 40rpx 40rpx;
   box-sizing: border-box;
   .title {
@@ -48,10 +52,10 @@ export default {
     font-size: 36rpx;
     font-weight: bold;
     text-align: center;
-    margin-bottom: 30rpx;
-    position: sticky;
     top: 0;
     background: #fff;
+    background-color: #fff;
+    z-index: 11;
   }
   
   .close-btn {
diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
index 6bb5ab4..a622b77 100644
--- a/pkg_user/views/gift/gift.vue
+++ b/pkg_user/views/gift/gift.vue
@@ -107,7 +107,7 @@
       <view class="gift-submit" @click="showPayPicker = true">付款并赠送</view>
     </view>
     <view class="btn-wrap v12-mt-16 v12-justify-center" v-if="isPayOk">
-      <view class="gift-submit">再送一份</view>
+      <view class="gift-submit" @click="makeAgain">再送一份</view>
     </view>
     <view class="tip-wrap v12-justify-center">
       <view class="tip-text v12-mr-1">好友未收下礼包，将于24小时后自动退款</view>
@@ -119,6 +119,7 @@
       :list="coverList"
       :product="goodsInfo.productInfo"
       @confirm="onCoverConfirm"
+      :index="defaultIndex"
       :message="message"
     />
     <passkeyborad
@@ -139,7 +140,8 @@
 
 <script>
 import passkeyborad from '@/components/yzc-paykeyboard/yzc-paykeyboard'
-import { getGiftCardSendOrderConfirm, getGiftCardSendOrder, getGiftCardSendOrderAmount } from '@/api/gift'
+import { getGiftCardSendOrderConfirm, getGiftCardSendOrder, getGiftCardSendOrderAmount, getGiftCardResend } from '@/api/gift'
+import { weappPay } from "@/libs/wechat";
 import {mapGetters} from "vuex";
 import giftTips from './components/giftTips.vue'
 import CoverPicker from './components/CoverPicker.vue'
@@ -176,7 +178,9 @@ export default {
       payType: '',
       isPayOk: false,
       giftKey: '',
-      payPrice: 0
+      payPrice: 0,
+      orderId: '',
+      defaultIndex:0
     }
   },
   onLoad(opts) {
@@ -200,8 +204,27 @@ export default {
     })
   },
   methods: {
+    makeAgain() {
+      const params = {
+        orderId: this.orderId,
+      }
+      getGiftCardResend(params).then(res => {
+        this.isPayOk = false
+        this.coverList = [...res.data.giftCardTemplates, res.data.specialGiftCardTemplate]
+        this.cartId = res.data.cartInfo[0].id
+        this.giftNotice = res.data.giftCardGiftNotice
+        this.orderKey = res.data.orderKey
+        this.goodsInfo = res.data.cartInfo[0]
+        this.templateId = res.data.specialGiftCardTemplate.id
+        this.defaultIndex = this.coverList.findIndex(item => item.id === this.templateId)
+        console.log(this.defaultIndex, 'defaultIndex');
+        this.selectedCover = res.data.specialGiftCardTemplate.cover
+        this.giftImage = res.data.specialGiftCardTemplate.image
+        this.couponId = ''
+        this.computedPrice(this.goodsInfo.cartNum)
+      })
+    },
     messageChange(e) {
-      console.log(e);
       this.message = e.substring(0, 30)
     },
     numberChange(e) {
@@ -247,6 +270,8 @@ export default {
         this.templateId = res.data.specialGiftCardTemplate.id
         this.selectedCover = res.data.specialGiftCardTemplate.cover
         this.giftImage = res.data.specialGiftCardTemplate.image
+        this.defaultIndex = this.coverList.findIndex(item => item.id === this.templateId)
+        console.log(this.defaultIndex, 'defaultIndex');
         if(!this.couponId) {
           this.couponId = res.data.couponList.usable[0] && res.data.couponList.usable[0].id || ''
         }
@@ -329,6 +354,7 @@ export default {
             });
             this.isPayOk = true;
             this.giftKey = data.giftCard.code;
+            this.orderId = data.result.orderId || ''
             break;
           case "WECHAT_H5_PAY":
             // H5支付
@@ -341,12 +367,13 @@ export default {
             // 小程序支付
             weappPay(data.result.jsConfig).finally(() => {
               uni.showToast({
-              title: res.msg,
-              icon: "none",
-              duration: 2000
-            });
-            this.isPayOk = true;
-            this.giftKey = data.giftCard.code;
+                title: res.msg,
+                icon: "none",
+                duration: 2000
+              });
+              this.isPayOk = true;
+              this.giftKey = data.giftCard.code;
+              this.orderId = data.result.orderId || ''
             });
             break;
 
@@ -358,13 +385,10 @@ export default {
             break;
         }
       }) .catch(err => {
+        console.log(err);
             uni.hideLoading();
             uni.showToast({
-              title:
-                  err.msg ||
-                  err.response.data.msg ||
-                  err.response.data.message ||
-                  "创建订单失败",
+              title:"创建订单失败",
               icon: "none",
               duration: 2000
             });