版本判断问题

src/utils/mixins.js

@@ -13,7 +13,7 @@ module.exports = {
             query = this.$route.query
         }
         // alert('this.token' + this.token)
-        this.token = this.getUrlKey('token') || (query && query.token) || '1CC1781670274318B1BE87171244F05D'
+        this.token = this.getUrlKey('token') || (query && query.token) || '413649EAAF9D4C719DA183FB49E1911F'
     },
     mounted() {
 

src/views/merge-detail.vue

@@ -55,7 +55,7 @@
           <span :class="{'focus': tabFlag}" @click="jumpIntro">简介</span>
           <span :class="{'focus': !tabFlag}" @click="jumpCatalogue">目录</span>
         </div>
-        <div v-if="fixedFlag" style="height: 60px;"></div>
+        <div v-show="fixedFlag" class="fixed-flag-height"></div>
         <div id="intro-content" class="intro-content">
           <BasicInfo
             :projectNo="project.projectNo"
@@ -259,6 +259,7 @@ export default {
     this.courseRequire = this.$route.query.courseRequire;
 
     window.__getUserInfo64Comp = function(param) {
+      // appVersion 安卓 3.2.2  iOS
       console.log('__getUserInfo64Comp', param);
       _this.token = param.userToken;
       _this.setUserInfo(param);
@@ -282,8 +283,6 @@ export default {
       // action: "打开页面",
       component_tag: `211#0#${this.projectId}#0`
     });
-              
-    Toast('请您下载新版本App');
 
   },
   mounted() {
@@ -315,7 +314,13 @@ export default {
 
     // 跳转到第三方考试页面
     jumpToExamAction() {
-      this.isShowEJDialog = false;
+      // 判断版本号，如果小于3.4.0，则只做提示
+      let appVersion = this.userInfo.appVersion;
+      let appVersionNum = appVersion.split('.').join('');
+      if(appVersionNum < 340) {
+        Toast('请您下载新版本App');
+        return;
+      }
       let paramList = [
         {
           key: "pageUrl",
@@ -345,7 +350,9 @@ export default {
         setEntry: true
       };
       this.NEW_POST(`cme/project/${_this.projectId}/firstIntoExam`, param).then(res => {
-        console.log('in isFirstIntoExam back', res);
+        if (res.code == "000000") {
+          this.project.firstIntoExam = false;
+        }
       });      
     },
 
@@ -363,8 +370,9 @@ export default {
       const catalogue = document.getElementById("catalogue-content");
       const intro = document.getElementById("intro-content");
 
-      console.log(`intor.offsetTop intro.offsetTop`, intro.offsetTop, intro.offsetTop);
-      console.log(`catalogue.offsetHeight catalogue.offsetHeight`, catalogue.offsetHeight, catalogue.offsetHeight);
+
+      console.log(`scrollTop intor.offsetTop catalogue.offsetTop`, scrollTop, intro.offsetTop, catalogue.offsetTop);
+      // console.log(`catalogue.offsetHeight catalogue.offsetHeight`, catalogue.offsetTop, catalogue.offsetTop);
 
 
       // const h = catalogue.offsetTop - 600;
@@ -770,6 +778,9 @@ export default {
         margin-bottom: px2rem(16px);
       }
     }
+    .fixed-flag-height {
+      height: px2rem(50px);
+    }
   }
 }
 </style>