请您下载新版本App

src/utils/env-config.js

@@ -8,10 +8,10 @@ export const envConfig = {
     // baseUrl: 'http://10.177.15.180:10202/',
     // baseUrl: 'http://192.168.140.14:10201/',
 
-    // apiUrl: 'https://dev-api.yunqueyi.com/',
-    // webPageUrl: 'https://dev-phome.yunqueyi.com/',
-    // baseUrl: 'https://dev-sc.yunqueyi.com/',
-    // hactiveUrl: 'https://dev-hactive.yunqueyi.com',
+    apiUrl: 'https://dev-api.yunqueyi.com/',
+    webPageUrl: 'https://dev-phome.yunqueyi.com/',
+    baseUrl: 'https://dev-sc.yunqueyi.com/',
+    hactiveUrl: 'https://dev-hactive.yunqueyi.com',
 
     // http://dev-hactive.yunqueyi.com/message_push/#/study-card
     // baseUrl: 'https://test1-sc.yunqueyi.com/',
@@ -19,10 +19,10 @@ export const envConfig = {
     // webPageUrl: 'https://test1-phome.yunqueyi.com/'
     // hactiveUrl: 'https://dev-hactive.yunqueyi.com',
 
-    baseUrl: 'https://uat-sc.yunqueyi.com/',
-    apiUrl: 'https://uat-api.yunqueyi.com/',
-    webPageUrl: 'https://uat-phome.yunqueyi.com/',
-    hactiveUrl: 'https://uat-hactive.yunqueyi.com',
+    // baseUrl: 'https://uat-sc.yunqueyi.com/',
+    // apiUrl: 'https://uat-api.yunqueyi.com/',
+    // webPageUrl: 'https://uat-phome.yunqueyi.com/',
+    // hactiveUrl: 'https://uat-hactive.yunqueyi.com',
 
     // baseUrl: 'https://sc.yunqueyi.com/',
     // apiUrl: 'https://api.yunqueyi.com/',

src/views/merge-detail.vue

@@ -17,14 +17,13 @@
     ></CommonNavbar>
     <div class="page-content list-container">
       <!-- banner图片 -->
-      <!-- <div @click="gotoCourse()" v-if="bannerType == 1" class="page-content-img-container" style="position:relative;">
+      <div @click="gotoCourse()" v-if="bannerType == 1" class="page-content-img-container" style="position:relative;">
         <img class="banner-img" :src="attachmentUrl" />
         <img v-show="project.status == 5" class="banner-img-5" src="../images/status-keep-on.png" />
         <img v-show="project.status == 10" class="banner-img-10" src="../images/status-end-cme.png" />
-
-      </div> -->
+      </div>
       <!-- banner视频 -->
-      <CommonTcPlayer v-if="bannerType == 2" style="flex" :options="videoOptions" @sk-tip="isShowSkDialog=true"></CommonTcPlayer>
+      <CommonTcPlayer ref="commonTcPlayer" v-if="bannerType == 2" style="flex" :options="videoOptions" @sk-tip="isShowSkDialog=true"></CommonTcPlayer>
       <div class="sk-btn-cover-new" @click="continueStudy()" v-if="bannerType == 2 && hasBindCard" >
         <span>继续学习</span>
       </div>
@@ -364,6 +363,13 @@ export default {
       console.log("__getUserInfo64Comp", param);
       _this.token = param.userToken;
       _this.setUserInfo(param);
+
+      let appVersion = param.appVersion || '300';
+      let appVersionNum = appVersion.split(".").join("");
+      // 如果是iOS系统并且版本小于344，则提示升级
+      if(__isIOS && appVersionNum < 344) {
+        _this.isShowIOSDownloadDialog = true;
+      }
       _this.checkToken();
       _this.getProjectParticularsV2();
     };
@@ -396,12 +402,6 @@ export default {
     this.getAdvertInfoList();
   },
   mounted() {
-    let appVersion = this.userInfo.appVersion || '300';
-    let appVersionNum = appVersion.split(".").join("");
-    // 如果是iOS系统并且版本小于344，则提示升级
-    if(__isIOS && appVersionNum < 344) {
-      this.isShowIOSDownloadDialog = true;
-    }
     window.addEventListener("scroll", this.scrollFun);
     const _this = this;
   },
@@ -567,6 +567,11 @@ export default {
       }, 1000);
     },
 
+    // 关闭视频
+    closePlayer() {
+
+    },
+
     // 跳转前判断是否有机构，否则使用定位信息
     preJumper() {
       // TODO 测试代码
@@ -905,8 +910,8 @@ export default {
         token: _this.userInfo.userToken || this.token,
         setEntry: true
       };
-      this.videoUrl = this.$route.query.videoUrl || '';
-      if(this.videoUrl) {
+      let videoUrl = this.$route.query.videoUrl || '';
+      if(videoUrl) {
         param.trySeeFlag = 0;
       } else {
         param.trySeeFlag = 1;
@@ -917,12 +922,12 @@ export default {
           // 先设置视频URL再显示视频组件  ------------    BEGIN
 
           // 首先使用配置中的参数中的获取视频地址及视频时间
-          if(this.videoUrl) {
-            _this.videoOptions.mp4 = this.videoUrl;
+          if(videoUrl) {
+            _this.videoOptions.mp4 = videoUrl;
             this.limitTimes = this.$route.query.trySeeTime || 300000;
           } else {
             _this.videoOptions.mp4 = res.data.attachmentUrl;
-            _this.videoOptions.trySeeTime = res.data.trySeeTime;
+            _this.videoOptions.trySeeTime = res.data.trySeeTime || 300000;
           }
           if(this.hasBindCard) {
             _this.videoOptions.trySeeTime = 300000;