代码合并

This commit is contained in:
2024-12-05 14:18:50 +08:00
7 changed files with 289 additions and 261 deletions

View File

@@ -194,36 +194,32 @@
<!-- <u-icon name="lock" class="list-title-icon" color="#efbb6b" size="40"></u-icon> -->
当前视频 没有播放权限
</view>
<view class="list-item" v-if="zhengbu === '是' && isWxIosPay == true">
<!-- <view class="list-item" v-if="zhengbu === '是' && isWxIosPay == true">
<view class="list-item-box flex align-center justify-center" @click="payVideo(1)">
<image src="../../static/images/me/rmIcon.png" mode=""></image>
{{zongPrice}}金豆解锁整部视频
<!-- #ifdef MP-TOUTIAO || MP-WEIXIN-->
(解锁后永久有效)
<!-- #endif -->
#ifdef MP-TOUTIAO || MP-WEIXIN-->
<!-- (解锁后永久有效) -->
<!-- #endif
</view>
</view>
</view> -->
<view class="list-item" v-if="danbu === '是' && isWxIosPay == true">
<view class="list-item-box" @click="payVideo(2)">
{{countPrice}}金豆解锁单集视频
{{countPrice}}解锁单集视频
<!-- #ifdef MP-TOUTIAO || MP-WEIXIN-->
(解锁后永久有效)
<!-- #endif -->
</view>
</view>
<template v-if="false">
<view class="list-item" v-if="isVips == '是' && isWxIosPay == true">
<view class="list-item-box flex align-center justify-center" @click="goNav('/pages/me/vip/index')">
<image src="../../static/images/me/rmIcon.png" mode=""></image>
开通会员
<!-- #ifdef MP-TOUTIAO || MP-WEIXIN-->
(会员期内免费观看)
<!-- #endif -->
</view>
<!-- <view class="list-item" v-if="isVips == '是' && isWxIosPay == true">
<view class="list-item-box flex align-center justify-center" @click="goNav('/pages/me/vip/index')">
<image src="../../static/images/me/rmIcon.png" mode=""></image>
开通会员
#ifdef MP-TOUTIAO || MP-WEIXIN-->
<!-- (会员期内免费观看) -->
<!-- #endif
</view>
</template>
</view> -->
<!-- #ifdef MP-WEIXIN -->
<view class="list-item" v-if="isGuanggao == '是'&& adUnitId && advertising">
<view class="list-item-box" @click="openVideoAd()">
@@ -263,7 +259,7 @@
</u-popup> -->
<!-- 充值购买弹窗 -->
<payPopus v-if="showMoney" :payPrice="payPrice" :show="showMoney" @closeMoney="closeMoney"
<payPopus v-if="showMoney" :payPrice="payPrice" :orderId="ordersId" :show="showMoney" @closeMoney="closeMoney"
@paySuccess="paySuccess" />
<!-- #ifdef H5 -->
@@ -365,7 +361,6 @@
checked: false,
payPrice: 0, //需要支付的价格
showMoney: false, //是否显示充值弹窗
showPay: false,
dyCourseId: '',
nowBs: 1, //当前倍速
subList: [{
@@ -576,7 +571,6 @@
this.courseDetailsId = e.courseDetailsId
}
console.log(this.courseDetailsId, '跳转进来的id')
this.getDataList(this.courseId, this.courseDetailsId);
this.getMyLoveStatus()
}
if (e.tt_album_id) {
@@ -585,7 +579,7 @@
if (e.tt_episode_id) {
this.tt_episode_id = e.tt_episode_id
}
console.log(1)
// this.$u.get('/app/common/type/817').then(res => { //是否开启购买整部视频 817
// if (res.code == 0 && res.data) {
// this.zhengbu = res.data.value;
@@ -679,6 +673,10 @@
}
// #endif
this.isVips = uni.getStorageSync('isVips') ? uni.getStorageSync('isVips') : '否'
console.log(2)
if(this.courseId){
this.getDataList(this.courseId, this.courseDetailsId);
}
// uni.$on('back', (data) => {
// if (data.flag == true) {
@@ -1168,8 +1166,14 @@
},
//子组件支付成功的回调
paySuccess() {
this.payOrder(this.ordersId, this.payMoney)
paySuccess(data) {
console.log(data)
// data.h5Url 跳转地址
this.showMoney = false //显示充值弹窗
// this.payOrder(this.ordersId, this.payMoney)
// #ifdef H5
window.open(data.h5Url)
// #endif
},
//自组件关闭的回调
closeMoney(data) {
@@ -1188,7 +1192,10 @@
this.ordersId = res.data.orders.ordersId //记录订单id
this.payMoney = res.data.orders.payMoney //记录订单价格
this.payOrder(res.data.orders.ordersId, res.data.orders.payMoney)
this.showPay = false //关闭购买选择弹窗
this.payPrice = res.data.orders.payMoney //需要支付的价格
this.showMoney = true //显示充值弹窗
// this.payOrder(res.data.orders.ordersId, res.data.orders.payMoney)
} else {
uni.showToast({
title: res.msg,