env conflict

.env.production

@@ -3,3 +3,4 @@ ENV = 'production'
 # 接口地址
 VUE_APP_BASE_API  = 'https://app2.yixiang.co'
 VUE_APP_WS_API = 'ws:///127.0.0.1:8001'
+

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>
@@ -54,7 +57,8 @@ export default {
         pic: '',
         imageArr: [],
         sort: 0,
-        status: 1
+        status: 1,
+        color: ''
       },
       rules: {
       }
@@ -120,7 +124,8 @@ export default {
         pic: '',
         imageArr: [],
         sort: 0,
-        status: 1
+        status: 1,
+        color: null
       }
     }
   }

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.map.color
       }
       _this.dialog = true
     }