Merge branch 'feature/zjx' into 'develop'

add

See merge request !114

src/components/loading/loading.vue

 <template>
   <van-popup
+    v-if="show"
     v-model="show"
     :close-on-click-overlay="false"
     style="background-color: transparent"

src/components/selectTime/index.vue

@@ -118,11 +118,11 @@ export default {
     },
     selectItem() {
       if (this.selectTimes === '') {
-        this.$toast('请选择日期');
+        // this.$toast('请选择日期');
         return;
       }
       if (this.selectTimeBucket === '') {
-        this.$toast('请选择时间段');
+        // this.$toast('请选择时间段');
         return;
       }
       this.$emit('change', this.selectTimes + ' ' + this.selectTimeBucket);

src/plugins/httpExtension.js

@@ -24,7 +24,8 @@ $http.addBeforeHook(config => console.log('我是新增的前置钩子', config)
 $http.addAfterHook(response => {
   vueApp.$loading.hide();
   if (response.data.code !== '000000') {
-    vueApp.$toast(response.data.message);
+    console.log('我是新增的后置钩子111', response);
+    vueApp.$toast(response.data.message );
   }
   console.log('我是新增的后置钩子', response);
 }, 0);

src/views/appoint/index.vue

@@ -490,14 +490,16 @@ export default {
         };
         appointment(data).then(res => {
           if (res.code === '000000') {
-              this.$router.push({
-                path: '/appoint-details',
-                query: {
-                  yunOrderNo: this.yunOrderNo,
-                  projectEquityNo:this.projectEquityNo
-                }
-              });
-            }
+            this.$router.push({
+              path: '/appoint-details',
+              query: {
+                yunOrderNo: this.yunOrderNo,
+                projectEquityNo:this.projectEquityNo
+              }
+            });
+          } else {
+            res.message && this.$toast(res.message);
+          }
         });
 
       }).catch(err => {
@@ -508,12 +510,14 @@ export default {
     getButtonStatus(yunOrderNo) {
       getButtonStatus(yunOrderNo).then(res => {
         console.log(res);
+        this.$loading.hide();
         this.buttonStatus = res.data.buttonStatus;
         this.buttonText = res.data.statusDesc;
-        if (!this.buttonStatus) {
-          this.$toast(this.buttonText);
-        }
-        this.$loading.hide();
+        !this.buttonStatus && this.$dialog.alert({
+          message: this.buttonText,
+          confirmButtonColor:'#00bda5'
+        });
+
       });
     },
     getDetailByUnionId() { },