|
@@ -954,14 +954,7 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
},
|
|
},
|
|
- async onLoad(option) {
|
|
|
|
- if (option.skipPort) {
|
|
|
|
- await this.$method.skipLogin(option.skipPort);
|
|
|
|
- }
|
|
|
|
- if (this.$method.isGoLogin()) {
|
|
|
|
- // 从公众号消息进来的没登录需要跳到登录页,登录后返回
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
|
|
+ onLoad(option) {
|
|
if (option.isOther) {
|
|
if (option.isOther) {
|
|
this.showMark = true;
|
|
this.showMark = true;
|
|
return;
|
|
return;
|
|
@@ -974,16 +967,15 @@ export default {
|
|
this.option = option;
|
|
this.option = option;
|
|
// 公众号模板消息的数据埋点
|
|
// 公众号模板消息的数据埋点
|
|
option.informId && this.clickOfficial(option.informId);
|
|
option.informId && this.clickOfficial(option.informId);
|
|
- this.courseCourseList();
|
|
|
|
},
|
|
},
|
|
async onShow() {
|
|
async onShow() {
|
|
- // if (this.option.skipPort) {
|
|
|
|
- // await this.$method.skipLogin(this.option.skipPort);
|
|
|
|
- // }
|
|
|
|
- // if (this.$method.isGoLogin()) {
|
|
|
|
- // return;
|
|
|
|
- // }
|
|
|
|
- // this.courseCourseList();
|
|
|
|
|
|
+ if (this.option.skipPort) {
|
|
|
|
+ await this.$method.skipLogin(this.option.skipPort);
|
|
|
|
+ }
|
|
|
|
+ if (this.$method.isGoLogin()) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ this.courseCourseList();
|
|
},
|
|
},
|
|
onUnload() {
|
|
onUnload() {
|
|
console.log("onUnloadonUnloadonUnloadonUnload");
|
|
console.log("onUnloadonUnloadonUnloadonUnload");
|
|
@@ -1846,7 +1838,7 @@ export default {
|
|
// buyCourse 是否购买课程:1是 0否
|
|
// buyCourse 是否购买课程:1是 0否
|
|
let encode = encodeURIComponent(
|
|
let encode = encodeURIComponent(
|
|
this.config.hostLive +
|
|
this.config.hostLive +
|
|
- "pages/live/index?token=" +
|
|
|
|
|
|
+ "/pages/live/index?token=" +
|
|
uni.getStorageSync("token") +
|
|
uni.getStorageSync("token") +
|
|
"&userInfo=" +
|
|
"&userInfo=" +
|
|
JSON.stringify(this.userInfo) +
|
|
JSON.stringify(this.userInfo) +
|