Merge remote-tracking branch 'origin/2025北京诚祥' into 2025北京诚祥

common/styles/global/components.scss

@@ -439,15 +439,16 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 
 /***** admin上传  *****/
 .admin-upload-btn-box,.sfz-upload-box{
-	width: 200rpx;height: 200rpx;border: 1rpx dashed #ccc;margin: 0 auto;
-	display: flex;align-items: center;justify-content: center;border-radius: 8rpx;
+	width: 200rpx;height: 200rpx;border: 1rpx dashed #ccc;margin: 0 auto;box-sizing: border-box;
+	display: flex;align-items: center;justify-content: center;border-radius: 8rpx;overflow: hidden;
 	text{font-size: 42rpx;color:#d7d7d7;}
+	.other-image{width: 200rpx;max-height: 200rpx;border-radius: 8rpx;}
+	.sfz-image{width: 360rpx;max-height: 220rpx;border-radius: 8rpx;}
 }
 .sfz-upload-box{
 	width: 360rpx;height: 220rpx;
 	text{color:#888;}
 	.sfz-content{font-size: 32rpx;color:#888;}
-	.sfz-image{width: 360rpx;max-height: 220rpx;}
 }
 .upload-bottom-text {font-size: 24rpx;color: #666;text-align: center;margin-top: 10rpx;}
 
@@ -461,9 +462,10 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 		.common-input-row{display: flex;align-items: center;margin-bottom: 24rpx;}
 		.common-label-require{color: #ff0101;margin-right: 6rpx;width:16rpx;display: inline-block;flex-shrink: 0;}
 		.common-input-label{width: 200rpx;line-height:70rpx;font-size: 28rpx;color: #333;text-align: right;}
-		.common-input{
+		.common-input,.common-input-margin{
 			height: 70rpx;min-height: 70rpx;padding: 20rpx;box-sizing: border-box;margin-right: 30rpx;
 			border: 1rpx solid #f0f0f0;border-radius: 10rpx;display: block;flex: 1;font-size: 28rpx;}
+		.common-input-margin{margin:0 46rpx 24rpx 46rpx;}
 	}
 	.content-center-class{text-align: center;}
 	.content-left-class{text-align: left;}

common/styles/global/pages.scss

@@ -622,7 +622,16 @@
 	}
 	// 照片资料
 	.ziliao-upload-box{
-		background-color: #fff;display: flex;padding: 32rpx;
+		background-color: #fff;display: flex;flex-wrap: wrap;padding: 32rpx;
+		.ziliao-image-box{position: relative;}
+		.ziliao-image{width: 200rpx;max-height: 200rpx;}
+		.ziliao-image-box{margin-right: 24rpx;}
+		.ziliao-image-close{
+			width: 36rpx;height: 36rpx;@include ezy-no-repeat-cover();
+			background-image: url("@/static/images/common/img-close-icon.svg");
+			position: absolute;top: 0;right: 0;z-index: 2;
+		}
+		.admin-upload-btn-box{margin: 0;}
 		.upload-item-box + .upload-item-box{margin-left: 16rpx;}
 	}
 	.zpzl-tip-box{
@@ -633,7 +642,13 @@
 		.scbg-btn{font-size: 28rpx;margin: 20rpx 8rpx 10rpx;}
 	}
 	
-	
+	// 办证信息
+	.bzsm-tip-box{
+		background-color: #fff;padding:24rpx 38rpx;font-size: 28rpx;color: #666;
+		.title-btn-box{display: flex;justify-content: space-between;margin-bottom: 24rpx;}
+		.reset-btn{background-color: #3fd2a1;color: #fff;padding: 5rpx 20rpx;font-size: 24rpx;border-radius: 8rpx;line-height: 1.2;}
+		.tip-content-box{margin-bottom: 12rpx;font-size: 26rpx;}
+	}
 }
 
 /*** 消息列表 ***/

components/customMap/customMap.vue

@@ -1,31 +1,58 @@
 <template>
 	<view>
+		<view class="icon-title-navBar-box">
+			<view @click="goUpPage" class="nav-bar-icon"></view>
+			<text class="nav-bar-title">选择地址</text>
+		</view>
+		<!-- 查询职业 -->
+		<view class="phone-search-box">
+			<input class="search-input" placeholder="请输入地址" v-model="data.keyword" />
+			<view class="search-icon" @click="handleClick">
+				<uni-icons type="search" size="24" color="#fff"></uni-icons>
+			</view>
+		</view>
 		<map style="width: 100%; height: 300px;" :latitude="data.latitude" :longitude="data.longitude"
 			:markers="data.covers" :show-location="true"> </map>
-			<input type="text" v-model="data.keyword" placeholder="请输入地址" style="padding: 10px 0">
-			
-			<view>{{result && result.data.data}}</view>
-			
-			<button @click="handleClick">查询</button>
+		<view  v-if="result"  v-for="(item,index) in result.data.data" key="index">
+			<view @click="xuanzeAdress(item)">
+				<view :class="index==0?'xxxactive':''" >{{item.title}}</view>
+				<view>{{item.address}}</view>
+			</view>
+
+		</view>
 	</view>
 </template>
 
 <script setup>
 	import {
-		reactive,ref
+		reactive,
+		ref
 	} from "vue"
 	import myIcon from "@/static/images/common/markIcon.png"
+
 	import {
-		onLoad, onHide, onShow
+		onLoad,
+		onHide,
+		onShow
 	} from "@dcloudio/uni-app"
-	import {useCustomMap} from "@/components/customMap/useMap.js"
-	const { getPositionSearchByKeyword } = useCustomMap();
-	
+	import {
+		useCustomMap
+	} from "@/components/customMap/useMap.js"
+
+	const emits = defineEmits(['close', 'xuanzeAdress'])
+	const {
+		getPositionSearchByKeyword
+	} = useCustomMap();
+
 	const result = ref(null);
-	
+
 	function handleClick() {
 		if (data.keyword) {
-			getPositionSearchByKeyword(data.keyword, `nearby(${data.latitude},${data.longitude},1000)`,  onSuccess, onError, {page:1, size:3,})
+			getPositionSearchByKeyword(data.keyword, `nearby(${data.latitude},${data.longitude},1000)`, onSuccess,
+				onError, {
+					page: 1,
+					size: 3,
+				})
 		}
 	}
 
@@ -33,10 +60,22 @@
 		console.log('数据', data);
 		result.value = data
 	}
+
 	function onError(err) {
 		console.log('错误', err)
 	}
 
+	function goUpPage(err) {
+		console.log('错误', err)
+		emits('close');
+
+	}
+	function xuanzeAdress(item) {
+		console.log('item');
+		emits('xuanzeAdress',item.address);
+
+	}
+
 	const data = reactive({
 		keyword: '', // 关键字
 		id: 0, // 使用 marker点击事件 需要填写id

pages/admin/Jiazheng/banzhengXinxi.vue

@@ -1,13 +1,12 @@
 <template>
 	<view class="jz-content-box">
-		<view>
-			<view>
-				说明:1：如果不需要办理证书，可直接点击保存按钮。
-				2：点击重置按钮，只重置办证信息，其他信息不改变。
-			</view>
-			<view @click="resetFun">
-				重置
+		<view class="bzsm-tip-box form-top-margin">
+			<view class="title-btn-box">
+				<view class="phone-line-title">说明</view>
+				<view @click="resetFun" class="reset-btn">重置</view>
 			</view>
+			<view class="tip-content-box">1.如果不需要办理证书，可直接点击保存按钮。</view>
+			<view class="tip-content-box">2.点击重置按钮，只重置办证信息，其他信息不改变。</view>
 		</view>
 		<!-- 报证机构（picker 实现下拉选择） -->
 		<view class="form-label-select form-top-margin">

pages/admin/Jiazheng/common/dataChecked.vue

@@ -24,12 +24,17 @@
 		</view> -->
 
 		<!-- 添加弹窗 -->
-		<uni-popup ref="addPopup" type="dialog">
-			<view class="add-popup">
-				<input v-model="newName" placeholder="请输入技能名称" class="add-input" />
-				<view class="button-group">
-					<button @click="confirmAdd" class="confirm-button">确认</button>
-					<button @click="cancelAdd" class="cancel-button">取消</button>
+		<uni-popup ref="addPopup" type="dialog" :animation="false" :is-mask-click="false">
+			<view class="phone-common-dialog">
+				<view class="common-body-box">
+					<view class="common-title">新增技能</view>
+					<view class="common-input-box">
+						<input v-model="newName" placeholder="请输入技能名称" class="common-input-margin" />
+					</view>
+				</view>
+				<view class="common-btn-box">
+					<view class="not-confirm-btn" @click="cancelAdd">取消</view>
+					<view class="confirm-btn" @click="confirmAdd">确认</view>
 				</view>
 			</view>
 		</uni-popup>

pages/admin/Jiazheng/common/jiazhengUpload.vue

@@ -9,7 +9,7 @@
 	</view>
 	<view v-else class="admin-upload-btn-box" @click="showActionSheet">
 	<text v-if="!imageUrl">+</text>
-	<image v-else style="width: 100rpx;height: 100rpx;"   :src="imageUrl" mode=""></image>
+	<image v-else class="other-image"   :src="imageUrl" mode=""></image>
 	</view>
 	<view v-if="bottomText" class="upload-bottom-text">
 		{{bottomText}}

pages/admin/Jiazheng/gerenZiliao.vue

@@ -77,9 +77,19 @@
 				@change="selectChangeHunyinList" />
 		</view>
 
-		<view class="form-label-input form-top-margin flex-start-row">
+
+	<view class="form-label-select">
 			<view class="phone-form-label"><text class="form-label-require"></text>通讯地址</view>
-			<textarea v-model="formData.juzhuDizhi" placeholder="请输入通讯地址" class="form-textarea-box" />
+			<view>{{formData.juzhuDizhi}}</view>
+			<view @click="openMap">点击</view>
+		<!-- 	<picker :range="shuxiangList" mode='selector' :value="formData.shuxiangIndex" range-key="name"
+				@change="shuxiangChange" @cancel="shuxiangCancel" class="select-picker-box">
+				<view class="form-radio-select">
+					<view>{{ formData.juzhuDizhi  }}</view>
+					<icon></icon>
+				</view>
+			</picker> -->
+				<icon></icon>
 		</view>
 
 		<view class="form-label-select">
@@ -121,12 +131,16 @@
 			<button type="default" v-if="status =='add'" @click="goNext" class="phone-green-btn">下一步</button>
 			<button type="default" v-if="status =='edit'" @click="editSave" class="phone-green-btn">保存</button>
 		</view>
+		<uni-popup  ref="popupMap" background-color="#fff" :is-mask-click="false" :mask-click="false" >
+				<customMap  style="100vh" @xuanzeAdress="xuanzeAdress" @close="mapClose"></customMap>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
 	import dataChecked from './common/dataChecked.vue';
 	import jiazhengUpload from "./common/jiazhengUpload.vue"
+	import customMap from "@/components/customMap/customMap.vue"
 	import {
 		getJiazhengXueli,
 		getJiazhengHunyin,
@@ -139,7 +153,8 @@
 	export default {
 		components: {
 			dataChecked,
-			jiazhengUpload
+			jiazhengUpload,
+			customMap
 		},
 		props: {
 			status: {
@@ -209,7 +224,17 @@
 			this.initRequests()
 		},
 		methods: {
-
+			xuanzeAdress(data){
+				console.log('data',data);
+				this.formData.juzhuDizhi = data
+				this.mapClose()
+			},
+			openMap(){
+				this.$refs.popupMap.open('bottom')
+			},
+			mapClose(){
+				this.$refs.popupMap.close()
+			},
 			async initRequests() {
 				try {
 					await Promise.all([

pages/admin/Jiazheng/qiuzhiXinxi.vue

@@ -8,7 +8,7 @@
 		<view class="form-label-select">
 			<view class="phone-form-label"><text class="form-label-require">*</text>经验</view>
 			<picker :range="jingyanList" mode='selector' :value="jingyanIndex" range-key="name" @change="jingyanChange"
-				@cancel="jingyanCancel">
+				@cancel="jingyanCancel" class="select-picker-box">
 				<view class="form-radio-select">
 					<view>{{ jingyan }}</view>
 					<icon></icon>
@@ -27,7 +27,8 @@
 		</view>
 		<view class="form-label-select">
 			<view class="phone-form-label"><text class="form-label-require"></text>薪资级别</view>
-			<picker :range="xinziJibieList" mode='selector' @change="xinziJibieChange" @cancel="xinziJibieCancel">
+			<picker :range="xinziJibieList" mode='selector' @change="xinziJibieChange" 
+			@cancel="xinziJibieCancel" class="select-picker-box">
 				<view class="form-radio-select">
 					<view>{{jibiexinzi}}</view>
 					<icon></icon>

pages/admin/Jiazheng/zhaopianZiliao.vue

@@ -21,15 +21,11 @@
 		</view>
 		<view class="zhaopianZiliao-shenfenzhengImg">
 			<view class="ziliao-upload-box">
-				<view v-if="tijianbaogaoList.length>0">
-					<view v-for="(item, index) in tijianbaogaoList" :key="index">
-						<img style="width: 100rpx;height: 100rpx;" :src="item" alt="">
-						<view @click="deleteTijianbaogao(item,index)">删除</view>
-					</view>
-				</view>
-				<view>
-					<jiazhengUpload changjingType="more" @getFileUrl="getTijianbaogao"></jiazhengUpload>
+				<view v-for="(item, index) in tijianbaogaoList" :key="index" v-if="tijianbaogaoList.length>0" class="ziliao-image-box">
+					<img class="ziliao-image" :src="item" alt="">
+					<view @click="deleteTijianbaogao(item,index)" class="ziliao-image-close"></view>
 				</view>
+				<jiazhengUpload changjingType="more" @getFileUrl="getTijianbaogao"></jiazhengUpload>
 			</view>
 		</view>
 
@@ -39,15 +35,11 @@
 		</view>
 		<view class="zhaopianZiliao-shenfenzhengImg">
 			<view class="ziliao-upload-box">
-				<view v-if="shenghuizhaoList.length>0">
-					<view v-for="(item, index) in shenghuizhaoList" :key="index">
-						<img style="width: 100rpx;height: 100rpx;" :src="item" alt="">
-						<view @click="deleteShenghuoZhao(item,index)">删除</view>
-					</view>
-				</view>
-				<view>
-					<jiazhengUpload changjingType="more" @getFileUrl="getGzShenghuozhao"></jiazhengUpload>
+				<view v-for="(item, index) in shenghuizhaoList" :key="index" v-if="shenghuizhaoList.length>0" class="ziliao-image-box">
+					<img class="ziliao-image" :src="item" alt="">
+					<view @click="deleteShenghuoZhao(item,index)" class="ziliao-image-close"></view>
 				</view>
+				<jiazhengUpload changjingType="more" @getFileUrl="getGzShenghuozhao"></jiazhengUpload>
 			</view>
 		</view>
 		<view class="form-label-switch form-top-margin">
@@ -56,15 +48,11 @@
 		</view>
 		<view class="zhaopianZiliao-shenfenzhengImg">
 			<view class="ziliao-upload-box">
-				<view v-if="zigezhaoList.length>0">
-					<view v-for="(item, index) in zigezhaoList" :key="index">
-						<img style="width: 100rpx;height: 100rpx;" :src="item" alt="">
-						<view @click="deleteZigeZhao(item,index)">删除</view>
-					</view>
-				</view>
-				<view>
-					<jiazhengUpload changjingType="more" @getFileUrl="getZigezhao"></jiazhengUpload>
+				<view v-for="(item, index) in zigezhaoList" :key="index" v-if="zigezhaoList.length>0" class="ziliao-image-box">
+					<img class="ziliao-image" :src="item" alt="">
+					<view @click="deleteZigeZhao(item,index)" class="ziliao-image-close"></view>
 				</view>
+				<jiazhengUpload changjingType="more" @getFileUrl="getZigezhao"></jiazhengUpload>
 			</view>
 		</view>
 		<view class="form-label-select">

static/images/common/img-close-icon.svg

@@ -0,0 +1 @@
+<svg t="1741831356585" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2841" data-spm-anchor-id="a313x.search_index.0.i4.10e63a81yrRc3J" width="60" height="60"><path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64z m265.9 713.9a377.2 377.2 0 0 1-119.6 80.6 377.5 377.5 0 0 1-292.6 0 377.1 377.1 0 0 1-200.2-200.2 377.5 377.5 0 0 1 0-292.6 377.1 377.1 0 0 1 200.2-200.2 377.5 377.5 0 0 1 292.6 0 377.1 377.1 0 0 1 200.2 200.2 377.5 377.5 0 0 1 0 292.6 377.2 377.2 0 0 1-80.6 119.6z m-79.6-407.1l-45.1-45.1a4 4 0 0 0-5.7 0L512 461.2 376.5 325.7a4 4 0 0 0-5.7 0l-45.1 45.1a4 4 0 0 0 0 5.7L461.2 512 325.7 647.5a4 4 0 0 0 0 5.7l45.1 45.1a4 4 0 0 0 5.7 0L512 562.8l135.5 135.5a4 4 0 0 0 5.7 0l45.1-45.1a4 4 0 0 0 0-5.7L562.8 512l135.5-135.5a4 4 0 0 0 0-5.7z" p-id="2842" fill="#30c190"></path></svg>