Merge branch 'main' of http://42.192.7.176:3000/suojin/hospital_health_check into main

src/views/examProject.vue

@@ -24,7 +24,7 @@
             </div>
         </div>
         <div class="act_box">
-            <div class="act_btn" @click="confirm">确认</div>
+            <div class="act_btn" @click="confirmProject">确认</div>
         </div>
         <van-overlay :show="isShow">
             <div class="wrapper" @click.stop v-show="isSuccess">
@@ -41,7 +41,7 @@
                 </div>
                 <div class="btn" @click="clickSucc">知道了</div>
             </div>
-            <div class="wrapper" @click.stop v-show="!isSuccess">
+            <div class="wrapper" @click.stop v-show="isFail">
                 <div class="img_box">
                     <img src="~@/assets/image/fail.png" alt="">
                 </div>
@@ -51,7 +51,12 @@
                 </div>
                 <div class="btn" @click="clickFail">知道了</div>
             </div>
+            <div v-show="isShowCon" @click.stop class="wrapper">
+                <div class="tips">请确认您了解以下情况</div>
+                <div class="btn" @click="confirm">已了解</div>
+            </div>
             <div class="close_box" @click="clickClose"><img src="~@/assets/image/close.png" alt=""></div>
+            
         </van-overlay>
     </div>
 </template>
@@ -65,6 +70,8 @@ export default {
             proArr: [],
             isShow: false,
             isSuccess: false,
+            isShowCon:false,
+            isFail:false,
             userInfo: {},
             failTips: '',
             blacklistOutDate:'',
@@ -116,9 +123,16 @@ export default {
             // });
         },
 
+        confirmProject(){
+            console.log('ces')
+            this.isShow = true
+            this.isShowCon = true
+        },
+
         confirm() {
             let param = this.proArr;
             console.log(param)
+            this.isShowCon = false
             this.$toast.loading({
                 message: '请求中',
                 duration: 0,
@@ -133,13 +147,15 @@ export default {
                         console.log('value2', retData);
                         if (retData.code == 200) {
                             this.isShow = true;
-                            this.isSuccess = true
+                            this.isSuccess = true;
+                            this.isFail = false
                             this.blacklistOutDate = retData.data.blacklistOutDate;
                             this.timesToBlacklist = retData.data.timesToBlacklist;
                         } else {
                             this.failTips = retData.msg;
                             this.isShow = true;
-                            this.isSuccess = false
+                            this.isSuccess = false;
+                            this.isFail = true
                         }
                     }, err => {
                         this.$toast.clear();
@@ -152,12 +168,14 @@ export default {
                         if (res.code == 200) {
                             this.isShow = true;
                             this.isSuccess = true;
+                            this.isFail = false;
                             this.blacklistOutDate = res.data.blacklistOutDate;
                             this.timesToBlacklist = res.data.timesToBlacklist;
                         } else {
                             this.failTips = res.msg
                             this.isShow = true;
                             this.isSuccess = false
+                            this.isFail = true
                         }
                     }, err => {
                         this.$toast.clear();