Merge branch 'dev-cme-1216' of...

Merge branch 'dev-cme-1216' of 192.168.110.53:com.pica.cloud.education.frontend/pica-cooperation-cme into dev-cme-1216

* 'dev-cme-1216' of 192.168.110.53:com.pica.cloud.education.frontend/pica-cooperation-cme:
  跳转添加参数

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

@@ -109,54 +109,7 @@ export default {
       hocImg: require("../../images/has-owner-cert.png"),
       activeNames: [],
       dialogState: false,
-      projectId: 1,
-      componentList: [
-        {
-          name: '教培考核-必修部分',
-          introduce: '本次培训工作以指南为依据，本次培训工作以指南为依据。  <br>必修部分共10门课程，需全部考核通过，单门课程成绩总60-79分为合格，80-100分为优秀，每门考试共可考2次，支持中途退出后继续答题。',
-          portalModuleDTOS: [
-            {
-              moduleName: '1 总论篇',
-              expandKey: '1',
-              value: '共3节',
-              disabled: false,
-            },
-            {
-              moduleName: '2 诊断篇',
-              expandKey: '2',
-              value: '共3节',
-              disabled: false,
-            },
-            {
-              moduleName: '3 老年高血压篇',
-              expandKey: '3',
-              value: '尚未开始',
-              disabled: true,
-            },
-          ],
-        },
-        {
-          name: '教培考核-选修部分',
-          introduce: '本次培训工作以指南为依据。 \n必修部分共11门课，需全部通过',
-          portalModuleDTOS: [
-            {
-              moduleName: '1 高血压慢病资格',
-              expandKey: 'abc',
-              value: '共3节',
-            },
-            {
-              moduleName: '2 诊断篇',
-              expandKey: '6',
-              value: '共3节',
-            },
-            {
-              moduleName: '3 老年高血压篇',
-              expandKey: '7',
-              value: '共3节',
-            },
-          ],
-        }
-      ],
+      projectId: 1
     };
   },
   props: {

src/components/cme/cme-step.vue

@@ -37,7 +37,7 @@
   </div>
 </template>
 <script>
-import { getWebPageUrl } from "@/utils/index";
+import { getWebPageUrl, gotoPage } from "@/utils/index";
 export default {
   props: {
     currentProgress: {
@@ -59,6 +59,10 @@ export default {
     certificateUrl: {
       type: String,
       default: ""
+    },
+    projectId: {
+        type: String,
+        default: "1"
     }
   },
   data() {
@@ -119,18 +123,7 @@ export default {
     },
     // 审核
     verifyResult() {
-      let paramList = [
-        {
-          key: "pageUrl",
-          value: getWebPageUrl(`cme/#/credit-detail?id=${this.creditId}`),
-          type: 4,
-          seqNo: 1
-        }
-      ];
-      rocNative.dispatchEventByModuleCode({
-        modeCode: "M300",
-        jsonString: paramList
-      });
+      gotoPage(this,`cme/#/credit-detail?creditId=${this.creditId}&projectId=${this.projectId}`)
     },
     // 获得学分--下载证书
     getScore() {

src/views/merge-detail.vue

@@ -35,6 +35,7 @@
         :credit="project.credit"
         :creditId="project.creditId"
         :certificateUrl="project.certificateUrl"
+        :projectId="projectId"
         @applicationCredit="applicationCredit"
       />
       <!-- 简介和目录 -->
@@ -105,7 +106,7 @@ import ItemLeader from "@/components/cme/item-leader";
 import TeacterIntro from "@/components/cme/teacter-intro";
 import CommonDialog from "@/components/cme/common-dialog";
 
-import { getWebPageUrl } from "@/utils/index";
+import { getWebPageUrl, gotoPage } from "@/utils/index";
 import { mapGetters, mapActions } from "vuex";
 import vueFilters from "@/utils/filter";
 
@@ -145,7 +146,7 @@ export default {
       from: "inner",
       isBlack: false,
       showLoading: false,
-      projectId: 1,
+      projectId: "1",
       //componentId: 1,
       //moduleId: 1,
       contentList: [],
@@ -302,23 +303,12 @@ export default {
       let param = {
         id: _this.projectId,
         creditId: _this.project.creditId || 1,
-        token: _this.userInfo.userToken || "AAA613F74B7A4746AEE8354458FF4896",
+        token: _this.userInfo.userToken || "FA4BB8D91DA442119C517C40A0536583",
         setEntry: true
       };
       _this.NEW_POST("cme/credit/applyCheck", param).then(res => {
         if (res.code == "000000") {
-          let paramList = [
-            {
-              key: "pageUrl",
-              value: getWebPageUrl(`cme/#/credit-edit?id=${_this.project.creditId}`),
-              type: 4,
-              seqNo: 1
-            }
-          ];
-          rocNative.dispatchEventByModuleCode({
-            modeCode: "M300",
-            jsonString: paramList
-          });
+          gotoPage(_this,`cme/#/credit-edit?creditId=${_this.project.creditId}`);
         } else if (res.code == "219004" || res.code == "219005") {
           // 未加入机构 219004  未身份认证 219005 不在申请范围 219012
           let params = {
@@ -336,13 +326,7 @@ export default {
     },
     // 弹框按钮事件
     handlerAction(data) {
-      if (data == 2) {
-       if (this.confirmBtnText == "去认证") {
-          rocNative.gotoAuthentication();
-        }
-      } else {
-        this.isShowDialog = false;
-      }
+      this.isShowDialog = false;
     },
     // 锚点到简介
     jumpIntro() {
@@ -369,7 +353,7 @@ export default {
     getProjectParticularsV2() {
       let _this = this;
       let param = {
-        token: _this.userInfo.userToken || "AAA613F74B7A4746AEE8354458FF4896",
+        token: _this.userInfo.userToken || "FA4BB8D91DA442119C517C40A0536583",
         setEntry: true
       };
       // _this.showLoading = true;
@@ -390,12 +374,6 @@ export default {
           _this.project = res.data;
           _this.projectLeader = res.data.projectLeader;
           _this.doctorList = res.data.doctorList;
-          if (_this.project.currentProgress == 2) {
-            // this.dialogContent =
-            //   "恭喜您已经完成该项目学习及考试，快去申请学分吧";
-            // this.confirmBtnText = "立即申请";
-            // this.isShowDialog = true;
-          }
 
           //_this.projectStatus = res.data.projectStatus;
           _this.projectComponentDTOS = _this.setListData(