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