下载证书修改

src/components/cme/basic-info.vue

@@ -46,11 +46,11 @@ export default {
             default: ""
         },
         startDate: {
-            type: String,
+            type: Number,
             default: ""
         },
         endDate: {
-            type: String,
+            type: Number,
             default: ""
         },
         organName: {

src/components/cme/cme-step.vue

@@ -69,6 +69,10 @@ export default {
       type: String,
       default: ""
     },
+    certificateId: {
+      type: String,
+      default: ""
+    },
     projectId: {
         type: String,
         default: "1"
@@ -118,7 +122,7 @@ export default {
             _this.step3 = true;
             _this.step4 = false;
             _this.progressText = "审核失败";
-        }else if(n == 5) { // 申请成功
+        }else if(n == 5 || n == 6) { // 申请成功
             _this.step1 = false;
             _this.step2 = false;
             _this.step3 = false;

src/components/cme/item-intro.vue

@@ -3,8 +3,8 @@
         <div class="basic-title">项目介绍</div>
         <div class="content">
             <div class="text">{{textContent}}</div>
-            <div class="desc" @click="allText">
-                <span v-if="textContent.length > 76">{{btnText}}</span>
+            <div v-if="textContent.length > 76" class="desc" @click="allText">
+                <span>{{btnText}}</span>
                 <img v-if="!allTextFlag" src="../../images/down.png"/>
                 <img v-if="allTextFlag" src="../../images/up.png"/>
             </div>

src/components/cme/item-leader.vue

@@ -11,8 +11,8 @@
     </div>
     <div class="content">
       <div class="text">{{leaderText}}</div>
-      <div class="desc" @click="allText">
-        <span v-if="leaderText.length > 76">{{btnText}}</span>
+      <div v-if="leaderText.length > 76" class="desc" @click="allText">
+        <span>{{btnText}}</span>
         <img v-if="!allTextFlag" src="../../images/down.png" />
         <img v-if="allTextFlag" src="../../images/up.png" />
       </div>

src/views/merge-detail.vue

@@ -40,6 +40,7 @@
         :certificateUrl="project.certificateUrl"
         :inScope="project.inScope"
         :projectId="projectId"
+        :certificateId="project.certificateId"
         @applicationCredit="applicationCredit"
       />
       <!-- 简介和目录 -->
@@ -139,8 +140,8 @@ export default {
         level: "", // 项目等级
         scope: "", // 申请范围
         remind: "", // 在不在范围提醒
-        startDate: "", // 开始时间
-        endDate: "", // 结束时间
+        startDate: 0, // 开始时间
+        endDate: 0, // 结束时间
         organName: "", // 发起机构
         projectName: "", // 项目名称
         projectNo: "", // 项目编号
@@ -153,7 +154,8 @@ export default {
         status: 0, // 项目状态 1是参加中 5是进行中 10是已结束
         certificateUrl: "", // 证书url
         inScope: 0, // 是否在范围内判断
-        projectCredit: "" // 学分
+        projectCredit: "", // 学分
+        certificateId: "0"
       },
       projectLeader: {},
       doctorList: [],
@@ -406,6 +408,8 @@ export default {
           if(_this.project.projectIntro) {
             _this.textContent = _this.project.projectIntro.length > 76 ? _this.project.projectIntro.slice(0, 76) + "..." : this.project.projectIntro;
           }
+          _this.project.mustKnow = _this.project.mustKnow.replace(/\n/g, "<br>") ;
+
           _this.projectLeader = res.data.projectLeader || {};
           if(_this.projectLeader.info) {
             _this.leaderText = _this.projectLeader.info.length > 76 ? _this.projectLeader.info.slice(0, 76) + "..." : this.projectLeader.info;