diff --git a/me/detail/detail.nvue b/me/detail/detail.nvue
index 69155c1..d905b36 100644
--- a/me/detail/detail.nvue
+++ b/me/detail/detail.nvue
@@ -575,8 +575,10 @@
//播放时的回掉
videoPlay(videoId, courseDetailsId) {
console.log(courseDetailsId)
+ console.log(this.playFlag)
// this.courseDetailsId = courseDetailsId
if (!this.playFlag) {
+ this.getDataList(this.courseId, this.videoList[this.current].courseDetailsId,true);
this.playFlag = true
httpsRequest.getT('app/course/viewCourse', {
courseId: this.courseId,
@@ -606,6 +608,7 @@
},
appear(e, index) {
+ this.playFlag = false
this.courseDetailsId = e;
// 清除已经设置的定时器
clearTimeout(this.appearTimeout);
@@ -1288,6 +1291,7 @@
};
httpsRequest.getT('/app/course/selectCourseDetailsById', data).then(res => {
if (res.code == 0) {
+ console.log(res)
if (res.data.listsDetail) {
this.info = res.data;
this.title = this.info.title;
diff --git a/pages/task/index.vue b/pages/task/index.vue
index 9ce3823..c8f6cbe 100644
--- a/pages/task/index.vue
+++ b/pages/task/index.vue
@@ -4,7 +4,8 @@
-
+
任务大厅
@@ -32,12 +33,12 @@
v-for="(item,index) in signInList" :key="index">
-
-
-
- {{item.showText}}
+
+
+
+ {{item.showText}}
@@ -79,14 +80,12 @@
-
-
- {{error}}
-
-
+
+
+ {{error}}
+
@@ -127,12 +126,11 @@
signInBtn: '点击签到',
isShowMoneyPay: true,
isIos: false,
- isLoading: false,
- isAndroid: false,
+ isAndroid: true,
+ urlCallback: null,
}
},
onShow() {
-
this.getTaskdata()
this.getsignIn()
this.$Request.getT("app/common/type/919", {}).then(res => {
@@ -144,30 +142,16 @@
// #ifdef APP
this.isAndroid = sysInfo.platform === 'android'
// #endif
-
+
this.isShowMoneyPay = !(res.data.value == '1' && isIos)
}
});
+
+
},
- async onReady() {
- this.isLoading = true;
- console.log(1)
- // 首次加载广告
- setTimeout(() => {
- this.$refs.adRewardedVideo.load();
- }, 1000)
- },
+
methods: {
- showAd() {
- console.log(this.isLoading)
- if (this.isLoading) {
- return
- }
- this.$refs.adRewardedVideo.show();
- },
onadload(e) {
- this.isLoading = false;
- console.log(2)
console.log('广告数据加载成功');
},
async onadclose(e) {
@@ -176,20 +160,13 @@
// 正常播放结束
// /sqx_fast/app/ad/state
let res = await this.$Request.getT('app/ad/state', {
- extraKey: 1
- })
- this.$Request.get('/app/common/type/813').then(res => {
- if (res.code == 0 && res.data.value) {
- if (res.data.value == '是') {
- this.getActivitys()
- }
- }
+ extraKey: this.urlCallback.extra
})
this.$Request.getT('/app/common/type/921').then(res => {
if (res.code == 0) {
console.log(res)
uni.showToast({
- title: '获得'+res.data.value+'分钟免费时长',
+ title: '获得' + res.data.value + '分钟免费时长',
icon: 'none'
})
}
@@ -197,13 +174,9 @@
} else {
// 播放中途退出
}
- //this.isLoading = true;
- //this.$refs.adRewardedVideo.load();
},
- onaderror(e) {
- // 广告加载失败
+ onaderror(e) { // 广告加载失败
console.log("广告加载失败")
- this.isLoading = false;
},
/**
* 获取签到数据
@@ -252,12 +225,18 @@
// jumpType (integer, optional): 跳转类型 1 内部路径 2 外部路径 ,
// type (integer, optional): 任务类型 1 普通任务 2 打卡任务 9 其它 ,
// buttonUrl
-
+
if (item.jumpType == 0) {
if (item.buttonTitle.indexOf("领取") != -1) {
this.taskReceive(item.id)
- }if (item.buttonTitle.indexOf("观看视频") != -1) {
- this.showAd()
+ }
+ if (item.buttonTitle.indexOf("观看视频") != -1) {
+ // 首次加载广告
+ this.urlCallback = {
+ userId: uni.getStorageSync('userId'),
+ extra: uni.getStorageSync('userId') + "" + new Date().getTime(),
+ }
+ this.$refs.adRewardedVideo.show();
} else {
uni.switchTab({
url: "/pages/index/index"