Ver Fonte

bugfix 去除疫情提示

谢杰标 há 2 anos atrás
pai
commit
fd0b560599

+ 21 - 25
pages/learn/index.vue

@@ -649,31 +649,27 @@ export default {
       }) => {
         let text = "";
         let color = "";
-        switch (periodStatus) {
-          case -1:
-            const stuAll = stuAllNum + recordNum;
-            const secAll = secAllNum + examNum;
-            let index = 0;
-            if (stuAll == 0) {
-              index == 0;
-            } else if (stuAll > 0 && stuAll < secAll) {
-              index == 1;
-            } else if (stuAll >= secAll) {
-              index == 2;
-            }
-            text = ["未开始", "学习中", "已学完"][index];
-            color = ["#EB5757", "#498AFE", "#498AFE"][index];
-            break;
-          case 0:
-          case 2:
-          case 3:
-            text = ["审核不通过", "", "待审核", "初审完成"][periodStatus];
-            color = ["#EB5757", "", "#F67205", "#F67205"][periodStatus];
-          case 1:
-            text = periodPlush > 0 ? "学时已上报信息中心" : "学时审核通过";
-            color = "#F67205";
-          default:
-            break;
+        if (periodStatus === -1) {
+          const stuAll = stuAllNum + recordNum;
+          const secAll = secAllNum + examNum;
+          let index = 0;
+          if (stuAll == 0) {
+            index == 0;
+          } else if (stuAll > 0 && stuAll < secAll) {
+            index == 1;
+          } else if (stuAll >= secAll) {
+            index == 2;
+          }
+          text = ["未开始", "学习中", "已学完"][index];
+          color = ["#EB5757", "#498AFE", "#498AFE"][index];
+        } else {
+          text = [
+            "审核不通过",
+            periodPlush > 0 ? "学时已上报信息中心" : "学时审核通过",
+            "待审核",
+            "初审完成",
+          ][periodStatus];
+          color = ["#EB5757", "#F67205", "#F67205", "#F67205"][periodStatus];
         }
         return `<span style='color: ${color}'>${text}</span>`;
       };

+ 1 - 2
pages2/appointment/index.vue

@@ -154,8 +154,7 @@ export default {
           res.data.data.applyStatus = res.data.data.applyStatus.split(",");
         }
         this.listData = res.data.data;
-        this.reportStatus = res.data.data.reportStatus
-        console.log('reportStatus', this.reportStatus)
+        // this.reportStatus = res.data.data.reportStatus
       });
     },
     next() {

+ 2 - 2
pages2/exam/exam_appointment.vue

@@ -54,12 +54,12 @@
 							</view>
 						</view>
 						<!-- applyReportStatus是否显示签署承诺书 1是,0否 v-if="item.applyReportStatus == 0"-->
-						<view v-if="item.applyReportStatus == 1" class="item" @click="toSign(item)">
+						<!-- <view v-if="item.applyReportStatus == 1" class="item" @click="toSign(item)">
 							<view class="left">疫情防控承诺书</view>
 							<view class="right unSign" >
 								{{ item.reportStatus == 1 ? '已签署' : item.reportStatus == 0 ? '未签署' : '' }}
 							</view>
-						</view>
+						</view> -->
 					</view>
 				</view>
 			</view>

+ 5 - 2
pages3/polyv/detail.vue

@@ -3232,10 +3232,13 @@ export default {
         //第二个弹窗
         uni.showModal({
           title: "温馨提示",
-          content: "当前最后一节视频已学完 请检查所有章节是否学习完成?",
-          showCancel: false,
+          content: "恭喜您课程学习全部完成,教务会在1-3个工作日内完成学习初审,请耐心等待。",
+          showCancel: !this.erJianErZao,
           success: (res) => {
             if (res.confirm) {
+              uni.switchTab({
+                url: "/pages/learn/index",
+              });
             }
           },
         });