This commit is contained in:
wwz
parent
7a3d2d3477
commit
0661a4d616
|
|
@ -24,7 +24,7 @@
|
|||
<text style="margin-right: 20rpx;">打卡提醒</text>
|
||||
<u-switch v-model="checked" size="35" active-color="#EA9EA8 "></u-switch>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
<view class="signInList flex justify-between">
|
||||
<text class="line"></text>
|
||||
<view class="signIn-Item"
|
||||
|
|
@ -42,12 +42,12 @@
|
|||
</view>
|
||||
|
||||
<view class="tishi">连续签到7天即可获得7元奖励</view>
|
||||
|
||||
|
||||
<!-- <view class="signInBtn" @click="goNav({jumpType: 0, id:15, buttonTitle: '去领取'})">
|
||||
<view>{{signInBtn}}</view>
|
||||
<view class="signInBtnBg"></view>
|
||||
</view> -->
|
||||
|
||||
|
||||
</view>
|
||||
|
||||
<view class="content margin-lr padding bg-white u-relative" v-if="list.length">
|
||||
|
|
@ -73,18 +73,18 @@
|
|||
{{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }}
|
||||
</view>
|
||||
<!-- <view v-else class="btn u-font-24 text-bold" @click="goNav(item)">{{ item.buttonTitle }}</view> -->
|
||||
<view v-if=" item.buttonUnderContent && item.buttonUnderUrl " class="u-font-22 tip" @click="goNav({buttonUrl: item.buttonUnderUrl, jumpType: 1,title: item.title})">{{ item.buttonUnderContent}}</view>
|
||||
<view v-if=" item.buttonUnderContent && item.buttonUnderUrl " class="u-font-22 tip"
|
||||
@click="goNav({buttonUrl: item.buttonUnderUrl, jumpType: 1,title: item.title})">
|
||||
{{ item.buttonUnderContent}}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="">
|
||||
<!-- 激励视频广告 -->
|
||||
<ad-rewarded-video ref="adRewardedVideo" adpid="1531580352" :preload="false" :loadnext="false"
|
||||
:disabled="true" v-slot:default="{loading, error}" @load="onadload" @close="onadclose"
|
||||
@error="onaderror">
|
||||
<view class="ad-error" v-if="error">{{error}}</view>
|
||||
</ad-rewarded-video>
|
||||
<button type="primary" :disabled="isLoading" :loading="isLoading" @click="showAd">显示广告</button>
|
||||
</view>
|
||||
<!-- 激励视频广告 -->
|
||||
<ad-rewarded-video ref="adRewardedVideo" adpid="1531580352" :preload="false" :loadnext="false"
|
||||
:disabled="true" v-slot:default="{loading, error}" @load="onadload" @close="onadclose"
|
||||
@error="onaderror">
|
||||
<view class="ad-error" v-if="error">{{error}}</view>
|
||||
</ad-rewarded-video>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
|
|
@ -140,7 +140,7 @@
|
|||
}
|
||||
});
|
||||
},
|
||||
onReady() {
|
||||
async onReady() {
|
||||
this.isLoading = true;
|
||||
// 首次加载广告
|
||||
setTimeout(() => {
|
||||
|
|
@ -158,16 +158,17 @@
|
|||
this.isLoading = false;
|
||||
console.log('广告数据加载成功');
|
||||
},
|
||||
onadclose(e) {
|
||||
async onadclose(e) {
|
||||
const detail = e.detail
|
||||
// 用户点击了【关闭广告】按钮
|
||||
console.log(e.detail)
|
||||
if (detail && detail.isEnded) {
|
||||
// 正常播放结束
|
||||
console.log("onClose " + detail.isEnded);
|
||||
// /sqx_fast/app/ad/state
|
||||
let res = this.$Request.getT('app/ad/state')
|
||||
console.log(res)
|
||||
} else {
|
||||
// 播放中途退出
|
||||
console.log("onClose " + detail.isEnded);
|
||||
}
|
||||
//this.isLoading = true;
|
||||
//this.$refs.adRewardedVideo.load();
|
||||
|
|
@ -216,24 +217,24 @@
|
|||
// type (integer, optional): 任务类型 1 普通任务 2 打卡任务 9 其它 ,
|
||||
// buttonUrl
|
||||
console.log(item)
|
||||
if ( item.jumpType == 0) {
|
||||
if ( item.buttonTitle.indexOf("领取") != -1) {
|
||||
if (item.jumpType == 0) {
|
||||
if (item.buttonTitle.indexOf("领取") != -1) {
|
||||
this.taskReceive(item.id)
|
||||
} else {
|
||||
uni.switchTab({
|
||||
url: "/pages/index/index"
|
||||
})
|
||||
}
|
||||
} else if ( item.jumpType == 1) {
|
||||
let source,buttonUrl;
|
||||
} else if (item.jumpType == 1) {
|
||||
let source, buttonUrl;
|
||||
buttonUrl = item.buttonUrl
|
||||
if ( item.title && item.title.indexOf('每周') != -1 ) {
|
||||
if (item.title && item.title.indexOf('每周') != -1) {
|
||||
source = 2
|
||||
buttonUrl = item.buttonUrl+'?source='+source
|
||||
buttonUrl = item.buttonUrl + '?source=' + source
|
||||
}
|
||||
if ( item.title && item.title.indexOf('每月') != -1 ) {
|
||||
if (item.title && item.title.indexOf('每月') != -1) {
|
||||
source = 3
|
||||
buttonUrl = item.buttonUrl+'?source='+source
|
||||
buttonUrl = item.buttonUrl + '?source=' + source
|
||||
}
|
||||
console.log(buttonUrl)
|
||||
uni.navigateTo({
|
||||
|
|
@ -302,17 +303,10 @@
|
|||
<style lang="scss">
|
||||
.container {
|
||||
width: 100%;
|
||||
<<<<<<< HEAD
|
||||
|
||||
.task_bg {
|
||||
width: 100% !important;
|
||||
height: 494rpx !important;
|
||||
=======
|
||||
background-color: #F3F4F8;
|
||||
.task_bg{
|
||||
width: 100%!important;
|
||||
height: 494rpx!important;
|
||||
>>>>>>> 2ff5ebfd71042121cad90bd9b88c9372dbf8871d
|
||||
}
|
||||
|
||||
.icon {
|
||||
|
|
@ -413,14 +407,9 @@
|
|||
color: #FFFFFF;
|
||||
border-radius: 12rpx 12rpx 12rpx 12rpx;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
.tip {
|
||||
color: #666;
|
||||
=======
|
||||
.tip{
|
||||
color: #EC6F48;
|
||||
>>>>>>> 2ff5ebfd71042121cad90bd9b88c9372dbf8871d
|
||||
height: 44rpx;
|
||||
line-height: 44rpx;
|
||||
margin-top: 5rpx;
|
||||
|
|
|
|||
Loading…
Reference in New Issue