Merge branch 'electron' into dev_print2

src/components/merchantAdd.vue

@@ -14,7 +14,7 @@
         </el-form-item>
         <el-form-item label="商家地址" label-width="103px">
           <el-input v-model="form.address" placeholder="请点击地图选择具体地址" disabled autocomplete="off" style="width: 100%">
-            <el-image @click="showMap" slot="append" class="map" src="../../../static/image/icon_map.png"></el-image>
+            <img @click="showMap" slot="append" class="map" src="../../static/image/icon_map.png">
           </el-input>
         </el-form-item>
         <el-form-item label="门牌号" label-width="103px">