Merge branch 'dev-hotfix(3p)-0308' into 'release'

CME迭代优化-前端 code reviewer: 张平

CME迭代优化-前端 code reviewer: 张平

See merge request !7

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

@@ -89,7 +89,7 @@ const actionMap = {
   12: "再考一次",
   13: "已通过",
   14: "已完成",
-  15: "去刷分",
+  15: "已通过",
   16: "未通过",
   21: "去学习",
   22: "继续学习",

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

@@ -51,7 +51,7 @@ const actionMap = {
   12: "再考一次",
   13: "已通过",
   14: "已完成",
-  15: "去刷分",
+  15: "已通过",
   16: "未通过",
   21: "去学习",
   22: "继续学习",

src/components/cme/cme-step.vue

@@ -74,7 +74,7 @@ export default {
       default: ""
     },
     projectId: {
-        type: String,
+        type: String | Number,
         default: "1"
     },
     inScope: {

src/views/merge-detail.vue

@@ -15,7 +15,7 @@
       borderStyle="0px solid #fff"
       :backMethod="from"
     ></CommonNavbar>
-    <div class="page-content list-container">
+    <div  class="page-content list-container">
       <!-- banner图片 -->
       <div v-if="bannerType == 1" class="page-content-img-container">
         <img class="banner-img" :src="attachmentUrl" />
@@ -32,7 +32,8 @@
         :subject="project.subject"
       />
       <!-- 步骤条 -->
-      <CmeStep
+      <div ref="cmeStepRef">
+      <CmeStep 
         :currentProgress="project.currentProgress"
         :studyProgress="project.studyProgress"
         :credit="project.credit"
@@ -43,6 +44,7 @@
         :certificateId="project.certificateId"
         @applicationCredit="applicationCredit"
       />
+      </div>
       <!-- 简介和目录 -->
       <div class="intro-catalogue-container">
         <div id="content-title" class="title" :class="{'fixed-title-1': (fixedFlag && !isWeb), 'fixed-title-2': (fixedFlag && isWeb)}">
@@ -410,8 +412,8 @@ export default {
             _this.clientType = __isWeb ? 1 : __isAndroid ? 2 : 3;
           }
           // 先设置视频URL再显示视频组件  ------------    END
-
           _this.project = res.data;
+
           if(_this.project.projectIntro) {
             _this.textContent = _this.project.projectIntro.length > 70 ? _this.project.projectIntro.slice(0, 70) + "..." : this.project.projectIntro;
           }
@@ -432,6 +434,15 @@ export default {
             _this.premissionFlag = true;
             _this.permission(); // 提示是否有机构和在申请范围内
           }
+
+          // TODO    Add by Anndy Yang
+          if(_this.project.currentProgress == 2) {
+            this.$nextTick( () => {
+              window.scrollTo(0, 0);
+              // window.scrollTo(0, this.$refs.cmeStepRef.offsetTop - 100);
+              // window.scrollTo(0, this.$refs.cmeStepRef.offsetTop - 100);
+            })
+          }
         }
         //_this.showLoading = false;
       });