bug 回滚2

This commit is contained in:
GYJ 2025-01-05 11:43:21 +08:00
parent 63a432c07c
commit f98abcc079
1 changed files with 28 additions and 34 deletions

View File

@ -149,7 +149,7 @@
style="font-size: 24rpx;color: #999;padding: 0 34rpx;margin: 20rpx 0; auto;text-align: left;width: 100%;">
{{getRedEnvelopeTips}}
</text>
<view class="pay-content">
<view class="pay-content" >
<view class="pay-content-item" v-if="info&&info.price" @click="payVideo(2,'all')">
<image class="pay-content-item-icon" src="../../static/images/me/rmIcon.png" mode=""></image>
<text class="pay-content-items">
@ -542,7 +542,7 @@ export default {
this.getMoneyList()
this.getMyMoney()
} else {
console.log("allId=====" + e.allId)
console.log("allId====="+e.allId)
if (e.allId) {
const arr = e.allId.split('-')
this.courseId = arr[0];
@ -575,10 +575,8 @@ export default {
//播放时的回掉
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,
@ -608,7 +606,6 @@ export default {
},
appear(e, index) {
this.playFlag = false
this.courseDetailsId = e;
// 清除已经设置的定时器
clearTimeout(this.appearTimeout);
@ -618,8 +615,8 @@ export default {
// 实际要执行的操作
console.log('页面出现在视图中');
// 这里可以加入你需要执行的代码
console.log("appear===" + e)
console.log("appear===" + index)
console.log("appear==="+e)
console.log("appear==="+index)
// this.courseDetailsId = e
this.current = index
this.showControls = true
@ -1040,9 +1037,9 @@ export default {
* 1:购买整部视频
* 2:购买单集视频
*/
payVideo(type, num) {
payVideo(type,num) {
if (uni.getStorageSync('token')) {
this.submitPay(type, num)
this.submitPay(type,num)
} else {
uni.navigateTo({
url: "/pages/login/login"
@ -1050,17 +1047,16 @@ export default {
}
},
//使用金币购买
submitPay(type, num) {
submitPay(type,num) {
let data = {
courseId: this.courseId
}
if (!num) {
if(!num){
console.log('进入num');
//单集解锁
data.courseDetailsId = this.videoList[this.current].courseDetailsId
}
httpsRequest.getT((num && num == 10) ? '/app/order/insertCourseOrders/limit10' :
'/app/order/insertCourseOrders', data).then(res => {
httpsRequest.getT((num && num == 10)?'/app/order/insertCourseOrders/limit10': '/app/order/insertCourseOrders', data).then(res => {
if (res.code == 0) {
this.ordersId = res.data.orders.ordersId //记录订单id
this.payMoney = res.data.orders.payMoney //记录订单价格
@ -1075,7 +1071,7 @@ export default {
// this.payOrder(res.data.orders.ordersId, res.data.orders.payMoney)
} else {
if (res.status && res.status == 1) {
if ( res.status && res.status == 1) {
this.showPay = false //关闭购买选择弹窗
this.getDataList(this.courseId, this.videoList[this.current].courseDetailsId,
true);
@ -1137,8 +1133,8 @@ export default {
this.$refs.popupPya.close()
},
//选择播放
selectPlay(item, type) {
if (this.videoList[this.current].videoUrl == '' && this.videoList[this.current].price <= 0 && !type) {
selectPlay(item,type) {
if ( this.videoList[this.current].videoUrl == '' && this.videoList[this.current].price <= 0 && !type ) {
this.getDataList(this.courseId, this.courseDetailsId, true, 'select')
return;
}
@ -1292,7 +1288,6 @@ export default {
};
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;
@ -1349,17 +1344,6 @@ export default {
this.videoContext.play();
}
})
} else {
console.log('播放')
this.$nextTick(() => {
this.videoContextId = 'myVideo' + courseDetailsIds;
this.videoContext = uni.createVideoContext(this
.videoContextId,
this);
console.log(this.videoContext);
this.videoContext.play();
})
}
// console.log('this.noBuyVideoIndex', this.noBuyVideoIndex)
@ -1405,8 +1389,8 @@ export default {
this.$forceUpdate();
})
}
if (t == 'select') {
this.selectPlay(this.videoList[this.current], true)
if ( t == 'select') {
this.selectPlay(this.videoList[this.current],true)
}
this.$forceUpdate();
}
@ -1441,8 +1425,7 @@ export default {
type: 1
};
console.log(data, '记录了')
httpsRequest.postJson('/app/courseCollect/insertCourseCollect', data).then(res => {
})
httpsRequest.postJson('/app/courseCollect/insertCourseCollect', data).then(res => {})
}
},
}
@ -1569,6 +1552,11 @@ export default {
}
.popuppay {
width: 750rpx;
background-color: #ffffff;
@ -1814,6 +1802,11 @@ export default {
}
.bs {
display: flex;
flex-direction: row;
@ -2066,7 +2059,7 @@ export default {
color: #ffffff !important;
}
.videoListCurr > .list-content-items {
.videoListCurr>.list-content-items {
color: #ffffff !important;
}
@ -2089,6 +2082,7 @@ export default {
}
.pay {
width: 750rpx;
align-items: center;