Merge branch 'master' of http://192.168.4.246:3000/zhangs/surveyMaker

src/views/h5editor/index.vue

@@ -318,7 +318,19 @@
             line-height:19px;">默认状态</span>
             <div v-if="unSelectedButtom" :style="{ backgroundImage: 'url(' + buttonData.backgroundUnselectedImg + ')','width':'130px', 'height':'130px','background-repeat': 'no-repeat',
                  'background-position': 'center',
-                 'background-size': 'contain'}"></div>
+                 'background-size': 'contain'}" style="position: relative">
+               <div style="font-size:12px;width: 100%; height: 20px;
+                          font-family:MicrosoftYaHei;
+                          color:rgba(255,255,255,1);
+                         background:rgba(0,0,0,0.8);
+                         display: flex; position: absolute;
+                         bottom: 0;
+                         justify-content: center;
+                          line-height:20px;">更换素材</div>
+               <label class="lable">
+                 <input style="display: none;" type="file" @change="upload($event, false)">
+               </label>
+            </div>
             <label class="lable" v-else>
               <div style="width:100%;
                   display: flex;
@@ -349,7 +361,19 @@
               line-height:19px;">选中状态</span>
             <div v-if="selectedButtom" :style="{ backgroundImage: 'url(' + buttonData.backgroundSelectedImg + ')','width':'130px', 'height':'130px','background-repeat': 'no-repeat',
               'background-position': 'center',
-              'background-size': 'contain'}"></div>
+              'background-size': 'contain'}" style="position: relative">
+              <div style="font-size:12px;width: 100%; height: 20px;
+                          font-family:MicrosoftYaHei;
+                          color:rgba(255,255,255,1);
+                         background:rgba(0,0,0,0.8);
+                         display: flex; position: absolute;
+                         bottom: 0;
+                         justify-content: center;
+                          line-height:20px;">更换素材</div>
+              <label class="lable">
+                <input style="display: none;" type="file" @change="upload($event, true)">
+              </label>
+            </div>
             <label class="lable" v-else>
               <div style="width:100%;
                     display: flex;
@@ -516,7 +540,7 @@
                 if (complexEditorElement.length == 0 && this.panelTabState == 3) {
                     this.panelTabState = 0;
                 }
-            }
+            },
         },
         computed: {
             themeId() {
@@ -971,10 +995,16 @@
                             img.onload = () => {
                                 if (isSelected) {
                                     that.buttonData.backgroundSelectedImg = res;
-                                    that.selectedButtom = true;
+                                    that.selectedButtom = false;
+                                    setTimeout(()=>{
+                                        that.selectedButtom = true;
+                                    },1);
                                 } else {
                                     that.buttonData.backgroundUnselectedImg = res;
-                                    that.unSelectedButtom = true;
+                                    that.unSelectedButtom = false;
+                                    setTimeout(()=>{
+                                        that.unSelectedButtom = true;
+                                    },1);
                                 }
                                 that.buttonData.itemId = that.itemId;
                                 that.buttonData.width = img.width;