Merge branch 'feature/zjx' into 'develop'

Feature/zjx

See merge request !100

src/components/selectTime/index.vue

@@ -92,6 +92,14 @@ export default {
         }
       },
       immediate:true
+    },
+    show: {
+      handler(nv) {
+        if (nv) {
+          this.getScheduling();
+        }
+      },
+      immediate:true
     }
   },
   mounted() {

src/views/appoint/index.vue

@@ -172,7 +172,6 @@
         @click="appointment"
       >
         提交
-        {{ buttonStatus ? '提交' : buttonText }}
       </van-button>
     </div>
     <SelectHospital
@@ -505,6 +504,9 @@ export default {
         console.log(res);
         this.buttonStatus = res.data.buttonStatus;
         this.buttonText = res.data.statusDesc;
+        if (!this.buttonStatus) {
+          this.$toast('this.buttonText');
+        }
         this.$loading.hide();
       });
     },

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     port: 8083,
     proxy: {
       '/proxy': {
-        target: 'https://dev-sc.yunqueyi.com/',
+        target: 'https://test1-sc.yunqueyi.com/',
         // target: 'https://test1-sc.yunqueyi.com/',
         // target: 'https://uat-sc.yunqueyi.com/',
         // http://10.241.65.90:3000/mock/1071/cs/route/removeUser