修改
This commit is contained in:
parent
2a2819e1ca
commit
138523ab99
@ -33,7 +33,7 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="_my_step_3">
|
||||
<!-- <view class="_my_step_3">
|
||||
<view class="_my_ste_3_vip">
|
||||
<view class="_my_ste_3_v_info">
|
||||
<image src="/static/my_v_bg.png" class="__my_bg_img"></image>
|
||||
@ -95,7 +95,7 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
<view class="_my_step_4" tt:if="{{historyList.length}}">
|
||||
<view class="_my_ste_4_header">
|
||||
|
@ -53,7 +53,7 @@ Page({
|
||||
// if (batchlistRes.status == 1 && Array.isArray(batchlistRes.data)) {
|
||||
// batchList = batchlistRes.data;
|
||||
// }
|
||||
console.log(getNewModule2Res, "getNewModule2Res")
|
||||
// console.log(getNewModule2Res, "getNewModule2Res")
|
||||
if (getNewModule2Res.status == 1 && Array.isArray(getNewModule2Res.data.module)) {
|
||||
const moduleList = getNewModule2Res.data.module;
|
||||
const batchList = this.data.batchList;
|
||||
@ -66,12 +66,12 @@ Page({
|
||||
if (page == 1) {
|
||||
this.setData({
|
||||
batchList: ls,
|
||||
page
|
||||
page,
|
||||
})
|
||||
} else {
|
||||
this.setData({
|
||||
batchList: batchList.concat(ls),
|
||||
page
|
||||
page,
|
||||
})
|
||||
}
|
||||
|
||||
@ -95,12 +95,13 @@ Page({
|
||||
nextContext?.play?.();
|
||||
|
||||
this.selectComponent(`#${nextId}`, (res: any) => {
|
||||
console.log(res, "resres")
|
||||
// console.log(res, "resres")
|
||||
res?.hidePauseIcon()
|
||||
});
|
||||
|
||||
this.setData({
|
||||
videoPlayerCurrent: current,
|
||||
videoErrorText: ''
|
||||
})
|
||||
if (current + 5 >= batchList.length) {
|
||||
const page = this.data.page;
|
||||
@ -108,8 +109,8 @@ Page({
|
||||
}
|
||||
|
||||
},
|
||||
videoPlayerEnded() {
|
||||
console.log('videoPlayerEnded')
|
||||
videoPlayerEnded(err: any) {
|
||||
console.log(err, 'videoPlayerEnded')
|
||||
const videoPlayerCurrent = this.data.videoPlayerCurrent;
|
||||
this.setData({
|
||||
videoPlayerCurrent: videoPlayerCurrent + 1,
|
||||
|
@ -1,7 +1,7 @@
|
||||
<!-- style="padding-bottom:{{ statusBarHeight ? 166 : 98}}rpx;" -->
|
||||
<view class="_recom_html" >
|
||||
<!-- <block tt:if="{{videoCanIUse}}"> -->
|
||||
<swiper bindchange="handelSeiperChange" class="_m_vi_pl_swiper" vertical="{{true}}" duration="{{100}}"
|
||||
<swiper bindchange="handelSeiperChange" class="_m_vi_pl_swiper" vertical="{{true}}" duration="{{200}}"
|
||||
easing-function="easeInOutCubic" current="{{videoPlayerCurrent}}">
|
||||
<block tt:for="{{batchList}}">
|
||||
<!-- tt:key="{{item.id}}" -->
|
||||
@ -18,7 +18,7 @@
|
||||
enable-progress-gesture="{{true}}" autoplay="{{ videoPlayerCurrent == index}}"
|
||||
id="{{item.id}}" enable-dark-water-mark="{{true}}" bindended="videoPlayerEnded"
|
||||
binderror="videPlayerError">
|
||||
<block tt:if="{{videoPlayerCurrent == index}}">
|
||||
<!-- <block tt:if="{{videoPlayerCurrent == index}}">
|
||||
<block tt:if="{{videoErrorText}}">
|
||||
<view class="_iii_video_content">
|
||||
<block tt:if="{{videoErrorText}}">
|
||||
@ -34,7 +34,7 @@
|
||||
</block>
|
||||
</view>
|
||||
</block>
|
||||
</block>
|
||||
</block> -->
|
||||
</video-player>
|
||||
</block>
|
||||
<block tt:else>
|
||||
@ -42,7 +42,7 @@
|
||||
src="{{item.videoinfo.video_url}}" version="1" enable-progress-gesture="{{true}}"
|
||||
autoplay="{{ videoPlayerCurrent == index}}" id="{{item.id}}"
|
||||
enable-dark-water-mark="{{true}}" bindended="videoPlayerEnded" binderror="videError">
|
||||
<block tt:if="{{videoPlayerCurrent == index}}">
|
||||
<!-- <block tt:if="{{videoPlayerCurrent == index}}">
|
||||
<block tt:if="{{videoErrorText}}">
|
||||
<view class="_iii_video_content">
|
||||
<block tt:if="{{videoErrorText}}">
|
||||
@ -58,11 +58,9 @@
|
||||
</block>
|
||||
</view>
|
||||
</block>
|
||||
</block>
|
||||
</block> -->
|
||||
</video>
|
||||
</block>
|
||||
|
||||
|
||||
<!-- </block>
|
||||
<block tt:else>
|
||||
<view class="_m_v_w_it_ma_cover">
|
||||
|
@ -388,46 +388,49 @@ Page({
|
||||
// 监听视频播放完成
|
||||
adBanner.onClose(async (res: any) => {
|
||||
console.log(res, "resres")
|
||||
// const videoIndex = batchList.findIndex(
|
||||
// (r: any) => r.id === videoInfo.id
|
||||
// );
|
||||
// batchList[videoIndex].isvip = 0; // 购买成功 或者本来就是免费
|
||||
// batchList[videoIndex].state = "play";
|
||||
// batchList[videoIndex].playIng = true;
|
||||
// batchList[videoIndex].isplay = true;
|
||||
// context?.play?.();
|
||||
if (res.isEnded) {
|
||||
|
||||
const lk: any = [];
|
||||
selectionConList.forEach((m: any) => {
|
||||
const bm = {
|
||||
...m,
|
||||
temp: []
|
||||
}
|
||||
m.temp.forEach((k: any) => {
|
||||
if (k.id == videoInfo.id) {
|
||||
bm.temp.push({
|
||||
...k,
|
||||
isvip: 0
|
||||
})
|
||||
} else {
|
||||
bm.temp.push(k)
|
||||
// const videoIndex = batchList.findIndex(
|
||||
// (r: any) => r.id === videoInfo.id
|
||||
// );
|
||||
// batchList[videoIndex].isvip = 0; // 购买成功 或者本来就是免费
|
||||
// batchList[videoIndex].state = "play";
|
||||
// batchList[videoIndex].playIng = true;
|
||||
// batchList[videoIndex].isplay = true;
|
||||
// context?.play?.();
|
||||
|
||||
const lk: any = [];
|
||||
selectionConList.forEach((m: any) => {
|
||||
const bm = {
|
||||
...m,
|
||||
temp: []
|
||||
}
|
||||
m.temp.forEach((k: any) => {
|
||||
if (k.id == videoInfo.id) {
|
||||
bm.temp.push({
|
||||
...k,
|
||||
isvip: 0
|
||||
})
|
||||
} else {
|
||||
bm.temp.push(k)
|
||||
}
|
||||
})
|
||||
lk.push(bm)
|
||||
})
|
||||
lk.push(bm)
|
||||
})
|
||||
const params = {
|
||||
sid: videoInfo.sid,
|
||||
id: videoInfo.id,
|
||||
};
|
||||
const transferadRes: any = await httpRequest('/transferad', 'POST', params);
|
||||
this.setData({
|
||||
batchList: batchList,
|
||||
videoInfo: {
|
||||
...videoInfo,
|
||||
chackpay: 1
|
||||
},
|
||||
selectionConList: lk
|
||||
})
|
||||
const params = {
|
||||
sid: videoInfo.sid,
|
||||
id: videoInfo.id,
|
||||
};
|
||||
const transferadRes: any = await httpRequest('/transferad', 'POST', params);
|
||||
this.setData({
|
||||
batchList: batchList,
|
||||
videoInfo: {
|
||||
...videoInfo,
|
||||
chackpay: 1
|
||||
},
|
||||
selectionConList: lk
|
||||
})
|
||||
}
|
||||
});
|
||||
|
||||
// 预加载资源
|
||||
|
@ -74,7 +74,7 @@
|
||||
<view class="_k_l_unlo_btn_warp">
|
||||
<icon class="_k_l_unlo_btn_warp_icon" size="{{28}}" type="cancel" color="#fff"
|
||||
catchtap="hideUnlock"></icon>
|
||||
<block tt:if="{{platform != 'ios'}}">
|
||||
<!-- <block tt:if="{{platform != 'ios'}}">
|
||||
<view class="_k_l_unlo_ma_pay" catchtap="toPathPay">
|
||||
<view class="_k_l_unlo_ma_p_icon">
|
||||
<image src="/static//unlock_icon.png" class="__wa_img_no_radius">
|
||||
@ -84,7 +84,7 @@
|
||||
<text class="_k_l_unlo_ma_na_text">充值解锁</text>
|
||||
</view>
|
||||
</view>
|
||||
</block>
|
||||
</block> -->
|
||||
<view class="_k_l_unlo_ma_ad" catchtap="watchAdvertisement">
|
||||
<view class="_k_l_unlo_ma_p_icon">
|
||||
<image src="/static//unlock_icon.png" class="__wa_img_no_radius">
|
||||
@ -96,8 +96,8 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="_k_l_unlo_mask" tt:else>
|
||||
<view catchtap="showUnlockFlag" >
|
||||
<view class="_k_l_unlo_mask" tt:else catchtap="showUnlockFlag">
|
||||
<view>
|
||||
<text class="_k_ll_show_un_text">点击屏蔽再次解锁</text>
|
||||
</view>
|
||||
</view>
|
||||
|
@ -13,6 +13,6 @@
|
||||
]
|
||||
},
|
||||
"appid": "tte8719ecc7742e53d01",
|
||||
"projectname": "初晴剧场",
|
||||
"projectname": "古言剧场",
|
||||
"douyinProjectType": "native"
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user