|
@@ -102,7 +102,8 @@
|
|
hasLogin: false,
|
|
hasLogin: false,
|
|
userData: null,
|
|
userData: null,
|
|
showLottery: false, // 是否显示抽奖弹框
|
|
showLottery: false, // 是否显示抽奖弹框
|
|
- showFixedLottery: false
|
|
|
|
|
|
+ showFixedLottery: false,
|
|
|
|
+ hasShowHd: false
|
|
}
|
|
}
|
|
},
|
|
},
|
|
onLoad() {
|
|
onLoad() {
|
|
@@ -204,7 +205,10 @@
|
|
reTimes = res.data.timesSurplus || 0
|
|
reTimes = res.data.timesSurplus || 0
|
|
}
|
|
}
|
|
this.$u.vuex('vuex_LuckDrawTimes',reTimes)
|
|
this.$u.vuex('vuex_LuckDrawTimes',reTimes)
|
|
- this.showLottery = reTimes > 0
|
|
|
|
|
|
+ if(!this.hasShowHd){
|
|
|
|
+ this.showLottery = reTimes > 0
|
|
|
|
+ this.hasShowHd = true
|
|
|
|
+ }
|
|
})
|
|
})
|
|
}else{
|
|
}else{
|
|
this.showFixedLottery = false
|
|
this.showFixedLottery = false
|
|
@@ -274,14 +278,20 @@
|
|
if(row.jumpType !== 'NONE'){
|
|
if(row.jumpType !== 'NONE'){
|
|
// 如果是大转盘
|
|
// 如果是大转盘
|
|
if(row.jumpUrl.indexOf('pagesA/luckDraw') >= 0){
|
|
if(row.jumpUrl.indexOf('pagesA/luckDraw') >= 0){
|
|
- if(this.showFixedLottery){
|
|
|
|
- uni.navigateTo({
|
|
|
|
- url:this.hasLogin ? row.jumpUrl :"/pages/login/login"
|
|
|
|
- })
|
|
|
|
|
|
+ if(this.hasLogin){
|
|
|
|
+ if(this.showFixedLottery){
|
|
|
|
+ uni.navigateTo({
|
|
|
|
+ url:row.jumpUrl
|
|
|
|
+ })
|
|
|
|
+ }else{
|
|
|
|
+ uni.showToast({
|
|
|
|
+ icon: 'none',
|
|
|
|
+ title: '活动已结束'
|
|
|
|
+ })
|
|
|
|
+ }
|
|
}else{
|
|
}else{
|
|
- uni.showToast({
|
|
|
|
- icon: 'none',
|
|
|
|
- title: '活动已结束'
|
|
|
|
|
|
+ uni.navigateTo({
|
|
|
|
+ url:"/pages/login/login"
|
|
})
|
|
})
|
|
}
|
|
}
|
|
|
|
|