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

pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -539,6 +539,7 @@
 				//	debugger
 				console.log('this.allData', this.allData);
 				console.log('this.editInfo', this.editInfo);
+				data.userId = this.userId
 				if (flag == 'edit') {
 					jiazhengKaozhengUpdate(data).then(res => {
 						if (res.code == 0) {

pages/admin/Jiazheng/zhaopianZiliao.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="jz-content-box">
 		<view class="upload-img-box">
-			<jiazhengUpload @getFileUrl="getTouxiang" :img='icon' bottomText="上传头像和生活照"></jiazhengUpload>
+			<jiazhengUpload @getFileUrl="getTouxiang" :img='icon' bottomText="上传头像"></jiazhengUpload>
 		</view>
 		<view class="form-label-switch">
 			<view class="phone-form-label"><text class="form-label-require"></text>身份证照片</view>