diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index fdc6120..e966a10 100644
--- a/pages/order/MyOrder/index.vue
+++ b/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
}
},
diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index 9f2484b..eeffd12 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -64,13 +64,13 @@
-
+
礼包已被领取
去商城看看>>
-
+
您已领取礼包,去看看>>
diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
index b8fa003..620930f 100644
--- a/pkg_user/views/gift/gift.vue
+++ b/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,
}
diff --git a/pkg_user/views/gift/receive.vue b/pkg_user/views/gift/receive.vue
index 7242646..3012891 100644
--- a/pkg_user/views/gift/receive.vue
+++ b/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()
})
},
diff --git a/pkg_user/views/giftList.vue b/pkg_user/views/giftList.vue
index 16ccdc9..4be6cf0 100644
--- a/pkg_user/views/giftList.vue
+++ b/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
}
},