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

common/styles/global/components.scss

@@ -270,7 +270,7 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 
 // label-radio
 .form-label-radio{
-	width: 100%;display: flex;justify-content: space-between;
+	width: 100%;display: flex;justify-content: space-between;align-items: center;
 	background-color: #fff;font-size: 30rpx;color: #333;
 	padding: 6rpx 20rpx;box-sizing: border-box;margin-bottom: 2rpx;
 	.form-label-require{color: #ff0101;margin-right: 6rpx;width:16rpx;display: inline-block;}
@@ -278,12 +278,28 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 	.form-radio-group{display: flex;flex-wrap: wrap;flex: 1;}
 	.form-radio-double-group{justify-content: space-between;}
 	.form-radio-item{
-		width: 28%;height:60rpx;line-height:52rpx;border-radius: 6rpx;box-sizing: border-box;
+		width: 29%;height:60rpx;line-height:60rpx;border-radius: 6rpx;box-sizing: border-box;
 		background-color:#f5f5f5;text-align: center;margin:10rpx 2%;border:1rpx solid #f5f5f5;
+		box-sizing: border-box;padding: 0 6rpx;font-size: 26rpx;
 	}
-	.genderActive{
-		background-color:#e5f8f4;border:1rpx solid #6bccb0;
+	.genderActive{background-color:#e5f8f4;border:1rpx solid #6bccb0;}
+	// btn
+	.radio-add-btn{
+		width: 29%;height:60rpx;line-height:60rpx;border-radius: 6rpx;box-sizing: border-box;
+		text-align: center;margin:10rpx 2%;border:1rpx solid #6bccb0;color:#6bccb0;
+		box-sizing: border-box;padding: 0 6rpx;font-size: 26rpx;background-color:#e5f8f4;
+	}
+	.radio-btn-box{
+		width: 100%;display:block;text-align: center;
+		.radio-btn{color:#6bccb0;display:inline-block;margin: 16rpx 0;}
+		.radio-btn::after{
+			content: '';width: 30rpx;height: 30rpx;@include ezy-no-repeat-cover;
+			background-image: url("@/static/images/common/nav-bar-jt-bottom-green.svg");
+			display: inline-block;vertical-align: middle;margin-left: 10rpx;font-size: 30rpx;
+		}
+		.collapsed-btn::after{transform: rotate(180deg);}
 	}
+	.label-radio-btn-box{margin-right: 180rpx;}
 }
 
 // label-select
@@ -292,7 +308,8 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 	background-color: #fff;font-size: 30rpx;color: #333;
 	padding: 20rpx;box-sizing: border-box;margin-bottom: 2rpx;
 	.form-label-require{color: #ff0101;margin-right: 6rpx;width:16rpx;display: inline-block;}
-	.phone-form-label{min-width: 180rpx;line-height:52rpx;}
+	.phone-form-label{min-width: 180rpx;line-height:60rpx;}
+	.form-radio-picker{width:auto!important;flex: unset!important;display: flex;align-items: center;}
 	.form-radio-select{
 		display: flex;align-items: center;
 		icon{width: 30rpx;height: 30rpx;@include ezy-no-repeat-cover;
@@ -303,7 +320,7 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 
 // label-switch
 .form-label-switch{
-	width: 100%;display: flex;justify-content: space-between;
+	width: 100%;display: flex;justify-content: space-between;align-items: center;
 	background-color: #fff;font-size: 30rpx;color: #333;
 	padding: 20rpx;box-sizing: border-box;margin-bottom: 2rpx;
 	.form-label-require{color: #ff0101;margin-right: 6rpx;width:16rpx;display: inline-block;}
@@ -315,5 +332,5 @@ margin-right: 18rpx;display: inline-block;vertical-align: middle;}
 	width: 100px;height: 100px;border: 1rpx dashed #ccc;margin: 0 auto;
 	display: flex;align-items: center;justify-content: center;border-radius: 8rpx;
 	text{font-size: 42rpx;color:#d7d7d7;}
-	.bottom-text {font-size: 12px;color: #bdbdbd;}
-}
+}
+.upload-bottom-text {font-size: 24rpx;color: #666;text-align: center;margin-top: 10rpx;}

common/styles/global/pages.scss

@@ -450,10 +450,29 @@
 	.form-top-margin{margin-top: 20rpx;}
 	.upload-img-box{background-color: #fff;padding: 20rpx 0;margin: 20rpx 0;}
 	// 个人资料
-	.xxdz-label-input{align-items: flex-start;}
 	.form-textarea-box{width: 100%;height: 160rpx;padding: 10rpx;border: 1rpx solid #e5e5e5;border-radius: 4px;}
 	.agree-section-box{
 		background-color: #fff;padding: 30rpx;font-size: 28rpx;
 		.phone-green-btn{font-size: 28rpx;margin: 20rpx 8rpx 36rpx;}
 	}
+	.flex-start-row{
+		align-items: flex-start;
+		.phone-form-label{line-height: 70rpx;}
+	}
+	.page-btn-box{
+		margin: 20rpx 8rpx 0;display: flex;justify-content: center;padding: 32rpx 0;background-color: #fff;
+		.phone-white-btn,.phone-green-btn{width: 36%;font-size: 28rpx;margin: 0 16rpx;}
+	}
+	// 照片资料
+	.ziliao-upload-box{
+		background-color: #fff;display: flex;padding: 32rpx;
+		view + view{margin-left: 16rpx;}
+	}
+	.zpzl-tip-box{
+		background-color: #fff;padding:24rpx 38rpx;font-size: 30rpx;color: #333;
+		.red-tip{font-size: 24rpx;color: #ff0101;margin: 16rpx 0;}
+		.scbg-tip{text-align: center;font-size: 28rpx;color: #555;
+		padding: 42rpx 0 24rpx;border-top: 1rpx solid #f8f9fd;margin-top: 24rpx;}
+		.scbg-btn{font-size: 28rpx;margin: 20rpx 8rpx 10rpx;}
+	}
 }

pages/admin/Jiazheng/common/dataChecked.vue

@@ -2,18 +2,21 @@
 	<view class="form-radio-group">
 		<!-- 技能块展示 -->
 		<view v-for="item in displayedList" :key="item.id" class="form-radio-item"
-			:class="{ selected: isSelected(item.id) }" @click="toggleSelect(item)">
+			:class="{ genderActive: isSelected(item.id) }" @click="toggleSelect(item)">
 			{{ item.name }}
 		</view>
 		<!-- 添加按钮 -->
-		<view v-if="showAddButton" class="add-block" @click="handleAdd">
+		<view v-if="showAddButton" class="radio-add-btn" @click="handleAdd">
 			+ 添加
 		</view>
 
 		<!-- 展开/收起按钮 -->
-		<view v-if="showExpandButton" class="expand-button" @click="toggleExpand">
-			{{ showAll ? '收起' : `展开` }}
+		<view class="radio-btn-box label-radio-btn-box">
+			<view v-if="showExpandButton" :class="[{ 'radio-btn': true }, showAll ? 'collapsed-btn' : 'expanded-btn']" @click="toggleExpand">
+				{{ showAll ? '收起' : `展开` }}
+			</view>
 		</view>
+		
 
 		<!-- 	<view v-if="showExpandButton" class="expand-button" @click="toggleExpand">
 			{{ showAll ? '收起' : `展开剩余${remainingCount}项` }}
@@ -164,24 +167,6 @@
 </script>
 
 <style scoped>
-	.skill-list {
-		display: flex;
-		flex-wrap: wrap;
-		gap: 20rpx;
-	}
-
-	.skill-block {
-		padding: 12rpx 24rpx;
-		background: #f5f5f5;
-		border-radius: 8rpx;
-		font-size: 28rpx;
-		color: #333;
-	}
-
-	.skill-block.selected {
-		background: #007aff;
-		color: #fff;
-	}
 
 	.add-block {
 		background: transparent;

pages/admin/Jiazheng/common/jiazhengUpload.vue

@@ -2,10 +2,10 @@
 	<view v-if="changjingType =='shenfenzheng'" class="admin-upload-btn-box" @click="showActionSheet">
 		<text>+</text>
 	</view>
-	<view v-else class="upload-btn" @click="showActionSheet">
+	<view v-else class="admin-upload-btn-box" @click="showActionSheet">
 		<text>+</text>
 	</view>
-	<view v-if="bottomText" class="bottom-text">
+	<view v-if="bottomText" class="upload-bottom-text">
 		{{bottomText}}
 	</view>
 </template>

pages/admin/Jiazheng/gerenZiliao.vue

@@ -20,12 +20,18 @@
 
 			<view class="form-label-input">
 				<view class="phone-form-label"><text class="form-label-require">*</text>生日</view>
-				<uni-datetime-picker v-model="formData.birthday" type="date" :clear-icon="false" />
+				<uni-datetime-picker v-model="formData.birthday">
+					<view class="form-radio-select">
+						<view>请选择</view><icon></icon>
+					</view>
+				</uni-datetime-picker>
 			</view>
 
 			<view class="form-label-input">
 				<view class="phone-form-label"><text class="form-label-require">*</text>籍贯</view>
-				<uni-data-picker v-model="formData.hometown" placeholder="请选择籍贯" :localdata="hometownData" />
+				<uni-data-picker v-model="formData.hometown" placeholder="请选择籍贯" :localdata="hometownData" >
+					{{formData.hometown}}
+				</uni-data-picker>
 			</view>
 			<view class="form-label-input">
 				<view class="phone-form-label"><text class="form-label-require">*</text>身份证地址</view>
@@ -44,16 +50,16 @@
 						女</view>
 				</view>
 			</view>
-			<view class="form-label-radio form-top-margin">
+			<view class="form-label-radio form-top-margin flex-start-row">
 				<view class="phone-form-label"><text class="form-label-require"></text>学历</view>
 				<dataChecked :list="xueliList" mode="single" :showAdd="false" @change="selectChangeXueliList" />
 			</view>
-			<view class="form-label-radio">
+			<view class="form-label-radio flex-start-row">
 				<view class="phone-form-label"><text class="form-label-require"></text>婚姻 </view>
 				<dataChecked :list="hunyinList" mode="single" :showAdd="false" @change="selectChangeHunyinList" />
 			</view>
 
-			<view class="form-label-input form-top-margin xxdz-label-input">
+			<view class="form-label-input form-top-margin flex-start-row">
 				<view class="phone-form-label"><text class="form-label-require">*</text>详细地址</view>
 				<textarea v-model="formData.currentAddress" placeholder="请输入详细地址" class="form-textarea-box" />
 			</view>

pages/admin/Jiazheng/index.vue

@@ -13,10 +13,8 @@
 					<icon :class="allJtClass" />
 				</view>
 				<view class="all-type-list">
-					<view v-if="isOpen" v-for="(item,index) in allType" :key="index" @click="onSelectCell(item,index)"
-						class="all-type-item all-type-active">
-						<view class="le-dropdown-cell-active-text">{{item.label}}</view>
-						<view v-show="item.value==typeChecked"></view>
+					<view v-show="isOpen">
+						<dataChecked :list="allType" mode="multiple" :defaultCount="99" :showAdd="false" @change="selectChangeSkill" />
 					</view>
 				</view>
 				<view class="jiazheng-search-right">
@@ -47,11 +45,11 @@
 								<view @click="lookUserInfo">
 									<image :src="item.icon ||defauleImg" mode=""></image>
 									<view>
-										<p> 1000岁｜3年经验</p>
-										<p>四川成都人</p>
+										<p> {{item.age}}岁｜{{item.jingyan}}年经验</p>
+										<p>{{item.jiguan}}</p>
 									</view>
 									<view>
-										待岗
+										{{item.zhuangtai}}
 									</view>
 								</view>				
 							</template>
@@ -95,30 +93,10 @@
 		onLoad
 	} from "@dcloudio/uni-app";
 	import {
-		getJiazhengList
+		getJiazhengList,
+		getJiazhengLeixing
 	} from "@/api/jiazheng.js"
-	// import {
-	// 	DropdownList
-	// } from "./data.js";
-	// const menuList = ref(DropdownList)
-	const allType = [{
-			label: "由近到远",
-			value: 0
-		},
-		{
-			label: "由远到近",
-			value: 1
-		},
-		{
-			label: "由远到近",
-			value: 2
-		},
-		{
-			label: "由远到近",
-			value: 3
-		},
-	]
-
+	import dataChecked from './common/dataChecked.vue';
 	let range = ref([{
 			"value": 0,
 			"text": "篮球",
@@ -133,6 +111,7 @@
 			"text": "游泳"
 		}
 	])
+	let allType = ref([])
 	let data = reactive({
 		zyName: '', // 职业名称
 		list: [], // 考试列表
@@ -156,7 +135,7 @@
 	const updataJtClass = 'saixuan-jt-default';
 	const luruJtClass = 'saixuan-jt-click';
 	const clickAlltype = (data) => {
-		isOpen.value = true
+	 isOpen.value = !isOpen.value;
 	}
 	const onSelectCell = (data, index) => {
 		console.log('data', data);
@@ -195,6 +174,9 @@
 	function shareInfo() {
 
 	}
+	function selectChangeSkill() {
+
+	}
 
 	function refreshData() {
 
@@ -228,8 +210,25 @@
 			console.log('data.list', data.list);
 		})
 	}
+	function getLeixing() {
+		let req = {
+		}
+		getJiazhengLeixing(req).then(res => {
+				allType = dataConversionObject(res.data)
+			console.log('allType',allType.value);
+		})
+	}
+	function dataConversionObject(data) {
+		let newList
+		newList = data.map((name, index) => ({
+			id: index,
+			name: name
+		}));
+		return newList
+	}
 	onLoad(() => {
 		getDataList()
+		getLeixing()
 	})
 </script>
 

pages/admin/Jiazheng/qiuzhiXinxi.vue

@@ -1,41 +1,41 @@
 <template>
-	<view>
-		<view>
-			<view>
-				*类型
-			</view>
+	<view class="jz-content-box">
+		<view class="form-label-radio form-top-margin flex-start-row">
+			<view class="phone-form-label"> <text class="form-label-require"></text>类型</view>
 			<dataChecked :list="typeList" mode="multiple" :defaultCount="9" @change="selectChangeType" @add="addType" />
 		</view>
-		<view>
-			<view>经验</view>
+		<view class="form-label-select">
+			<view class="phone-form-label"><text class="form-label-require"></text>经验</view>
 		</view>
-		<view>
-			<view>
-				*技能
-			</view>
+		<view class="form-label-radio flex-start-row">
+			<view class="phone-form-label"><text class="form-label-require">*</text>技能</view>
 			<dataChecked :list="skillList" mode="multiple" :defaultCount="9" @change="selectChangeSkill"
 				@add="addSkill" />
 		</view>
-		<view>
-			<view>
-				状态
-			</view>
+		<view class="form-label-radio form-top-margin flex-start-row">
+			<view class="phone-form-label"><text class="form-label-require">*</text>状态</view>
 			<dataChecked :list="zhuangtaiList" mode="single" :showAdd="false" @change="selectChangeZhuangtai" />
 		</view>
-		<picker :range="xinziJibie" mode='selector' @change="xinziJibieChange" @cancel="xinziJibieCancel">
-			<view>薪资级别</view>
-		</picker>
-		<view>
-			<view>期望薪资</view>
-			  <input v-model="inputValue"  placeholder="面议" />
+		<view class="form-label-select">
+			<view class="phone-form-label"><text class="form-label-require"></text>薪资级别</view>
+			<picker :range="xinziJibie" mode='selector' @change="xinziJibieChange" @cancel="xinziJibieCancel">
+				<view class="form-radio-select">
+					<view></view><icon></icon>
+				</view>
+			</picker>
+		</view>
+		
+		<view class="form-label-input">
+			<view class="phone-form-label"><text class="form-label-require"></text>期望薪资</view>
+			<input v-model="inputValue"  placeholder="请输入期望薪资" />
 		</view>	
-		<view>
-			<view>工作经历</view>
-			  <input v-model="inputValue"  placeholder="请填写工作经历" />
+		<view class="form-label-input">
+			<view class="phone-form-label"><text class="form-label-require"></text>工作经历</view>
+			<input v-model="inputValue"  placeholder="请填写工作经历" />
 		</view>
-		<view>
-			<view>上一步</view>
-			<view>下一步</view>
+		<view class="page-btn-box">
+			<button type="default" class="phone-white-btn">上一步</button>
+			<button type="default" class="phone-green-btn">下一步</button>
 		</view>
 	</view>
 </template>

pages/admin/Jiazheng/zhaopianZiliao.vue

@@ -1,43 +1,32 @@
 <template>
-	<view>
-		<view class="zhaopianZiliao-touxiang">
+	<view class="jz-content-box">
+		<view class="upload-img-box">
 			<jiazhengUpload bottomText="上传头像和生活照"></jiazhengUpload>
 		</view>
-		<view class="zhaopianZiliao-shenfenzheng">
-			<view>
-				身份证照片
-			</view>
-			<switch @change="switchSfzChange" />
+		<view class="form-label-switch">
+			<view class="phone-form-label"><text class="form-label-require"></text>身份证照片</view>
+			<switch @change="switchSfzChange" color="#3fd2a1" style="transform:scale(0.7)"/>
 		</view>
-		<view class="zhaopianZiliao-shenfenzhengImg">
-			<view class="zhaopianZiliao-shenfenzhengImg-first">
-				<jiazhengUpload bottomText="上传身份证头像面"></jiazhengUpload>
-			</view>
-			<view class="zhaopianZiliao-shenfenzhengImg-two">
-				<jiazhengUpload bottomText="上传身份证国徽面"></jiazhengUpload>
-			</view>
-
+		<view class="ziliao-upload-box">
+			<view><jiazhengUpload bottomText="上传身份证头像面"></jiazhengUpload></view>
+			<view><jiazhengUpload bottomText="上传身份证国徽面"></jiazhengUpload></view>
 		</view>
-		<view class="zhaopianZiliao-shenfenzheng">
-			<view>
-				工作生活照
-			</view>
-			<switch @change="switchGzChange" />
+		<view class="form-label-switch form-top-margin">
+			<view class="phone-form-label"><text class="form-label-require"></text>工作生活照</view>
+			<switch @change="switchGzChange" color="#3fd2a1" style="transform:scale(0.7)"/>
 		</view>
 		<view class="zhaopianZiliao-shenfenzhengImg">
-			<view class="zhaopianZiliao-shenfenzhengImg-first">
-				<jiazhengUpload></jiazhengUpload>
+			<view class="ziliao-upload-box">
+				<view><jiazhengUpload></jiazhengUpload></view>
 			</view>
 		</view>
-		<view class="zhaopianZiliao-shenfenzheng">
-			<view>
-				资格类照片
-			</view>
-			<switch @change="switchZgChange" />
+		<view class="form-label-switch form-top-margin">
+			<view class="phone-form-label"><text class="form-label-require"></text>资格类照片</view>
+			<switch @change="switchZgChange" color="#3fd2a1" style="transform:scale(0.7)"/>
 		</view>
 		<view class="zhaopianZiliao-shenfenzhengImg">
-			<view class="zhaopianZiliao-shenfenzhengImg-first">
-				<jiazhengUpload></jiazhengUpload>
+			<view class="ziliao-upload-box">
+				<view><jiazhengUpload></jiazhengUpload></view>
 			</view>
 		</view>
 		<!-- 	<view class="list-row"  @click="clickTijianriqi">
@@ -45,46 +34,42 @@
 			<text>最近体检日期</text>
 		</view> -->
 		<!-- <uni-datetime-picker ref="datePicker" type="date" placeholder="选择日期121231233"   :clear-icon="false" v-model="single" @maskClick="maskClick" /> -->
+		<view class="form-label-select">
+			<view class="phone-form-label"><text class="form-label-require"></text>最近体检日期</view>
+			<uni-datetime-picker class="form-radio-picker" v-model="single" type="date" @change="changeTijian">
+				<view class="form-radio-select">
+					<view></view><icon></icon>
+				</view>
+			</uni-datetime-picker>
+		</view>
 
-		<uni-datetime-picker v-model="single" type="date" @change="changeTijian">
-			<view class="list-row">
-				<icon class="list-icon error-icon"></icon>
-				<text>最近体检日期123</text>
-			</view>
-		</uni-datetime-picker>
-
-		<uni-datetime-picker v-model="single" type="date" @change="changeTijian">
-			<view class="list-row">
-				<icon class="list-icon error-icon"></icon>
-				<text>健康证日期</text>
-			</view>
-		</uni-datetime-picker>
+		<view class="form-label-select">
+			<view class="phone-form-label"><text class="form-label-require"></text>健康证日期</view>
+			<uni-datetime-picker class="form-radio-picker" v-model="single" type="date" @change="changeTijian">
+				<view class="form-radio-select">
+					<view></view><icon></icon>
+				</view>
+			</uni-datetime-picker>
+		</view>
 
-		<view>
-			<view>
-				体检报告文件
-				（*如未经同意，体检报告均不展示在简历中;在系统中预约的体检，如有电子报告，会自动关联到简历中）
-			</view>
+		<view class="zpzl-tip-box form-top-margin">
+			<view>体检报告文件</view>
+			<view class="red-tip">（*如未经同意，体检报告均不展示在简历中;在系统中预约的体检，如有电子报告，会自动关联到简历中） </view>
 			<view>
 				<checkbox-group>
-
-					<checkbox value="cb" checked="true" />已经{{name}}同意，上传个人体检报告
+					<checkbox value="cb" checked="true" color="#3fd2a1" style="transform:scale(0.65)"/>已经{{name}}同意，上传个人体检报告
 				</checkbox-group>
 			</view>
+			<view class="scbg-tip">
+				还没有上传的体验报告<br>
+				可点击下方上传体检报告
+			</view>
+		<button type="default" class="phone-green-btn scbg-btn">＋从手机上传体检报告(pdf)</button>
 		</view>
-
-
-		<view>
-			还没有上传的体验报告
-			可点击下方上传体检报告
-		</view>
-		<view>
-			＋从手机上传体检报告(pdf)
-		</view>
-		<view>
-			<view>上一步</view>
-			<view>下一步</view>
-			
+		
+		<view class="page-btn-box">
+			<button type="default" class="phone-white-btn">上一步</button>
+			<button type="default" class="phone-green-btn">下一步</button>
 		</view>
 	</view>
 </template>
@@ -134,32 +119,4 @@
 
 		},
 	};
-</script>
-<style scoped>
-	.zhaopianZiliao-touxiang {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		flex-direction: column;
-	}
-
-	.zhaopianZiliao-shenfenzhengImg {
-		display: flex;
-
-	}
-
-	.zhaopianZiliao-shenfenzheng {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		padding: 10px;
-	}
-
-	.zhaopianZiliao-shenfenzhengImg-first {
-		margin-left: 20px;
-	}
-
-	.zhaopianZiliao-shenfenzhengImg-two {
-		margin-left: 20px;
-	}
-</style>
+</script>

static/images/common/nav-bar-jt-bottom-green.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1740467226332" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2034" width="60" height="60" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M512 704c8.288 0 15.776-3.232 21.456-8.4l0.064 0.08 352-320-0.08-0.08c6.448-5.856 10.56-14.208 10.56-23.6a32 32 0 0 0-32-32c-8.288 0-15.76 3.232-21.456 8.4l-0.08-0.08L512 628.752 181.536 328.32l-0.08 0.08A31.776 31.776 0 0 0 160 320a32 32 0 0 0-32 32c0 9.376 4.112 17.744 10.544 23.6l-0.08 0.08 352 320 0.08-0.08c5.68 5.168 13.168 8.4 21.456 8.4z" p-id="2035" data-spm-anchor-id="a313x.search_index.0.i1.23233a81kOTPLw" fill="#3fd2a1" class="selected"></path></svg>