Merge branch 'feature_fix' of zhangs/surveyMaker into develop

src/components/EditPanel.vue

@@ -151,6 +151,7 @@ color:rgba(255,255,255,1);"
             <input
               style="display: none;position: absolute;top: 0px;"
               type="file"
+              accept="image/*"
               @change="showSelectedPicOrUnSelectedPic($event,false)"
               multiple
             />

src/views/h5editor/index.vue

@@ -1227,6 +1227,7 @@ export default {
     async changeSelectedPicOrUnSelectedPic(event, isAddButton, position) {
       var that = this;
       let files = event.target.files;
+       console.log("上传按钮图片",files)
       if (!files.length) {
         return false;
       }
@@ -1278,11 +1279,13 @@ export default {
               }
             );
           } else if (files.length > 1) {
+           
             http.uploadMaterielFile(
               file,
               function(res) {
                 that.buttonData.itemId = that.itemId;
                 that.buttonData.isButton = true;
+                 console.log("当前图片对象",files[0])
                 if (res.endsWith(files[0].name)) {
                   that.buttonData.backgroundUnselectedImg = res;
                 } else if (res.endsWith(files[1].name)) {

src/views/previewPage/previewPage.html

@@ -1,4 +1,4 @@
-<div class="content">
+<div class="content-pre">
   <div @click="xxxxx" class="dowload"> 下载到本地 </div>
   <div id="pdfDom" class="pdfContent">
     <div class="pHeader">

src/views/previewPage/previewPage.scss

@@ -1,4 +1,4 @@
-.content {
+.content-pre {
   background: #edeff7;
   padding: 0px;
 }