Merge branch 'dev-mvp-20200331' of...

Merge branch 'dev-mvp-20200331' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-mvp-20200331

* 'dev-mvp-20200331' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin:
  修复模板列表的显示问题
  优化代码提示

src/components/education/template/templateList.vue

@@ -65,7 +65,7 @@
             <div class="dm-name">项目学科:</div>
             <div class="dm-nr">{{detailObj.subjectName}}</div>
           </div>
-          <div class="mian-list" v-if="detailObj.organizationNameList && detailObj.organizationNameList.length>1">
+          <div class="mian-list" v-if="detailObj.organizationNameList && detailObj.organizationNameList.length">
             <div class="dm-name">已参加的机构:</div>
             <div class="dm-nr">{{detailObj.organizationNameList.join(', ')}}</div>
           </div>

src/components/education/template/templateMessage.vue

@@ -16,6 +16,7 @@
             placeholder="请输入项目名称"
             style="width:70%;"
             ref="projectName"
+            maxlength="24"
             :disabled="isPreview==1"
           ></el-input>
           <span class="word-num">{{(formData.projectName).replace(/\s+/g,"").length}}/24</span>

src/utils/env-config.js

@@ -35,7 +35,7 @@ export const envConfig = {
     // reportUrl: 'https://uat-sc-report.yunqueyi.com/',
     excelUrl: 'https://uat-file.yunqueyi.com/File/template/portal/',
     itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
-    cmsUrl: ' http://dev-cms.yunqueyi.com/',
+    cmsUrl: ' https://dev-cms.yunqueyi.com/',
   },
   dev: {
     baseUrl: 'https://dev-sc.yunqueyi.com/',
@@ -53,7 +53,7 @@ export const envConfig = {
     reportUrl: 'https://dev-sc-report.yunqueyi.com/',
     excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
     itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
-    cmsUrl: ' http://dev-cms.yunqueyi.com/',
+    cmsUrl: ' https://dev-cms.yunqueyi.com/',
   },
   test: {
     baseUrl: 'https://test1-sc.yunqueyi.com/',
@@ -71,7 +71,7 @@ export const envConfig = {
     reportUrl: 'https://test1-sc-report.yunqueyi.com/',
     excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
     itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
-    cmsUrl: ' http://test1-cms.yunqueyi.com/',
+    cmsUrl: ' https://test1-cms.yunqueyi.com/',
   },
   test2: {
     baseUrl: 'https://test2-work.yunqueyi.com/sc/',
@@ -88,7 +88,7 @@ export const envConfig = {
     reportUrl: 'https://test2-sc-report.yunqueyi.com/',
     excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
     itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
-    cmsUrl: ' http://test2-cms.yunqueyi.com/',
+    cmsUrl: ' https://test2-cms.yunqueyi.com/',
   },
   uat: {
     baseUrl: 'https://uat-sc.yunqueyi.com/',
@@ -106,7 +106,7 @@ export const envConfig = {
     reportUrl: 'https://uat-sc-report.yunqueyi.com/',
     excelUrl: 'https://test-file.yunqueyi.com/File/template/portal/',
     itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
-    cmsUrl: ' http://uat-cms.yunqueyi.com/',
+    cmsUrl: ' https://uat-cms.yunqueyi.com/',
   },
   pro: {
     baseUrl: 'https://sc.yunqueyi.com/',
@@ -124,6 +124,6 @@ export const envConfig = {
     reportUrl: 'https://sc-report.yunqueyi.com/',
     excelUrl: 'https://file.yunqueyi.com/File/template/portal/',
     itemFileUrl: 'http://pica-test-huabei2.oss-cn-beijing.aliyuncs.com/File/template/portal/',
-    cmsUrl: ' http://cms.yunqueyi.com/',
+    cmsUrl: ' https://cms.yunqueyi.com/',
   }
 }

src/views/education/template-open.vue

@@ -96,34 +96,34 @@ export default {
       statusObj: {
         status_10: {
           title: '您暂未加入机构',
-          message: '请前往云鹊医App-个人中心完善机构信息，加入机构后，可创建项目',
+          message: '请前往云鹊医App-个人中心完善机构信息,加入机构后,可创建项目',
           hideMsg: '我知道了'
         },
         status_11: {
           title: '您创建的机构正在审核中',
-          message: '请前往云鹊医App-个人中心查看审核进度，审核通过后，可创建机构',
+          message: '请前往云鹊医App-个人中心查看审核进度,审核通过后,可创建机构',
           hideMsg: '我知道了'
         },
         status_12: {
           title: '您创建的机构审核不通过',
-          message: '请前往云鹊医App-个人中心完善机构信息，加入机构后，可创建项目',
+          message: '请前往云鹊医App-个人中心查看原因,审核通过后,可创建机构',
           hideMsg: '我知道了'
         },
         status_20: {
           title: '该项目正在进行中',
-          message: '不能重复创建，请选择其他模版或者下架正在进行中的项目',
+          message: '不能重复创建,请选择其他模版或者下架正在进行中的项目',
           hideMsg: '确定'
         },
         status_21: {
           title: '该项目创建数量已上限',
-          message: '本年度免费创建数已达',
+          message: '本年度免费创建数已达4次,不能继续创建该项目',
           hideMsg: '确定'
         }
       },
       sendObj: { // 发布
         visible: false,
         title: '确定发布吗?',
-        message: '发布后，项目将进入审核中，待审核完成后学员可在云鹊医App上参加培训学习',
+        message: '发布后,项目将进入审核中,待审核完成后学员可在云鹊医App上参加培训学习',
         confirmMsg: '取消',
         hideMsg: '确定发布'
       },