diff --git a/config/baseUrl.js b/config/baseUrl.js index fbab762..6c26018 100644 --- a/config/baseUrl.js +++ b/config/baseUrl.js @@ -3,9 +3,9 @@ let socketUrl = ""; if (process.env.NODE_ENV === 'development') { // 开发环境 // baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试 - // baseUrl = "https://api.nuttyreading.com/"; //线上正式' + baseUrl = "https://api.nuttyreading.com/"; //线上正式' // baseUrl = "http://192.168.110.100:9200/pb/"; //张川川 - baseUrl = "http://192.168.110.131:9200/pb/"; // 王亚男 + // baseUrl = "http://192.168.110.131:9200/pb/"; // 王亚男 } else if (process.env.NODE_ENV === 'production') { // 生产环境11 baseUrl = "https://api.nuttyreading.com/"; //线上正式 diff --git a/pages/course/chapterDetailAndorid.vue b/pages/course/chapterDetailAndorid.vue index d17f3fb..561b2aa 100644 --- a/pages/course/chapterDetailAndorid.vue +++ b/pages/course/chapterDetailAndorid.vue @@ -20,6 +20,8 @@ :course="{courseTitle:options.navTitle, chapterTitle: curriculumData.title, catalogueId: curriculumData.catalogueId || '', courseId: curriculumData.courseId || options.courseId || ''}" :cover="options.curriculumImgUrl || ''" :http="$http" + :user-id="watermarkUserId" + :mobile="watermarkMobile" /> @@ -327,7 +329,6 @@ this.hideNextVideo() }, onUnload() { - }, onHide() { console.log('回去了 .....................'); @@ -343,6 +344,12 @@ }, computed: { ...mapState(["userInfo"]), + watermarkUserId() { + return this.userInfo.id || this.userInfo.userId || this.userInfo.uid || '' + }, + watermarkMobile() { + return this.userInfo.phone || this.userInfo.tel || this.userInfo.mobile || '' + }, }, methods: { editorIput(e){ diff --git a/pages/miniClass/classInfoMan.vue b/pages/miniClass/classInfoMan.vue index 2c3c1e9..4bcbcd3 100644 --- a/pages/miniClass/classInfoMan.vue +++ b/pages/miniClass/classInfoMan.vue @@ -1116,14 +1116,14 @@ export default { }, // 改变班级状态 changeClassStatu(statusCode) { - if(this.classStatus){ - return - } - this.classStatus = true; - debounce(async () => { - let that = this; - that.opClass(statusCode); - }, 300); + if(this.classStatus){ + return + } + this.classStatus = true; + debounce(async () => { + let that = this; + that.opClass(statusCode); + }, 300); }, // 未开班和进行中状态下,学员的信息,带买课标识 async getStudentsList() {