Merge branch 'feature/zjx' into 'develop'

Feature/zjx

See merge request !94

src/views/appoint/index.vue

@@ -318,6 +318,10 @@ export default {
         if (res.code == '000000') {
           this.stock = res.data.stock;
           this.isDisabled = !this.stock;
+          // 提示活动结束
+          if (!this.stock) {
+            this.$toast('活动已经结束');
+          }
         }
         this.$loading.hide();
         console.log('getJumpPageStatus', res);