From b8300debbd3510c8e4132f799443078c4f0d03fd Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Mon, 28 Sep 2020 10:37:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AE=E6=92=AD=E5=9B=BE?=
 =?UTF-8?q?=E8=83=8C=E6=99=AF=E8=89=B2=E5=8F=96=E8=89=B2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/shop/set/form.vue  | 3 ++-
 src/views/shop/set/index.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/shop/set/form.vue b/src/views/shop/set/form.vue
index 6d55ab0..05864fd 100644
--- a/src/views/shop/set/form.vue
+++ b/src/views/shop/set/form.vue
@@ -57,7 +57,8 @@ export default {
         pic: '',
         imageArr: [],
         sort: 0,
-        status: 1
+        status: 1,
+        color: ''
       },
       rules: {
       }
diff --git a/src/views/shop/set/index.vue b/src/views/shop/set/index.vue
index b877154..665bacb 100644
--- a/src/views/shop/set/index.vue
+++ b/src/views/shop/set/index.vue
@@ -130,7 +130,7 @@ export default {
         imageArr: data.map.pic ? data.map.pic.split(',') : [],
         sort: data.sort,
         status: data.status,
-        color: data.color
+        color: data.map.color
       }
       _this.dialog = true
     }