查找当前课程后面的有没有考试

src/components/business/cell-list-detail.vue

@@ -180,7 +180,7 @@ export default {
       let currentExam = {};
       // 查找当前课程后面的有没有考试
       for(let i = index; i < contentList.length; i ++) {
-        if(contentList[i].type == 1) {
+        if(contentList[i].type == 1 && contentList[i].status != 14) {
           hasExam = true;
           currentExam = contentList[i];
           break;
@@ -192,9 +192,9 @@ export default {
 
       let hasNoLearningCourse = false;
       // 查找本模块中是否还有没有学习完的课程，排除当前这个
-      for(let i = 0; i < contentList.length; i ++) {
-        if(i == index) continue; 
-        if(contentList[i].type == 2 && contentList[i].status != 14) {
+      for(let j = 0; j < contentList.length; j ++) {
+        if(j == index) continue; 
+        if(contentList[j].type == 2 && (contentList[j].status == 21 || contentList[j].status == 22)) {
           hasNoLearningCourse = true;
           break;
         }

src/utils/env-config.js

@@ -7,11 +7,11 @@ export const envConfig = {
     // baseUrl: 'https://dev-sc.yunqueyi.com/',
     // 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/utils/fetch.js

@@ -15,9 +15,9 @@ service.interceptors.request.use(config => {
   if (config.data && config.data.setEntry) {
     config.headers['sysCode'] = config.data.sysCode || 10
     if(config.data.token){
-       config.headers['token'] = config.data.token || '891F256CC48A4D57905F79C8F7628A74'
+       config.headers['token'] = config.data.token || '47993ED00ECB46CE8D31ECF3AE34B4AA'
        if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
-        config.headers['token'] = config.data.token || '891F256CC48A4D57905F79C8F7628A74';
+        config.headers['token'] = config.data.token || '47993ED00ECB46CE8D31ECF3AE34B4AA';
        }
        delete config.data.setEntry;
        delete config.data.token;

src/views/merge-detail.vue

@@ -683,9 +683,10 @@ export default {
     getProjectInfoById() {
       let _this = this;
       let param = {
-        token: _this.userInfo.userToken || this.token,
+        token: _this.userInfo.userToken || this.token || '47993ED00ECB46CE8D31ECF3AE34B4AA',
         setEntry: true
       };
+      console.log('getProjectInfoById', param);
       _this.showLoading = true;
       this.NEW_GET(`cme/project/${_this.projectId}/info`, param).then(res => {
         if (res.code == "000000") {