From fccbed6f496ae1364a2684fe6c82410aee227fe8 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Mon, 21 Sep 2020 20:05:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=AE=E6=92=AD?=
 =?UTF-8?q?=E5=9B=BE=E8=83=8C=E6=99=AF=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/shop/set/form.vue b/src/views/shop/set/form.vue
index 93f6902..6d55ab0 100644
--- a/src/views/shop/set/form.vue
+++ b/src/views/shop/set/form.vue
@@ -13,6 +13,9 @@
       <el-form-item label="图片(750*375)">
         <MaterialList v-model="form.imageArr" style="width: 300px" type="image" :num="1" :width="150" :height="150" />
       </el-form-item>
+      <el-form-item label="轮播背景色">
+        <el-color-picker v-model="form.color"></el-color-picker>
+      </el-form-item>
       <el-form-item label="排序">
         <el-input v-model="form.sort" style="width: 300px;" />
       </el-form-item>
@@ -120,7 +123,8 @@ export default {
         pic: '',
         imageArr: [],
         sort: 0,
-        status: 1
+        status: 1,
+        color: null
       }
     }
   }
diff --git a/src/views/shop/set/index.vue b/src/views/shop/set/index.vue
index 2964fc3..b877154 100644
--- a/src/views/shop/set/index.vue
+++ b/src/views/shop/set/index.vue
@@ -27,6 +27,7 @@
           <a :href="scope.row.map.pic" style="color: #42b983" target="_blank"><img :src="scope.row.map.pic" alt="点击打开" class="el-avatar"></a>
         </template>
       </el-table-column>
+      <el-table-column prop="map.color" label="轮播背景色" />
       <el-table-column prop="sort" label="排序" />
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
@@ -128,7 +129,8 @@ export default {
         pic: data.map.pic,
         imageArr: data.map.pic ? data.map.pic.split(',') : [],
         sort: data.sort,
-        status: data.status
+        status: data.status,
+        color: data.color
       }
       _this.dialog = true
     }

From fab4cd27e049cd00e127d149e89c8cc3cbdb482e Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Wed, 23 Sep 2020 10:54:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.env.production?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.production b/.env.production
index 1848ec3..e1465ff 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 ENV = 'production'
 
 # 接口地址
-VUE_APP_BASE_API  = 'http://127.0.0.1:8001'
-VUE_APP_WS_API = 'ws:///127.0.0.1:8001'
+VUE_APP_BASE_API  = 'https://consoleapi.xinxintuan.co'
+VUE_APP_WS_API = 'ws://consoleapi.xinxintuan.co'

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 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AE=E6=92=AD?=
 =?UTF-8?q?=E5=9B=BE=E8=83=8C=E6=99=AF=E8=89=B2=E5=8F=96=E8=89=B2=E9=97=AE?=
 =?UTF-8?q?=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
     }