diff --git a/manifest.json b/manifest.json index c117d23..efd58f3 100644 --- a/manifest.json +++ b/manifest.json @@ -12,13 +12,19 @@ "src" : "图片路径" } ], - "versionName" : "1.0.05", - "versionCode" : 100, + "versionName" : "1.0.07", + "versionCode" : 1007, "app-plus" : { "nvueCompiler" : "weex", "compatible" : { "ignoreVersion" : true }, + "screenOrientation" : [ + "portrait-primary", + "portrait-secondary", + "landscape-primary", + "landscape-secondary" + ], "privacy" : { "prompt" : "template", "template" : { diff --git a/pages.json b/pages.json index 7b2d0bc..170cd6f 100644 --- a/pages.json +++ b/pages.json @@ -366,12 +366,21 @@ } }, { + // ios课程播放 "path": "pages/course/chapterDetail", "style": { "navigationBarTitleText": "章节详情", "enablePullDownRefresh": true } }, + { + // Andriod课程播放 + "path": "pages/course/chapterDetailAndorid", + "style": { + "navigationBarTitleText": "章节详情", + "enablePullDownRefresh": true + } + }, { "path": "pages/course/courseSet", "style": { diff --git a/pages/component/commonComponents/video/index.vue b/pages/component/commonComponents/video/index.vue index c1f0322..6b42401 100644 --- a/pages/component/commonComponents/video/index.vue +++ b/pages/component/commonComponents/video/index.vue @@ -48,6 +48,7 @@ + + diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue index 2bb8998..481d5a6 100644 --- a/pages/course/courseDetail.vue +++ b/pages/course/courseDetail.vue @@ -481,7 +481,8 @@ goodsList: "sociology/product/getProductListForCourse", startStudyForMF: "sociology/course/startStudyForMF", }, - isAndorid: true + isAndorid: true, + oprateOsName:'', }; }, //第一次加载 @@ -557,7 +558,8 @@ getOS() { let oprateOs = ""; oprateOs = uni.getSystemInfoSync().platform; - // console.log(oprateOs) + this.oprateOsName = uni.getSystemInfoSync().platform; + console.log('oprateOs',oprateOs) if (oprateOs == "android") { this.isAndorid = true; } else { @@ -637,13 +639,20 @@ async gotoDetail(v, courseIndex) { console.log("准备进入学习页面", v); this.currentCateIndex = courseIndex; + let _myurl = '' + if(this.oprateOsName == 'ios'){ + _myurl = '/pages/course/chapterDetail' + }else{ + // h5 和安卓 + _myurl = '/pages/course/chapterDetailAndorid' + } if (this.librayList[this.curIndex].isBuy == 1 || v.isAudition == 1 || this.vip.type != "0") { let noRecored = false v.isAudition == 1 && this.userMsg.vip == 0 && this.librayList[this.curIndex].isBuy == 0 ? noRecored = true : '' uni.navigateTo({ - url: `/pages/course/chapterDetail?navTitle=${this.pageTitle}&title=${v.title}&id=${v.id}&conditions=${v.conditions}&noRecored=${noRecored}`, + url: `${_myurl}?navTitle=${this.pageTitle}&title=${v.title}&id=${v.id}&conditions=${v.conditions}&noRecored=${noRecored}`, }); } else { this.$commonJS.showToast("请先购买课程"); diff --git a/unpackage/debug/iOS_debug.ipa b/unpackage/debug/iOS_debug.ipa index c72b139..6a32a83 100644 Binary files a/unpackage/debug/iOS_debug.ipa and b/unpackage/debug/iOS_debug.ipa differ