|
@@ -7,26 +7,26 @@
|
|
<img class="wh56" :src="iconURL(item.giftBagFileKey)" alt="" />
|
|
<img class="wh56" :src="iconURL(item.giftBagFileKey)" alt="" />
|
|
</div>
|
|
</div>
|
|
<div class="ml12">
|
|
<div class="ml12">
|
|
- <div class="txt1">{{ item.giftBagName.length > 8 ? item.giftBagName.slice(0, 8) + '...' : item.giftBagName }}</div>
|
|
|
|
- <div class="txt2">{{ item.giftBagDetailed }}</div>
|
|
|
|
|
|
+ <div class="txt1">{{ item.giftBagName.length > 8 ? item.giftBagName.slice(0, 8) + '...' : item.giftBagName }}</div>
|
|
|
|
+ <div class="txt2">{{ item.giftBagDetailed }}</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
- <div :class="item.availableStatus === 1 ? 'gift-btn disabled' : 'gift-btn'" @click="receive(item)">{{ ['领取', '已领完', '查看'][item.availableStatus] }}</div>
|
|
|
|
|
|
+ <div :class="item.availableStatus === 1 ? 'gift-btn disabled' : 'gift-btn'" @click="receive(item)">{{ ['领取', '已领完', '查看'][item.availableStatus] }}</div>
|
|
</div>
|
|
</div>
|
|
<img class="w80h67" src="~/assets/image/activity/welfare-community/return.png" alt="" @click="returnUp">
|
|
<img class="w80h67" src="~/assets/image/activity/welfare-community/return.png" alt="" @click="returnUp">
|
|
<van-popup v-model="showVideoSuccess" style="background: transparent;color: #999;" closeable close-icon-position="top-right" :close-on-click-overlay="false">
|
|
<van-popup v-model="showVideoSuccess" style="background: transparent;color: #999;" closeable close-icon-position="top-right" :close-on-click-overlay="false">
|
|
<div class="w290h215 dialog-view">
|
|
<div class="w290h215 dialog-view">
|
|
<div class="txt3">恭喜您获得礼包</div>
|
|
<div class="txt3">恭喜您获得礼包</div>
|
|
- <div class="txt4">请在游戏中兑换<br />激活码为:{{ gameActivationCode }}。<span class="c3B86FF">复制</span></div>
|
|
|
|
|
|
+ <div class="txt4">请在游戏中兑换<br />激活码为:{{ gameActivationCode }}。<span class="c3B86FF">复制</span></div>
|
|
<div class="buy-btn">购买云机</div>
|
|
<div class="buy-btn">购买云机</div>
|
|
</div>
|
|
</div>
|
|
</van-popup>
|
|
</van-popup>
|
|
<van-popup v-model="showAd" style="background: transparent;color: #999;" :close-on-click-overlay="false">
|
|
<van-popup v-model="showAd" style="background: transparent;color: #999;" :close-on-click-overlay="false">
|
|
<div v-for="(item, index) in adlist" :key="item.id">
|
|
<div v-for="(item, index) in adlist" :key="item.id">
|
|
<div v-if="index === 0" class="fwc">
|
|
<div v-if="index === 0" class="fwc">
|
|
- <div v-if="time" class="countdown">{{ time }}s后关闭广告</div>
|
|
|
|
|
|
+ <div v-if="time" class="countdown">{{ time }}s后关闭广告</div>
|
|
<video ref="videoPlayer" class="w290h330" :src="item.adVideoBase.videoUrl" :controls="false" :autoplay="false" :muted="true" :loop="false" @ended="ended" />
|
|
<video ref="videoPlayer" class="w290h330" :src="item.adVideoBase.videoUrl" :controls="false" :autoplay="false" :muted="true" :loop="false" @ended="ended" />
|
|
- <van-icon name="close" color="#999999" size="34" style="margin:15px auto 0;" @click="showAd = time > 0 ? true : false; getAppGameGiftActivityDetailsList()" />
|
|
|
|
|
|
+ <van-icon name="close" color="#999999" size="34" style="margin:15px auto 0;" @click="showAd = time > 0 ? true : false; getAppGameGiftActivityDetailsList()" />
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</van-popup>
|
|
</van-popup>
|
|
@@ -40,7 +40,7 @@
|
|
<van-popup v-model="showBuySuccess" style="background: transparent;color: #999;" closeable close-icon-position="top-right" :close-on-click-overlay="false">
|
|
<van-popup v-model="showBuySuccess" style="background: transparent;color: #999;" closeable close-icon-position="top-right" :close-on-click-overlay="false">
|
|
<div class="w290h233 dialog-view">
|
|
<div class="w290h233 dialog-view">
|
|
<div class="txt3">恭喜您获得礼包</div>
|
|
<div class="txt3">恭喜您获得礼包</div>
|
|
- <div class="txt4">请在游戏中兑换<br />激活码为:{{ gameActivationCode }}。<span class="c3B86FF">复制</span></div>
|
|
|
|
|
|
+ <div class="txt4">请在游戏中兑换<br />激活码为:{{ gameActivationCode }}。<span class="c3B86FF">复制</span></div>
|
|
<div class="fsc mt20">
|
|
<div class="fsc mt20">
|
|
<div class="fcc">
|
|
<div class="fcc">
|
|
<img class="wh40" src="~/assets/image/activity/welfare-community/icon_iphone@2x.png" alt="" />
|
|
<img class="wh40" src="~/assets/image/activity/welfare-community/icon_iphone@2x.png" alt="" />
|
|
@@ -54,7 +54,7 @@
|
|
<img class="w12h10 mt15" src="~/assets/image/activity/welfare-community/arrow@2x.png" alt="">
|
|
<img class="w12h10 mt15" src="~/assets/image/activity/welfare-community/arrow@2x.png" alt="">
|
|
<div class="fcc">
|
|
<div class="fcc">
|
|
<img class="wh40" src="~/assets/image/activity/welfare-community/icon_xiazai@2x.png" alt="">
|
|
<img class="wh40" src="~/assets/image/activity/welfare-community/icon_xiazai@2x.png" alt="">
|
|
- <span class="txt5">下载{{ gameName }}游戏</span>
|
|
|
|
|
|
+ <span class="txt5">下载{{ gameName }}游戏</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -132,6 +132,8 @@ export default {
|
|
this.$router.push({ path: '/welfare-community', query: { token: this.$route.query.token, user: this.user } })
|
|
this.$router.push({ path: '/welfare-community', query: { token: this.$route.query.token, user: this.user } })
|
|
},
|
|
},
|
|
async receive(item) {
|
|
async receive(item) {
|
|
|
|
+ console.log(item.availableStatus);
|
|
|
|
+ console.log(this.$route.query.user === '1');
|
|
if (item.availableStatus === 2) {
|
|
if (item.availableStatus === 2) {
|
|
this.buySuccess(item);
|
|
this.buySuccess(item);
|
|
return
|
|
return
|
|
@@ -140,7 +142,7 @@ export default {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
this.giftBagId = item.id;
|
|
this.giftBagId = item.id;
|
|
- if (this.$route.query.user === '1') {
|
|
|
|
|
|
+ if (this.$route.query.user === '2') {
|
|
if (item.taskType === 2) {
|
|
if (item.taskType === 2) {
|
|
this.showBuy = true
|
|
this.showBuy = true
|
|
}
|
|
}
|