ADD

src/components/loading/loading.js

@@ -19,7 +19,9 @@ const loading = {
         instance.show = true;
       },
       hide: () => {
-        instance.show = false;
+        setTimeout(() => {
+          instance.show = false;
+        }, 300);
       },
     };
   },

src/components/selectHospital/index.vue

@@ -144,11 +144,8 @@ export default {
       console.log(data);
       getHospitalList(data).then(res => {
         console.log('getHospitalList', res);
-        if (isLoad) {
-          this.list = [...this.list, ...res.data.data];
-        } else {
-          this.list = res.data.data;
-        }
+
+        this.list = res.data.data;
         if (res.data.data.length < this.pageSize) {
           this.finished = true;
         }

src/views/appoint/index.vue

@@ -13,7 +13,11 @@
         及时接受检测结果检测报告
       </div>
       <div class="choose-section">
-        <van-form @submit="onSubmit">
+        <van-form
+          ref="dectionForm"
+          validate-first
+          @submit="onSubmit"
+        >
           <van-field
             name="checkboxGroup"
             label="检测项目"
@@ -291,7 +295,7 @@ export default {
 
   },
   mounted() {
-
+    this.$loading.show();
     const { yunOrderNo, projectEquityNo } = this.$route.query;
     this.yunOrderNo = yunOrderNo;
     this.projectEquityNo = projectEquityNo;
@@ -344,6 +348,8 @@ export default {
           this.dectionForm.detectName = dectionData.detectionName;
           this.dectionForm.goodsId = dectionData.goodsId;
           this.$store.dispatch('home/setInsuranceInfo', dectionData);
+          this.$loading.hide();
+
         }
       });
     },
@@ -356,6 +362,7 @@ export default {
         this.dectionForm.beneficiaryIdNum = res.data.beneficiaryIdNum;
         this.isDisabled = (this.dectionForm.beneficiaryName != '' && this.dectionForm.beneficiaryPhone != '' && this.dectionForm.beneficiaryIdNum != '') && (this.dectionForm.beneficiaryName && this.dectionForm.beneficiaryPhone && this.dectionForm.beneficiaryIdNum );
         this.$store.dispatch('home/setOrderInfo', res.data);
+        this.$loading.hide();
 
       });
     },
@@ -392,30 +399,37 @@ export default {
     cancelSearch() {},
     selectAddress() {},
     appointment() {
-      console.log(this.dectionForm);
-      const data = {
-        appointmentTime: this.dectionForm.appointmentTime,
-        goodsId: this.dectionForm.goodsId,
-        hospitalId: this.hospitalId,
-        hospitalName: this.dectionForm.hospitalName,
-        patientIdNo: this.dectionForm.beneficiaryIdNum,
-        patientMobile: this.dectionForm.beneficiaryPhone,
-        patientName: this.dectionForm.beneficiaryName,
-        yunOrderNo:this.yunOrderNo,
-      };
-      appointment(data).then(res => {
-        if (res.code === '000000') {
-            this.$router.push({
-              path: '/appoint-details',
-              query: {
-                yunOrderNo: this.yunOrderNo,
-                projectEquityNo:this.projectEquityNo
-              }
-            });
-          }
+      this.$loading.show();
+      this.$refs.dectionForm.validate().then(result => {
+        console.log('this.dectionForm', result);
+        const data = {
+          appointmentTime: this.dectionForm.appointmentTime,
+          goodsId: this.dectionForm.goodsId,
+          hospitalId: this.hospitalId,
+          hospitalName: this.dectionForm.hospitalName,
+          patientIdNo: this.dectionForm.beneficiaryIdNum,
+          patientMobile: this.dectionForm.beneficiaryPhone,
+          patientName: this.dectionForm.beneficiaryName,
+          yunOrderNo:this.yunOrderNo,
+        };
+        appointment(data).then(res => {
+          this.$loading.hide();
+          if (res.code === '000000') {
+              this.$router.push({
+                path: '/appoint-details',
+                query: {
+                  yunOrderNo: this.yunOrderNo,
+                  projectEquityNo:this.projectEquityNo
+                }
+              });
+            }
+        });
+
+      }).catch(err => {
+        this.$loading.hide();
+        console.log(err);
       });
     },
-
     getDetailByUnionId() { },
     confirm(values) {
       console.log('confirm', values);