Merge branch '2025北京诚祥' of https://gogs.mtavip.com/wangguoyu/uniProject into 2025北京诚祥

components/customMap/customMap.vue

@@ -144,7 +144,7 @@
 		// #endif
 		// #ifdef APP
 		uni.request({
-			url: url,
+			url: url2,
 			method: 'get',
 			timeout: 20000,
 		}).then(res => {
@@ -266,7 +266,7 @@
 
 	function getCityName(latitude, longitude) {
 		const Key = `KBYBZ-FS3KZ-U2FXR-7VPDX-L7J46-23F55`
-		const url1 = `https://apis.map.qq.com/ws/geocoder/v1?location=${latitude},${longitude}&key=${Key}&output=jsonp`;
+		const url1 = `https://apis.map.qq.com/ws/geocoder/v1/?location=${latitude},${longitude}&key=${Key}`;
 		const url = `https://apis.map.qq.com/ws/geocoder/v1`;
 		//const url = `https://apis.map.qq.com/ws/geocoder/v1/`;
 		// #ifdef H5

pages/admin/Jiazheng/gerenZiliao.vue

@@ -572,10 +572,10 @@
 
 
 
-
 						this.formData.realName = res.data.name
+						this.formData.idtype = '1'
 						this.formData.gender = res.data.genderId
-						this.formData.minzu.name = res.data.ethnicity
+						this.formData.minzu.name = res.data.minzuName
 						this.formData.minzu.id = res.data.minzuId
 						this.formData.birthday = res.data.birthDate
 						this.formData.hujiDizhi = res.data.address

pages/admin/Jiazheng/qiuzhiXinxi.vue

@@ -42,7 +42,7 @@
 		</view>
 		<view class="form-label-input">
 			<view class="phone-form-label"><text class="form-label-require"></text>工作经历</view>
-			<input v-model="jingli" placeholder="请填写工作经历" />
+				<textarea v-model="jingli"  placeholder="请填写工作经历"/>
 		</view>
 		<view class="page-btn-box">
 			<button type="default" v-if="status =='add'" @click="goNext" class="phone-green-btn">下一步</button>

pages/admin/Jiazheng/zhaopianZiliao.vue

@@ -139,7 +139,7 @@
 					this.idcardUrl1 = data.idcardUrl1
 					this.idcardUrl2 = data.idcardUrl2
 					this.shenghuizhaoList = data.shenghuoUrls == '' ? '' : data.shenghuoUrls.split(",")
-					this.zigezhaoList = data.zhengshuUrls == '' ? '' : data.shenghuoUrls.split(",")
+					this.zigezhaoList = data.zhengshuUrls == '' ? '' : data.zhengshuUrls.split(",")
 					this.tijianbaogaoList = data.tijianUrls == '' ? '' : data.tijianUrls.split(",")
 					this.tijianDate = data.tijianDate
 					this.jiankangDate = data.jiankangDate