详情页进度调试

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

@@ -539,7 +539,7 @@ export default {
         // font-family: "PingFangSC-Medium", "PingFangSC", "Microsoft Yahei";
         width: px2rem(231px);
         font-size: px2rem(15px);
-        font-weight: 500;
+        font-weight: 700;
         line-height: px2rem(22px);
         color: #333333;
         float: left;

src/components/cme/cme-step.vue

@@ -18,7 +18,7 @@
             <p :class="{'actived': step3 || step4}">学分审核</p>
         </div>
         <div class="step-line step-three-line" :class="{'actived': step4}"></div>
-        <p class="step-text step4-text" v-if="step4" @click="getScore">获得{{credit}}学分></p>
+        <p class="step-text step4-text" v-if="step4" @click="getScore">获得{{credit}}></p>
         <div class="step-item">
             <span :class="{'actived': step4}">4</span>
             <p :class="{'actived': step4}">申请成功</p>
@@ -39,15 +39,19 @@ export default {
         credit: {
             type: String,
             default: ""
+        },
+        creditId: {
+            type: Number,
+            default: 0
         }
     },
     data() {
         return {
             step1: false,
-            step2: true,
-            step3: false,
+            step2: false,
+            step3: true,
             step4: false,
-            progressText: ""
+            progressText: "审核中"
         }
     },
     watch: {
@@ -93,14 +97,71 @@ export default {
         // 审核
         verifyResult() {
             if(this.currentProgress == 3) { // 审核中
-                this.$router.push({path: '/credit-detail',query: {flag: false}})
+            // let paramList = [
+            //         {
+            //             "key":"pageUrl",
+            //             "value": url,
+            //             "type":4,
+            //             "seqNo":1
+            //         },{
+            //             "key":"showTitle",
+            //             "value": false,
+            //             "type":1,
+            //             "seqNo":2
+            //         },{
+            //             "key":"title",
+            //             "value": '',
+            //             "type":1,
+            //             "seqNo":3
+            //         }
+            //     ];
+            //     this.$rocNative.dispatchEventByModuleCode({
+            //         modeCode: 'M300',
+            //         jsonString: paramList
+            //     });
+                this.$router.push({path: '/credit-detail',query: {flag: false, id: this.creditId}});
             }else if(this.currentProgress == 4) { // 审核失败
-                this.$router.push({path: '/credit-detail',query: {flag: true}})
+                this.$router.push({path: '/credit-detail',query: {flag: true, id: this.creditId}});
             }
         },
-        // 获得学分
+        // 获得学分--下载证书
         getScore() {
-            
+            let paramList = [
+                {
+                    key: "className",
+                    value: "com.picahealth.yunque.activitys.honor.CheckCertificatesActivity###YQWebView",
+                    type: 4,
+                    seqNo: 1
+                },
+                {
+                    key: "url",
+                    value: this.certificateUrl,
+                    type: 4,
+                    seqNo: 2
+                },
+                {
+                    key: "navTitle",
+                    value: "学分详情",
+                    type: 4,
+                    seqNo: 4
+                },
+                {
+                    key: "isNotTab",
+                    value: true,
+                    type: 4,
+                    seqNo: 5
+                },
+                {
+                    key: "isShowDownload",
+                    value: true,
+                    type: 4,
+                    seqNo: 6
+                }
+            ];
+            rocNative.dispatchEventByModuleCode({
+                modeCode: "M200",
+                jsonString: paramList
+            });
         }
     }
 }

src/components/common/common-navbar.vue

@@ -108,7 +108,8 @@ export default {
       // } else {
       //   rocNative.goBack();
       // }
-      rocNative.goBack();
+      this.$router.back(-1);
+      //rocNative.goBack();
     },
     //分享
     goShare() {

src/style/global.scss

@@ -85,7 +85,7 @@
 }
 
 .van-cell {
-    padding: px2rem(20px) 0 !important;
+    padding: px2rem(17px) px2rem(15px) !important;
     font-size: px2rem(15px) !important;
     color: #373839 !important;
 }
@@ -107,3 +107,6 @@
     height: px2rem(15px) !important;
     line-height: px2rem(15px) !important;
 }
+.van-cell__title span {
+    font-weight: 700 !important;
+}
\ No newline at end of file

src/views/merge-detail.vue

@@ -32,6 +32,7 @@
       :currentProgress="project.currentProgress" 
       :studyProgress="project.studyProgress"
       :credit="project.credit"
+      :creditId="project.creditId"
       @applicationCredit="applicationCredit"/>
       <!-- 简介和目录 -->
       <div class="intro-catalogue-container">
@@ -72,6 +73,7 @@
     <CommonDialog 
     :isShowDialog="isShowDialog" 
     :isSingle="isSingle"
+    :cancleBtnText="cancleBtnText"
     :confirmBtnText="confirmBtnText" 
     :content="dialogContent"
     @handlerAction="handlerAction"/>
@@ -108,6 +110,7 @@ export default {
       isSingle: false,
       dialogContent: "", // 弹框内容
       confirmBtnText: "", // 弹框按钮
+      cancleBtnText: "",
       isShowDialog: false,
       tabFlag: true, // 显示目录还是简介
       fixedFlag: false, // 目录和简介是否固定
@@ -195,7 +198,6 @@ export default {
       _this.setUserInfo(param);
       _this.checkToken();
       _this.getProjectParticularsV2();
-      _this.permission();
     };
     _this.getUserInfo();
     if (__isWeb && process.env.BUILD_ENV == "development") {
@@ -207,6 +209,7 @@ export default {
       //  _this.getProjectParticularsV2();
        _this.getUserInfo();
     };
+     _this.permission(); // 提示是否有机构和在申请范围内
   },
   mounted() {
     window.addEventListener("scroll", this.scrollFun);
@@ -255,22 +258,42 @@ export default {
         setEntry: true
       };
       _this.NEW_POST("cme/credit/applyCheck", param).then(res => {
-        if (res.code == "000000") {
-          if(res.data == "219004" || res.data == "219012") { // 未加入机构 219004  未身份认证 219005 不在申请范围 219012
+        if(res.code == "219004" || res.code == "219012") { // 未加入机构 219004  未身份认证 219005 不在申请范围 219012
           this.dialogContent = `该项目仅对${_this.project.scope}的用户开放`;
-            this.confirmBtnText = "我知道了";
+          this.cancleBtnText = "我知道了";
           this.isShowDialog = true;
           this.isSingle = true;
         }else {
           this.isShowDialog = false;
-            //this.$router.push('/credit-edit');
-          }
         }
       });
     },
     // 立即申请学分
     applicationCredit() {
+      let _this = this;
+      let param = {
+        id: _this.projectId,
+        creditId: _this.project.creditId || 1,
+        token: _this.userInfo.userToken || 'AAA613F74B7A4746AEE8354458FF4896',
+        setEntry: true
+      };
+      _this.NEW_POST("cme/credit/applyCheck", param).then(res => {
+        if(res.code == "000000") {
+          this.$router.push({path:'/credit-edit',query: {}});
+        }else if(res.code == "219004" || res.code == "219005") { // 未加入机构 219004  未身份认证 219005 不在申请范围 219012
+          let params = {
+            __funcName: "__checkPermissions",
+            permCode: '009014'
+          };
+          rocNative.checkPermissions(params);
+        }else if(res.code == "219012") {
           
+          this.dialogContent = `您的所属机构不在可申请范围（${_this.project.scope}）内`;
+          this.cancleBtnText = "我知道了";
+          this.isShowDialog = true;
+          this.isSingle = true;
+        }
+      });
     },
     // 弹框按钮事件
     handlerAction(data) {