Merge branch 'moss_bug'

* moss_bug:
  no message

src/views/mallManagement/goods/goods_add/index.vue

@@ -92,14 +92,13 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="商品主图：" prop="imgUrl">
-              <el-upload class="avatar-uploader imageListUpload" style="height: 0;" :action="baseURL + 'common/upload'" :headers="myHeaders"
+              <el-upload class="avatar-uploader goodsImageUpload" style="height: 0;" :action="baseURL + 'common/upload'" :headers="myHeaders"
                 :show-file-list="false" :on-success="uploadSuccess" :before-upload="beforeUpload">
               </el-upload>
               <div class="images">
-                <div class="item">
+                <div class="item" style="margin: 0;" v-if="step1Form.imgUrl">
                   <div class="img">
-                    <el-image v-if="step1Form.imgUrl" ref="goodsImg" :src="step1Form.imgUrl" style="width: 120px; height: 120px" fit="cover" :preview-src-list="[step1Form.imgUrl]"></el-image>
-                    <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                    <el-image ref="goodsImg" :src="step1Form.imgUrl" style="width: 120px; height: 120px" fit="cover" :preview-src-list="[step1Form.imgUrl]"></el-image>
                     <div class="mask" v-if="step1Form.imgUrl">
                       <div class="row">
                         <div class="it" @click="previewGoodsImage()"><i class="el-icon-search"></i></div>
@@ -108,6 +107,11 @@
                     </div>
                   </div>
                 </div>
+                <div class="item" style="margin: 0;" v-else>
+                  <div class="add" @click="uploadGoodsImage()">
+                    <i class="el-icon-plus avatar-uploader-icon"></i>
+                  </div>
+                </div>
               </div>
               <div class="tips">
                 <span>建议尺寸：800*800</span>
@@ -1000,7 +1004,7 @@ export default {
     },
 
     uploadGoodsImage() {
-      document.querySelector('.imageListUpload input').click();
+      document.querySelector('.goodsImageUpload input').click();
     },
 
     previewGoodsImage() {