进度组件添加范围判断

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

@@ -25,7 +25,7 @@
         <!-- <span v-else
           class="coop-item-right-other"
         >起止日期 {{item.projectBegintimeLong | formatTime}}-{{item.projectEndtimeLong | formatTime}}</span>-->
-        <span class="coop-item-right-other">{{item.startDate}}至{{item.endTime}}</span>
+        <span class="coop-item-right-other">{{item.startDate | formatTime('{y}.{m}.{d}')}}至{{item.endDate | formatTime('{y}.{m}.{d}')}}</span>
       </div>
     </div>
     <NoMoreContent v-show="paramData.length > 9"></NoMoreContent>
@@ -127,7 +127,7 @@ export default {
         let paramList = [
           {
             key: "pageUrl",
-            value: getWebPageUrl(`cme/#/coop?id=${item.id}`),
+            value: getWebPageUrl(`cme/#/coop?id=${item.id}&courseRequire=${item.courseRequire}`),
             type: 4,
             seqNo: 1
           }

src/components/cme/basic-info.vue

@@ -18,7 +18,7 @@
         </div>
         <div class="content">
             <span>起止时间</span>
-            <span>{{startDate}}至{{endDate}}</span>
+            <span>{{startDate | formatTime('{y}.{m}.{d}')}}至{{endDate | formatTime('{y}.{m}.{d}')}}</span>
         </div>
         <div class="content">
             <span>发起机构</span>

src/components/cme/cme-step.vue

@@ -6,19 +6,28 @@
       <p :class="{'actived': step1 || step2 || step3 || step4}">项目学习</p>
     </div>
     <div class="step-line step-one-line" :class="{'actived': step2 || step3 || step4}"></div>
-    <p class="step-text step2-text" v-if="step2" @click="applyFor">立即申请<img src="../../images/cme/step-right-arrow.png"></p>
+    <p class="step-text step2-text" v-if="step2" @click="applyFor">
+      立即申请
+      <img src="../../images/cme/step-right-arrow.png"/>
+    </p>
     <div class="step-item">
       <span :class="{'actived': step2 || step3 || step4}">2</span>
       <p :class="{'actived': step2 || step3 || step4}">申请学分</p>
     </div>
     <div class="step-line step-two-line" :class="{'actived': step3 || step4}"></div>
-    <p class="step-text step3-text" v-if="step3" @click="verifyResult">{{progressText}}<img src="../../images/cme/step-right-arrow.png"></p>
+    <p class="step-text step3-text" v-if="step3" @click="verifyResult">
+      {{progressText}}
+      <img src="../../images/cme/step-right-arrow.png"/>
+    </p>
     <div class="step-item">
       <span :class="{'actived': step3 || step4}">3</span>
       <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}}<img src="../../images/cme/step-right-arrow.png"></p>
+    <p class="step-text step4-text" v-if="step4" @click="getScore">
+      获得{{credit}}
+      <img src="../../images/cme/step-right-arrow.png"/>
+    </p>
     <div class="step-item">
       <span :class="{'actived': step4}">4</span>
       <p :class="{'actived': step4}">申请成功</p>
@@ -63,6 +72,10 @@ export default {
     projectId: {
         type: String,
         default: "1"
+    },
+    inScope: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -72,42 +85,44 @@ export default {
       step3: false,
       step4: false,
       progressText: "",
-      showTip: false
+      showTip: false,
+      btnDisabled: true
     };
   },
   watch: {
     // currentProgress(n,o) {
+    //     let _this = this;
     //     if(n == 1) { // 项目学习
-    //         this.step1 = true;
-    //         this.step2 = false;
-    //         this.step3 = false;
-    //         this.step4 = false;
+    //         _this.step1 = true;
+    //         _this.step2 = false;
+    //         _this.step3 = false;
+    //         _this.step4 = false;
     //     }else if(n == 2) { // 申请学分
-    //         this.step1 = false;
-    //         this.step2 = true;
-    //         this.step3 = false;
-    //         this.step4 = false;
-    //         this.showTip = true;
+    //         _this.step1 = false;
+    //         _this.step2 = true;
+    //         _this.step3 = false;
+    //         _this.step4 = false;
+    //         _this.showTip = true;
     //         setInterval(() => {
-    //             this.showTip = false;
+    //             _this.showTip = false;
     //         },5000)
     //     }else if(n == 3) { // 学分审核
-    //         this.step1 = false;
-    //         this.step2 = false;
-    //         this.step3 = true;
-    //         this.step4 = false;
-    //         this.progressText = "审核中";
+    //         _this.step1 = false;
+    //         _this.step2 = false;
+    //         _this.step3 = true;
+    //         _this.step4 = false;
+    //         _this.progressText = "审核中";
     //     }else if(n == 4) { // 审核失败
-    //         this.step1 = false;
-    //         this.step2 = false;
-    //         this.step3 = true;
-    //         this.step4 = false;
-    //         this.progressText = "审核失败";
+    //         _this.step1 = false;
+    //         _this.step2 = false;
+    //         _this.step3 = true;
+    //         _this.step4 = false;
+    //         _this.progressText = "审核失败";
     //     }else if(n == 5) { // 申请成功
-    //         this.step1 = false;
-    //         this.step2 = false;
-    //         this.step3 = false;
-    //         this.step4 = true;
+    //         _this.step1 = false;
+    //         _this.step2 = false;
+    //         _this.step3 = false;
+    //         _this.step4 = true;
     //     }
     // }
   },
@@ -115,10 +130,14 @@ export default {
   methods: {
     // 立即申请
     applyFor() {
-      this.$sendBuriedData({
-        component_tag: `211#211001#${this.projectId}`
-      });
-      this.$emit("applicationCredit");
+      if(this.inScope) {
+        this.$sendBuriedData({
+          component_tag: `211#211001#${this.projectId}`
+        });
+        this.$emit("applicationCredit");
+      }else {
+        this.$toast({message: '您不在可申请范围内', duration: 3000 });
+      }
     },
     // 关闭提示
     closeTip() {
@@ -126,6 +145,7 @@ export default {
     },
     // 审核
     verifyResult() {
+      if(this.inScope) {
         if(this.currentProgress == 3) {
             this.$sendBuriedData({
                 component_tag: `211#211003#${this.projectId}`
@@ -135,50 +155,57 @@ export default {
                 component_tag: `211#211005#${this.projectId}`
             });
         }
-        gotoPage(this,`cme/#/credit-detail?creditId=${this.creditId}&projectId=${this.projectId}`)
+        gotoPage(this,`cme/#/credit-detail?creditId=${this.creditId}&projectId=${this.projectId}`);
+      }else {
+        this.$toast({message: '您不在可申请范围内', duration: 3000 });
+      }
     },
     // 获得学分--下载证书
     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
-      });
-      this.$sendBuriedData({
-        component_tag: `211#211004#${this.projectId}`
-      });
+      if(this.inScope) {
+        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
+        });
+        this.$sendBuriedData({
+          component_tag: `211#211004#${this.projectId}`
+        });
+      }else {
+        this.$toast({message: '您不在可申请范围内', duration: 3000 });
+      }
     }
   }
 };

src/views/merge-detail.vue

@@ -38,6 +38,7 @@
         :credit="project.credit"
         :creditId="project.creditId"
         :certificateUrl="project.certificateUrl"
+        :inScope="project.inScope"
         :projectId="projectId"
         @applicationCredit="applicationCredit"
       />
@@ -150,7 +151,8 @@ export default {
         studyProgress: "0%", // 学习进度
         subject: "", // 学科
         status: 0, // 项目状态 1是参加中 5是进行中 10是已结束
-        certificateUrl: "" // 证书url
+        certificateUrl: "", // 证书url
+        inScope: 0 // 是否在范围内判断
       },
       projectLeader: {},
       doctorList: [],