From 640ea8039059134d8f425dd4f2dc48453bd94677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com>
Date: Sat, 23 May 2020 18:57:20 +0800
Subject: [PATCH] 1

---
 src/pages/activity/addActivity.vue | 11 ++++++++++-
 src/pages/activity/useTable.vue    |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/pages/activity/addActivity.vue b/src/pages/activity/addActivity.vue
index 5fb14f2..991c552 100644
--- a/src/pages/activity/addActivity.vue
+++ b/src/pages/activity/addActivity.vue
@@ -2,6 +2,7 @@
   <Modal
     v-model="dispalyModal"
     width="1000"
+    :loading="loading"
     :mask-closable="false"
     @on-cancel="cancel"
     @on-ok="save"
@@ -127,6 +128,7 @@ export default {
       modal_loading: false,
       imageName: "212",
       formValidate: {},
+      loading: true,
       ruleValidate: {
         name: [
           { required: true, message: "活动名称不能为空", trigger: "blur" },
@@ -148,6 +150,7 @@ export default {
   },
   watch: {
     addActivityModal(val) {
+      console.log(111, val);
       this.dispalyModal = val;
       if (val === true && this.id) {
         this.getActivityData();
@@ -225,7 +228,9 @@ export default {
         },
       }).then(function(res) {
         if (res.data.success) {
-          me.formValidate.logo = res.data.results;
+          // me.formValidate.logo = res.data.results;
+          me.$set(me.formValidate, "logo", res.data.results);
+          console.log(me.formValidate.logo);
         }
       });
       return false;
@@ -234,6 +239,7 @@ export default {
       let that = this;
       if (that.formValidate.params.length <= 0) {
         that.$Message.error("至少需要填写一个活动类型!");
+        that.loading = false;
         return false;
       }
       if (
@@ -242,8 +248,10 @@ export default {
         that.formValidate.logo.length <= 0
       ) {
         that.$Message.error("请上传活动封面!");
+        that.loading = false;
         return false;
       }
+      this.loading = true;
       this.$refs["formValidate"].validate((valid) => {
         if (valid) {
           // param = JSON.stringify(param)
@@ -256,6 +264,7 @@ export default {
         } else {
           that.$Message.error("表单验证失败!");
         }
+        that.loading = false;
       });
     },
   },
diff --git a/src/pages/activity/useTable.vue b/src/pages/activity/useTable.vue
index f912f5c..f2f2e9b 100644
--- a/src/pages/activity/useTable.vue
+++ b/src/pages/activity/useTable.vue
@@ -5,7 +5,7 @@
       v-model="showUse"
       title="使用活动"
       @on-cancel="cancel"
-      :loading="modal_loading"
+      :loading="true"
       width="70%"
     >
       <Steps style="padding: 40px;" :current="currentStep">