Fix：4309 【旅居商城小程序】旅居收礼页面无数据

pages/order/MyOrder/index.vue

@@ -494,7 +494,7 @@ export default {
     })
     return {
       title: '礼笺轻启，礼藏心意',
-      path: `/pkg_user/views/gift/receive?code=${this.giftItem.giftCardInfo.code}`,
+      path: `/pkg_user/views/gift/receive?code=${this.giftItem.giftCardInfo.code}&isTravelGroup=${this.giftItem.isTravelGroup ? 1 : 0}`,
       imageUrl: this.giftItem.giftCardInfo.giftCardImage
     }
   },

pkg_user/views/gift/components/GiftCard.vue

@@ -64,13 +64,13 @@
           <u-icon :name="webUrl + '/icon/share.png'" ></u-icon>
         </button>
       </view>
-      <view v-if="card.isUserReceive === 1" @click="toHome" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
+      <view v-if="card.isOverReceive === 1" @click="toHome" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
         <view class="address-btn v12-white-text v12-primary">
           礼包已被领取
         </view>
         <view class="info-btn v12-text-center  v12-font-32  v12-mt-3" style="z-index: 10">去商城看看>></view>
       </view>
-      <view v-if="card.isUserReceive === 1" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
+      <view v-if="card.isUserReceive === 1 && card.isOverReceive === 0" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
         <view style="width: fit-content;" class="address-btn v12-white-text v12-primary" @click="toOrder">
           您已领取礼包，去看看>>
         </view>

pkg_user/views/gift/gift.vue

@@ -290,7 +290,7 @@ export default {
     })
     return {
       title: '礼笺轻启，礼藏心意',
-      path: `/pkg_user/views/gift/receive?code=${this.giftKey}&isTravelGroup=${this.isGroupBuy}`,
+      path: `/pkg_user/views/gift/receive?code=${this.giftKey}&isTravelGroup=${this.isGroupBuy ? 1 : 0}`,
       imageUrl: this.shareImage
     }
   },
@@ -577,7 +577,7 @@ export default {
           this.giftNotice = res.data.giftCardGiftNotice
           this.templateId = res.data.giftCardTemplates[0].id || ''
           this.orderKey = res.data.orderKey
-          this.giftImage = res.data.giftCardTemplates[0].id
+          this.giftImage = res.data.giftCardTemplates[0].image
           this.goodsInfo = {
             ...res.data.travelGroupProduct,
           }

pkg_user/views/gift/receive.vue

@@ -53,7 +53,7 @@ export default {
     })
       return {
         title: '礼笺轻启，礼藏心意',
-        path: `/pkg_user/views/gift/receive?code=${this.giftCard.code}&isTravelGroup=${this.isTravelGroup}`,
+        path: `/pkg_user/views/gift/receive?code=${this.giftCard.code}&isTravelGroup=${this.isTravelGroup ? 1 : 0}`,
         imageUrl: this.giftCard.image
       }
     },
@@ -69,10 +69,15 @@ export default {
      * 获取旅居团购礼品卡订单详情
      */
     getSojoumGroupBuyGiftDetail(code) {
+      uni.showLoading({
+        title: '加载中...',
+        mask: true
+      })
       fetchSojoumGroupBuyGiftDetail({
         code: code
       }).then(res => {
         this.giftCard = res.data || {}
+        uni.hideLoading()
       })
     },
 

pkg_user/views/giftList.vue

@@ -303,7 +303,7 @@ export default {
     })
     return {
       title: '礼笺轻启，礼藏心意',
-      path: `/pkg_user/views/gift/receive?code=${this.giftItem.code}&isTravelGroup=${this.giftItem.isTravelGroup}`,
+      path: `/pkg_user/views/gift/receive?code=${this.giftItem.code}&isTravelGroup=${this.giftItem.isTravelGroup ? 1 : 0}`,
       imageUrl: this.giftItem.templateInfo.image
     }
   },