|
|
@@ -452,8 +452,7 @@
|
|
|
mounted() {},
|
|
|
methods: {
|
|
|
...mapMutations(["updateChapterOpen", "updateLiveLast"]),
|
|
|
-<<<<<<< HEAD
|
|
|
- orderGetViewSign(option){
|
|
|
+ orderGetViewSign(option) {
|
|
|
return new Promise(resolve => {
|
|
|
this.$api.orderGetViewSign(Number(option.orderGoodsId)).then((res) => {
|
|
|
this.playSource = res.data.data.viewSign;
|
|
|
@@ -462,7 +461,8 @@
|
|
|
this.$api
|
|
|
.courseSkipPort()
|
|
|
.then((res2) => {
|
|
|
- console.log("详情页请求的域名", res2.data.data.domain, res2.data.data.skipPort)
|
|
|
+ console.log("详情页请求的域名", res2.data.data.domain, res2.data.data
|
|
|
+ .skipPort)
|
|
|
let obj = {
|
|
|
skipPort: res2.data.data.skipPort,
|
|
|
...option
|
|
|
@@ -481,7 +481,7 @@
|
|
|
resolve()
|
|
|
})
|
|
|
})
|
|
|
-=======
|
|
|
+ },
|
|
|
// 进行学习后，保存标识，用于检查是否二建15天提示弹窗弹出
|
|
|
saveLoaclCheckClass() {
|
|
|
let ary = uni.getStorageSync("loaclCheckClass") || []
|
|
|
@@ -497,7 +497,6 @@
|
|
|
})
|
|
|
}
|
|
|
uni.setStorageSync("loaclCheckClass", ary)
|
|
|
->>>>>>> 4f648c99062bf3dd977a35d3fcdd633155d8097f
|
|
|
},
|
|
|
async init() {
|
|
|
if (this.playSource == 2) {
|
|
|
@@ -510,7 +509,7 @@
|
|
|
this.isAllowSeek = "on";
|
|
|
// #endif
|
|
|
}
|
|
|
- console.log("进入：",this.playSource,this.isAllowSeek)
|
|
|
+ console.log("进入：", this.playSource, this.isAllowSeek)
|
|
|
this.photoList = [];
|
|
|
this.courseList = [];
|
|
|
this.photoConfig = false;
|
|
|
@@ -981,11 +980,12 @@
|
|
|
let {
|
|
|
data
|
|
|
} = res.data;
|
|
|
- if(data && data.endTime > parseInt(new Date().getTime() / 1000)){
|
|
|
+ if (data && data.endTime > parseInt(new Date().getTime() / 1000)) {
|
|
|
uni.showModal({
|
|
|
showCancel: false,
|
|
|
title: "提示",
|
|
|
- content: "当前无法学习，"+ this.$method.timestampToTime(data.endTime,false) +"过后可继续学习",
|
|
|
+ content: "当前无法学习，" + this.$method.timestampToTime(data.endTime, false) +
|
|
|
+ "过后可继续学习",
|
|
|
success: (resultst) => {
|
|
|
uni.navigateBack();
|
|
|
},
|
En route