Merge branch 'dev-cme-20191227' into 'release'

新建CEM项目时候的暂存问题修复  code reviewer：张平

新建CEM项目时候的暂存问题修复  
code reviewer：张平

See merge request !134

src/utils/env-config.js

@@ -6,14 +6,14 @@ export const envConfig = {
     // // baseUrl: 'http://10.177.15.180:10202/',
     // // baseUrl: 'http://192.168.140.14:10201/',
 
-    baseUrl: 'https://test1-sc.yunqueyi.com/',
+    // baseUrl: 'https://test1-sc.yunqueyi.com/',
     // baseUrl: 'https://uat-sc.yunqueyi.com/',
     // baseUrl: 'http://10.177.15.150:10401/',
     // baseUrl: 'http://10.177.15.150:11905/',
     // baseUrl: 'https://dev-sc.yunqueyi.com/',
     // baseUrl: 'https://test1-sc.yunqueyi.com/',
     // baseUrl: 'https://sc.yunqueyi.com/',
-    // baseUrl: 'https://uat-sc.yunqueyi.com/',
+    baseUrl: 'https://uat-sc.yunqueyi.com/',
     apiUrl: 'https://uat-api.yunqueyi.com/',
     qiniuFileUrl: "https://uat-sc.yunqueyi.com/contents/admin/qiniu/token1",
     qiniuResourceUrl: "https://test1-videos.yunqueyi.com",

src/utils/fetch.js

@@ -54,7 +54,7 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      config.headers['token'] = 'E5F82EDD958941C29BCDDDED410ACDB3';
+      config.headers['token'] = '29D71EAAB92E4580AFB16A8011BE7206';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

src/views/education/edit-cme.vue

@@ -1900,8 +1900,10 @@ export default {
       }
       //}
       //creditId学分id的特殊处理
-      if(option == "add" && this.projectType == 2) {
-        projectModel.creditId = this.formData.creditId;
+      if(this.projectType == 2) {
+        if(option == 'add' || option == 'storage') {
+          projectModel.creditId = this.formData.creditId;
+        }
       }
       if (option == "edit" || option == "storageEdit") {
         if(this.projectType == 2) {