From 1269c0eaf4bd4eac3520985b71ad0adcc8c71b6c Mon Sep 17 00:00:00 2001
From: yulixing <yulixing@kingsome.cn>
Date: Fri, 11 Oct 2019 17:32:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=80=89=E6=8B=A9=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PicLib/index.vue |  2 +-
 src/views/ad/edit.vue           | 58 +++++++++++++++++++--------------
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/components/PicLib/index.vue b/src/components/PicLib/index.vue
index aa98c30..b0fb23b 100644
--- a/src/components/PicLib/index.vue
+++ b/src/components/PicLib/index.vue
@@ -29,7 +29,7 @@
         </el-row>
         <el-row
             :gutter="24"
-            class="mgt-20 mgb-20"
+            class="mgt-20 mgb-20 pics-wrap"
         >
             <el-col :span="4">
                 <div class="img-box uploader-box">
diff --git a/src/views/ad/edit.vue b/src/views/ad/edit.vue
index a9c9b63..93d7ad5 100644
--- a/src/views/ad/edit.vue
+++ b/src/views/ad/edit.vue
@@ -80,42 +80,43 @@
           size="mini"
           @click="selectAllLocation"
         >选择所有位置</el-button>
+        <el-button
+          size="mini"
+          @click="deselectAllLocation"
+        >清空</el-button>
       </el-form-item>
       <el-form-item
         label="广告头像"
         prop="ad_image"
         class="uploader-box"
       >
-        <el-upload
-          class="uploader"
-          :action="uploadUrl"
-          name="image-file"
-          :on-success="uploadSuccess"
-          :on-error="uploadErr"
-          :disabled="true"
-          :show-file-list="false"
-          :before-upload="beforeUpload"
-        >
-          <img
-            v-if="adForm.ad_image"
-            :src="adForm.ad_image"
-            class="uploader-img"
+        <div @click="openModal">
+          <el-upload
+            class="uploader"
+            :action="uploadUrl"
+            name="image-file"
+            :on-success="uploadSuccess"
+            :on-error="uploadErr"
+            :disabled="true"
+            :show-file-list="false"
+            :before-upload="beforeUpload"
           >
-          <i
-            v-else
-            class="el-icon-plus uploader-icon"
-          />
-        </el-upload>
+            <img
+              v-if="adForm.ad_image"
+              :src="adForm.ad_image"
+              class="uploader-img"
+            >
+            <i
+              v-else
+              class="el-icon-plus uploader-icon"
+            />
+          </el-upload>
+        </div>
+
         <span
           class="ipt-tip"
           style="margin-top: 6px;"
         >只能上传小于 600k 的图片</span>
-        <el-button
-          type="primary"
-          size="mini"
-          @click="openModal"
-          :disabled="!writeable"
-        >选择图片</el-button>
       </el-form-item>
       <el-form-item
         label="是否跳转"
@@ -788,6 +789,9 @@ export default {
       })
       this.adForm.locationid = locs
     },
+    deselectAllLocation() {
+      this.adForm.locationid = []
+    },
     // modal
     openModal() {
       this.modalVisible = true
@@ -815,5 +819,9 @@ export default {
 .scrollbar >>> .el-scrollbar__bar.is-horizontal {
   display: none;
 }
+
+.scrollbar >>> .pics-wrap {
+  padding:  0 4px;
+}
 </style>