元素添加列表显示优化

src/components/EditPanel.vue

@@ -254,13 +254,20 @@
         </div>
       </div>
 
-
       <div style="margin-top: 1px;">
-        <div style="display: inline-flex;" v-show="panelState == 13">
-          <div style="font-size: 14px;color: #999999;letter-spacing: 0; word-break:keep-all;line-height: 40px">轮播特效
+        <div style="width: 100%;display: inline-flex; align-items: center;border-bottom: #E2E4EE solid 1px;
+           padding-top: 12px;padding-bottom: 12px;
+        " v-show="panelState == 13">
+          <div style="font-size:12px;
+          font-family:MicrosoftYaHei;
+          margin-left: 20px;
+          margin-right: 10px;
+          color:rgba(51,51,51,1);letter-spacing: 0; word-break:keep-all;line-height: 40px">轮播特效
           </div>
-          <div style="font-size: 14px;color: #999999;letter-spacing: 0; word-break:keep-all;">
-            <el-select v-model="element.swiperType" placeholder="请选择">
+          <div style="font-size:12px;
+          font-family:MicrosoftYaHei;
+          color:rgba(51,51,51,1);letter-spacing: 0; word-break:keep-all;">
+            <el-select v-model="element.swiperType" placeholder="请选择" size="mini">
               <el-option v-for="(item,index) in carouselTypes" :key="item.value" :label="item.label"
                 :value="item.value">
               </el-option>

src/components/ImgPanel.vue

@@ -8,11 +8,13 @@
       <div class="ele" :style="{ backgroundImage: 'url(' + (element.morePic[0]?element.morePic[0].filePath:'') + ')' }"
         @click="selectedImg(element)" v-for="element in picList1"></div>
     </template>
+    <template v-else-if="isButton">
+      <div class="ele" :style="{ backgroundImage: 'url(' + element.filePath + ')' }" @click="selectedImg(element)"
+        v-for="element in picList3"></div>
+    </template>
     <template v-else>
-      <div v-if='!isButton' class="ele" :style="{ backgroundImage: 'url(' + element.filePath + ')' }"
-        @click="selectedImg(element)" v-for="element in picList2"></div>
-      <div v-else class="ele" :style="{ backgroundImage: 'url(' + element.filePath + ')' }"
-        @click="selectedImg(element)" v-for="element in picList3"></div>
+      <div class="ele" :style="{ backgroundImage: 'url(' + element.filePath + ')' }" @click="selectedImg(element)"
+        v-for="element in picList2"></div>
     </template>
   </div>
 </template>

src/components/PicturePicker.vue

@@ -87,33 +87,6 @@
             })
           }
         }
-        // var that =this
-        // let file = event.target.files[0]
-        // if (file) {
-        //   const loading = this.$loading({
-        //     lock: true,
-        //     text: 'Loading',
-        //     spinner: 'el-icon-loading',
-        //     background: 'rgba(0, 0, 0, 0.8)'
-        //   });
-        //   http.uploadMaterielFile(file,function (res) {
-        //
-        //     loading.close();
-        //     let img = document.createElement('img')
-        //     img.onload = () => {
-        //       that.$emit('uploaded', {
-        //         'filePath': res,
-        //         'width': img.width,
-        //         'height': img.height
-        //       })
-        //     }
-        //     img.src = res
-        //   }, function(res) {
-        //     if (res.total.percent == 100) {
-        //       loading.close();
-        //     }
-        //   })
-        // }
       },
       multipleUpload(event) {
         let files = event.target.files