This commit is contained in:
wwz 2024-12-24 11:15:08 +08:00
parent 7a3d2d3477
commit 0661a4d616
1 changed files with 26 additions and 37 deletions

View File

@ -24,7 +24,7 @@
<text style="margin-right: 20rpx;">打卡提醒</text> <text style="margin-right: 20rpx;">打卡提醒</text>
<u-switch v-model="checked" size="35" active-color="#EA9EA8 "></u-switch> <u-switch v-model="checked" size="35" active-color="#EA9EA8 "></u-switch>
</view> --> </view> -->
</view> </view>
<view class="signInList flex justify-between"> <view class="signInList flex justify-between">
<text class="line"></text> <text class="line"></text>
<view class="signIn-Item" <view class="signIn-Item"
@ -42,12 +42,12 @@
</view> </view>
<view class="tishi">连续签到7天即可获得7元奖励</view> <view class="tishi">连续签到7天即可获得7元奖励</view>
<!-- <view class="signInBtn" @click="goNav({jumpType: 0, id:15, buttonTitle: '去领取'})"> <!-- <view class="signInBtn" @click="goNav({jumpType: 0, id:15, buttonTitle: '去领取'})">
<view>{{signInBtn}}</view> <view>{{signInBtn}}</view>
<view class="signInBtnBg"></view> <view class="signInBtnBg"></view>
</view> --> </view> -->
</view> </view>
<view class="content margin-lr padding bg-white u-relative" v-if="list.length"> <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}`) }} {{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}`) }}
</view> </view>
<!-- <view v-else class="btn u-font-24 text-bold" @click="goNav(item)">{{ item.buttonTitle }}</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> </view>
<view class=""> <!-- 激励视频广告 -->
<!-- 激励视频广告 --> <ad-rewarded-video ref="adRewardedVideo" adpid="1531580352" :preload="false" :loadnext="false"
<ad-rewarded-video ref="adRewardedVideo" adpid="1531580352" :preload="false" :loadnext="false" :disabled="true" v-slot:default="{loading, error}" @load="onadload" @close="onadclose"
:disabled="true" v-slot:default="{loading, error}" @load="onadload" @close="onadclose" @error="onaderror">
@error="onaderror"> <view class="ad-error" v-if="error">{{error}}</view>
<view class="ad-error" v-if="error">{{error}}</view> </ad-rewarded-video>
</ad-rewarded-video>
<button type="primary" :disabled="isLoading" :loading="isLoading" @click="showAd">显示广告</button>
</view>
</view> </view>
</view> </view>
@ -140,7 +140,7 @@
} }
}); });
}, },
onReady() { async onReady() {
this.isLoading = true; this.isLoading = true;
// 广 // 广
setTimeout(() => { setTimeout(() => {
@ -158,16 +158,17 @@
this.isLoading = false; this.isLoading = false;
console.log('广告数据加载成功'); console.log('广告数据加载成功');
}, },
onadclose(e) { async onadclose(e) {
const detail = e.detail const detail = e.detail
// 广 // 广
console.log(e.detail) console.log(e.detail)
if (detail && detail.isEnded) { 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 { } else {
// 退 // 退
console.log("onClose " + detail.isEnded);
} }
//this.isLoading = true; //this.isLoading = true;
//this.$refs.adRewardedVideo.load(); //this.$refs.adRewardedVideo.load();
@ -216,24 +217,24 @@
// type (integer, optional): 1 2 9 , // type (integer, optional): 1 2 9 ,
// buttonUrl // buttonUrl
console.log(item) console.log(item)
if ( item.jumpType == 0) { if (item.jumpType == 0) {
if ( item.buttonTitle.indexOf("领取") != -1) { if (item.buttonTitle.indexOf("领取") != -1) {
this.taskReceive(item.id) this.taskReceive(item.id)
} else { } else {
uni.switchTab({ uni.switchTab({
url: "/pages/index/index" url: "/pages/index/index"
}) })
} }
} else if ( item.jumpType == 1) { } else if (item.jumpType == 1) {
let source,buttonUrl; let source, buttonUrl;
buttonUrl = item.buttonUrl buttonUrl = item.buttonUrl
if ( item.title && item.title.indexOf('每周') != -1 ) { if (item.title && item.title.indexOf('每周') != -1) {
source = 2 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 source = 3
buttonUrl = item.buttonUrl+'?source='+source buttonUrl = item.buttonUrl + '?source=' + source
} }
console.log(buttonUrl) console.log(buttonUrl)
uni.navigateTo({ uni.navigateTo({
@ -302,17 +303,10 @@
<style lang="scss"> <style lang="scss">
.container { .container {
width: 100%; width: 100%;
<<<<<<< HEAD
.task_bg { .task_bg {
width: 100% !important; width: 100% !important;
height: 494rpx !important; height: 494rpx !important;
=======
background-color: #F3F4F8;
.task_bg{
width: 100%!important;
height: 494rpx!important;
>>>>>>> 2ff5ebfd71042121cad90bd9b88c9372dbf8871d
} }
.icon { .icon {
@ -413,14 +407,9 @@
color: #FFFFFF; color: #FFFFFF;
border-radius: 12rpx 12rpx 12rpx 12rpx; border-radius: 12rpx 12rpx 12rpx 12rpx;
} }
<<<<<<< HEAD
.tip { .tip {
color: #666;
=======
.tip{
color: #EC6F48; color: #EC6F48;
>>>>>>> 2ff5ebfd71042121cad90bd9b88c9372dbf8871d
height: 44rpx; height: 44rpx;
line-height: 44rpx; line-height: 44rpx;
margin-top: 5rpx; margin-top: 5rpx;