From fd4dd7891b8d1301f6fb0b88e482e52426454a5e Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 08 九月 2025 13:41:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub
---
pages/prize/PrizeDetail/PrizeDetail.vue | 49 +++++++++++++++++++++++++++----------------------
1 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/pages/prize/PrizeDetail/PrizeDetail.vue b/pages/prize/PrizeDetail/PrizeDetail.vue
index 23aeac0..86f8534 100644
--- a/pages/prize/PrizeDetail/PrizeDetail.vue
+++ b/pages/prize/PrizeDetail/PrizeDetail.vue
@@ -61,14 +61,17 @@
<text class="modal-prize-name">{{ currentPrize.name }}</text>
</view>
- <view class="prize-result-text" v-if="currentPrize.id !== 'thanks'">
+ <view class="prize-result-text" v-if="currentPrize.id !== 'notWIn'">
鑾峰緱浜� {{ currentPrize.name }}
</view>
<view class="prize-result-text" v-else>
{{ currentPrize.name }}锛屽啀鎺ュ啀鍘夛紒
</view>
- <view class="modal-buttons">
+ <view class="modal-buttons" v-if="currentPrize.id !== 'notWIn'">
+ <button class="confirm-btn" @tap="useItNow">鍘昏喘鐗�</button>
+ </view>
+ <view class="modal-buttons" v-else>
<button class="confirm-btn" @tap="closePrizeModal">纭畾</button>
</view>
</view>
@@ -150,7 +153,8 @@
// 鍒嗕韩鏈嬪弸鍦堝皾璇曟爣璁�
shareTimelineAttempt: false,
activityCover:'',
- activityName:''
+ activityName:'',
+ couponId:''
};
},
computed: {
@@ -215,23 +219,6 @@
}
}
},
- /**
- * 绔嬪嵆浣跨敤浼樻儬鍒�
- */
- useItNow(item) {
-
- console.log('浼樻儬鍗疯鎯�--------------------->',JSON.stringify(item))
- // uni.navigateTo({
- // url: `/pages/navigation/search/searchPage?promotionsId=${item.couponId}&promotionType=COUPON`,
- // });
- if(item.scopeType ==='PORTION_GOODS'){
- //鑾峰彇浼樻儬鍗峰搴旂殑鍟嗗搧
- //鎸囧畾璺宠浆鍒板晢鍝佽鎯呴〉闈㈣繘琛岃喘涔�
- }
- uni.navigateTo({
- url: `/pages/commodity-square/coups-goods-list?promotionsId=${item.couponId}&promotionType=COUPON`
- });
- },
beforeDestroy() {
this.stopAutoScroll()
},
@@ -239,6 +226,18 @@
async getUnmber(id) {
const prizeNums = await prizeNum(id);
this.remainingTimes = prizeNums.data.data
+ },
+ /**
+ * 绔嬪嵆浣跨敤浼樻儬鍒�
+ */
+ useItNow() {
+
+ // uni.navigateTo({
+ // url: `/pages/navigation/search/searchPage?promotionsId=${item.couponId}&promotionType=COUPON`,
+ // });
+ uni.navigateTo({
+ url: `/pages/commodity-square/coups-goods-list?promotionsId=${this.couponId}&promotionType=COUPON`
+ });
},
async getGrantRecord(id) {
const record = await grantRecord(id);
@@ -374,6 +373,7 @@
});
},
async onClick() {
+ this.couponId = ''
// 妫�鏌ュ墿浣欐鏁�
if (this.remainingTimes <= 0) {
uni.showToast({
@@ -383,6 +383,7 @@
return
}
const prizeDraw = await prize(this.activityId);
+ console.log('---------------->',prizeDraw)
let winId = 'notWIn'
if (prizeDraw.data.code == 200) {
winId = prizeDraw.data.data.id
@@ -395,6 +396,10 @@
// 濂栧搧鐨勭储寮�
this.$refs.dialer.run(findInfo)
+ if(prizeDraw.data.data){
+ this.couponId = prizeDraw.data.data.couponId
+ }
+
await this.getGrantRecord(this.activityId)
}
}
@@ -1129,8 +1134,8 @@
}
.prize-img {
- width: 80rpx;
- height: 80rpx;
+ width: 120rpx;
+ height: 120rpx;
border-radius: 10rpx;
}
--
Gitblit v1.8.0