Merge branch 'qin_v3'

src/components/DesignForm/public/form/formItem.vue

@@ -1014,10 +1014,17 @@ const pickUserVal = (val:any) => {
 				:on-success="uploadSuccess"
 				:on-remove="uploadRemove"
 			>
-				<el-button type="primary" v-if="config?.btnText">
+				<i class="icon-plus" v-if="control?.listType=='picture-card'"></i>
+				<el-button type="primary" plain v-else-if="control?.listType=='picture'">
+						<span v-if="config?.btnText">{{ config?.btnText }} </span>
+						<span class="fa fa-plus" v-else></span>
+				</el-button>
+				<template v-else>
+					<el-button type="primary" plain v-if="config?.btnText">
 						{{ config?.btnText }} 
 					</el-button>
 					<i class="icon-plus" v-else></i>
+				</template>
 				<template #tip v-if="config?.tip">
 					<div class="el-upload__tip">
 						{{ config?.tip }}

src/widget/baidumap/index.vue

@@ -25,7 +25,7 @@
 						<el-button class="fa fa-map-marker" @click="openPickMap" />
 					</template>
 				</el-input>
-				<div :id="mapId" ref="myBaiduMapView" class="smallMapView"></div>
+				<!-- <div :id="mapId" ref="myBaiduMapView" class="smallMapView"></div> -->
 			</template>
 		</el-form-item>
 		<PickMap v-if="mapShow" v-model:mapshow="mapShow" :address="address" :lnglat="lngLat" @updatemapinfo="updateMapInfo" />
@@ -219,7 +219,7 @@ watch(value,(val:any)=>{
 			}
 		}
 		// console.log("加载地址--31-->",value.value,adresAry,address.value,lngLat.value,longitude.value,latitude.value)
-		mapInit(mapObject)
+		// mapInit(mapObject)
 	}
 })
 watch(()=>address.value,(val:string)=>{
@@ -253,7 +253,7 @@ onMounted(()=>{
 		// console.log("加载地址--3-->",value.value,adresAry,address.value,lngLat.value,longitude.value,latitude.value)
 	}
 	
-	loadJScript()
+	// loadJScript()
 })
 
 const openPickMap = () => {
@@ -266,7 +266,7 @@ const updateMapInfo = (ads:string,lng:any,lat:any) =>{
 	value.value = ads+"|*@*|"+lng+","+lat
 	longitude.value = lng
 	latitude.value = lat
-	mapInit(mapObject)
+	// mapInit(mapObject)
 }
 </script>
 
@@ -275,4 +275,10 @@ const updateMapInfo = (ads:string,lng:any,lat:any) =>{
 	width:100%;
 	height:400px;
 }
+.el-form-item{
+	margin-bottom: 0px;
+}
+.el-form-item--default{
+	margin-bottom: 0px;
+}
 </style>