浏览代码

修改细节字体大小

空白格 3 年之前
父节点
当前提交
51f16c3ec6

+ 2 - 2
h5_web/pages/businessDetails/businessDetails.scss

@@ -222,7 +222,7 @@
 						}
 						.info {
 							view {
-								font-size: 22rpx;
+								font-size: 26rpx;
 								color: #9B9B9B;
 								line-height: 40rpx;
 								&:first-child {
@@ -236,7 +236,7 @@
 						display: flex;
 						flex-direction: column;
 						view {
-							font-size: 22rpx;
+							font-size: 24rpx;
 							text-align: right;
 							color: #BCBCBC;
 							&:first-child {

+ 1 - 1
h5_web/pages/cooperativeEnterprise/cooperativeEnterprise.scss

@@ -49,7 +49,7 @@
 					font-weight: 400;
 					.company {
 						display: flex;
-						font-size: 22rpx;
+						font-size: 24rpx;
 						color: #9B9B9B;
 						margin-top: 18rpx;
 						.icon {

+ 0 - 37
h5_web/pages/evaluationIntention/city.js

@@ -1,37 +0,0 @@
-export const city = [{
-		label: "贵阳市",
-		value: "5201"
-	},
-	{
-		label: "六盘水市",
-		value: "5202"
-	},
-	{
-		label: "遵义市",
-		value: "5203"
-	},
-	{
-		label: "安顺市",
-		value: "5204"
-	},
-	{
-		label: "毕节市",
-		value: "5205"
-	},
-	{
-		label: "铜仁市",
-		value: "5206"
-	},
-	{
-		label: "黔西南布依族苗族自治州",
-		value: "5223"
-	},
-	{
-		label: "黔东南苗族侗族自治州",
-		value: "5226"
-	},
-	{
-		label: "黔南布依族苗族自治州",
-		value: "5227"
-	}
-]

+ 104 - 68
h5_web/pages/evaluationIntention/evaluationIntention.vue

@@ -32,8 +32,8 @@
 				ref="intentionForm"
 				label-position="top"
 			>
-				<u-form-item label="工作城市" prop="city" required>
-					<u-input v-model="intentionForm.city" type="select" @click="workCityClick" placeholder="请选择工作城市"/>
+				<u-form-item label="工作城市" prop="cityName" required>
+					<u-input v-model="intentionForm.workCity" type="select" @click="workCityClick" placeholder="请选择工作城市"/>
 					<!-- <u-select v-model="cityShow" :list="cityList" @confirm="cityConfirm"></u-select> -->
 					<u-city-select v-if="cityShow" v-model="cityShow" :default-region="defaultRegion" @city-change="cityConfirm"/>
 				</u-form-item>
@@ -45,9 +45,13 @@
 					<u-input v-model="intentionForm.industry" type="select" @click="industryShow = true" placeholder="请选择期望行业"/>
 					<u-select v-model="industryShow" :list="industryList" @confirm="industryConfirm"></u-select>
 				</u-form-item> -->
-				<u-form-item label="薪资要求" prop="salary" required>
-					<u-input v-model="intentionForm.salary" type="select" @click="salaryShow = true" placeholder="请选择薪资要求"/>
-					<u-select v-model="salaryShow" :list="salaryList" @confirm="salaryConfirm"></u-select>
+				<u-form-item label="最低薪资要求(k)" prop="expectedLowestSalary" required>
+					<u-input v-model="intentionForm.expectedLowestSalary" type="select" @click="lowestsalaryShow = true" placeholder="请选择薪资要求"/>
+					<u-select v-model="lowestsalaryShow" :list="salaryList" @confirm="salaryLowestConfirm" :default-value="[Number(intentionForm.expectedLowestSalary) - 1]"></u-select>
+				</u-form-item>
+				<u-form-item label="最高薪资要求(k)" prop="expectedHighestSalary" required>
+					<u-input v-model="intentionForm.expectedHighestSalary" type="select" @click="highestSalaryShow = true" placeholder="请选择薪资要求"/>
+					<u-select v-model="highestSalaryShow" :list="salaryList" @confirm="salaryHighestConfirm" :default-value="[Number(intentionForm.expectedHighestSalary) - 1]"></u-select>
 				</u-form-item>
 			</u-form>
 			<view class="evaluate-intention-intention-submit">
@@ -83,7 +87,6 @@
 
 <script>
 	import { industry } from './industry.js';
-	import { city } from './city.js'
 	export default {
 		data() {
 			return {
@@ -97,50 +100,67 @@
 				],
 				tabCur: 0,
 				intentionForm: {
-					city: '',
+					provinceName: '',
+					provinceId: '',
+					cityName: '',
 					cityId: '',
-					position: '',
-					positionId: '',
-					industry: '',
-					industryId: '',
-					salary: '',
-					salaryId: ''
+					areaName : '',
+					areaId: '',
+					// position: '',
+					// positionId: '',
+					// industry: '',
+					// industryId: '',
+					expectedLowestSalary: '',
+					expectedHighestSalary: '',
+					workCity: ''
 				},
 				defaultRegion: [],
 				intentionRules: {
-					city: [
+					cityName: [
 						{ 
 							required: true, 
 							message: '请选择您的工作城市', 
 							trigger: ['change','blur']
 						}
 					],
-					position: [
+					// position: [
+					// 	{
+					// 		required: true, 
+					// 		message: '请选择您的期望职位', 
+					// 		trigger: ['change', 'blur']
+					// 	}
+					// ],
+					// industry: [
+					// 	{
+					// 		required: true, 
+					// 		message: '请选择您的期望行业', 
+					// 		trigger: ['change', 'blur']
+					// 	}
+					// ],
+					expectedLowestSalary: [
 						{
-							required: true, 
-							message: '请选择您的期望职位', 
+							required: true,
+							message: '请选择您的最低薪资要求', 
 							trigger: ['change', 'blur']
 						}
 					],
-					industry: [
+					expectedHighestSalary: [
 						{
-							required: true, 
-							message: '请选择您的期望行业', 
+							required: true,
+							message: '请选择您的最高薪资要求', 
 							trigger: ['change', 'blur']
-						}
-					],
-					salary: [
+						},
 						{
-							required: true,
-							message: '请选择您的期望薪资', 
+							validator: (rule, value, callback) => {
+								return Number(value) >= Number(this.intentionForm.expectedLowestSalary);
+							},
+							message: '最高薪资要求不能小于最低薪资要求',
 							trigger: ['change', 'blur']
 						}
 					]
 				},
 				// 城市下拉显示
 				cityShow: false,
-				// 城市列表
-				cityList: city,
 				// 职位下拉显示
 				positionShow: false,
 				// 职位列表
@@ -163,30 +183,10 @@
 				// 行业列表
 				industryList: industry,
 				// 薪资下拉显示
-				salaryShow: false,
+				highestSalaryShow: false,
+				lowestsalaryShow: false,
 				// 薪资列表
-				salaryList: [
-					{
-						value: 1,
-						label: '1k ~ 3k'
-					},
-					{
-						value: 2,
-						label: '3k ~ 5k'
-					},
-					{
-						value: 3,
-						label: '5k ~ 7k'
-					},
-					{
-						value: 4,
-						label: '7k ~ 10k'
-					},
-					{
-						value: 5,
-						label: '10k ~ 以上'
-					}
-				],
+				salaryList: [],
 				// 自我评价
 				evaluateForm: {
 					content: ''
@@ -198,6 +198,16 @@
 			if (page.tabCur) {
 				this.tabCur = Number(page.tabCur)
 			}
+			// 设置薪资范围
+			let numList = []
+			for(let i = 1; i < 51; i++) {
+				const obj = {
+					value: String(i),
+					label: String(i)
+				}
+				numList.push(obj)
+			}
+			this.salaryList = numList
 		},
 		// 必须要在onReady生命周期,因为onLoad生命周期组件可能尚未创建完毕
 		onReady() {
@@ -212,11 +222,21 @@
 			getMemberinfo(){
 				this.$u.api.getmemberinfo().then(res => {
 					if (res.code === 200){
-						this.evaluateForm.content = res.data.selfAssessment
-						this.intentionForm.city = res.data.workCity
-						this.intentionForm.position = res.data.expectedPost
-						this.intentionForm.industry = res.data.expectedIndustry
-						this.intentionForm.salary = (res.data.expectedLowestSalary + 'k ~ ' + res.data.expectedHighestSalary + 'k')
+						const data = res.data;
+						this.evaluateForm.content = data.selfAssessment
+						// this.intentionForm.position = res.data.expectedPost
+						// this.intentionForm.industry = res.data.expectedIndustry
+						this.intentionForm.expectedLowestSalary = String(data.expectedLowestSalary)
+						this.intentionForm.expectedHighestSalary = String(data.expectedHighestSalary)
+						if (data.provinceName) {
+							this.intentionForm.workCity = data.provinceName + '-' + data.cityName + '-' + data.areaName
+						}
+						this.intentionForm.provinceId = data.provinceId
+						this.intentionForm.provinceName = data.provinceName
+						this.intentionForm.cityId = data.cityId
+						this.intentionForm.cityName = data.cityName
+						this.intentionForm.areaId = data.areaId
+						this.intentionForm.areaName = data.areaName
 					} else {
 						this.$refs.uToast.show({
 							title: res.msg,
@@ -235,7 +255,13 @@
 			 * @param { Object } item
 			 */
 			cityConfirm(item) {
-				this.intentionForm.city = item.province.label + '-' + item.city.label + '-' + item.area.label
+				this.intentionForm.provinceName = item.province.label;
+				this.intentionForm.provinceId = item.province.value;
+				this.intentionForm.cityName = item.city.label;
+				this.intentionForm.cityId = item.city.value;
+				this.intentionForm.areaName  = item.area.label;
+				this.intentionForm.areaId = item.area.value;
+				this.intentionForm.workCity = item.province.label + '-' + item.city.label + '-' + item.area.label
 			},
 			/**
 			 * 职位下拉
@@ -254,12 +280,18 @@
 				this.intentionForm.industryId = item[0].value
 			},
 			/**
-			 * 薪资下拉
+			 * 最低薪资下拉
+			 * @param {Object} item
+			 */
+			salaryLowestConfirm(item) {
+				this.intentionForm.expectedLowestSalary = item[0].label
+			},
+			/**
+			 * 最高薪资下拉
 			 * @param {Object} item
 			 */
-			salaryConfirm(item) {
-				this.intentionForm.salary = item[0].label
-				this.intentionForm.salaryId = item[0].value
+			salaryHighestConfirm(item) {
+				this.intentionForm.expectedHighestSalary = item[0].label
 			},
 			/**
 			 * 跳转到指定页面
@@ -267,6 +299,9 @@
 			jumpPage(url) {
 				this.$u.route(url)
 			},
+			/**
+			 * 提交求职意向
+			 */
 			submitIntention() {
 				this.$refs.intentionForm.validate(valid => {
 					if (valid) {
@@ -277,11 +312,14 @@
 							title: '数据提交中,请等待'
 						})
 						this.$u.api.resume.submitJobIntention({
-							workCity: form.city,
-							expectedPost: form.position,
-							expectedIndustry: form.industry,
-							expectedLowestSalary: form.salary.split(' ~ ')[0].replace('k', ''),
-							expectedHighestSalary: form.salary.split(' ~ ')[1].replace('k', '')
+							provinceName: form.provinceName,
+							provinceId: form.provinceId,
+							cityName: form.cityName,
+							cityId: form.cityId,
+							areaName : form.areaName ,
+							areaId: form.areaId,
+							expectedLowestSalary: form.expectedLowestSalary,
+							expectedHighestSalary: form.expectedHighestSalary
 						}).then(res => {
 							if (res.code === 200) {
 								this.$refs.uToast.show({
@@ -355,9 +393,7 @@
 			 * 城市下拉
 			 */
 			workCityClick() {
-				if (this.intentionForm.city) {
-					this.defaultRegion = this.intentionForm.city.split('-');
-				}
+				this.defaultRegion = [this.intentionForm.provinceName, this.intentionForm.cityName, this.intentionForm.areaName ]
 				this.cityShow = true;
 			}
 		}

+ 4 - 4
h5_web/pages/index/index.scss

@@ -138,18 +138,18 @@
         
         .news-text{
           &-title{
-            margin-bottom: 12rpx;
+            margin-bottom: 20rpx;
             font-size: 30rpx;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
             color: #000000;
-            line-height: 41rpx;
+            line-height: 44rpx;
           }
           &-foot{
             justify-content: space-between;
             
             view:first-child{
-              font-size: 20rpx;
+              font-size: 24rpx;
               font-family: PingFangSC-Regular, PingFang SC;
               font-weight: 400;
               color: #8C8C8C;
@@ -158,7 +158,7 @@
             }
             
             view:last-child{
-              font-size: 20rpx;
+              font-size: 24rpx;
               font-family: PingFangSC-Regular, PingFang SC;
               font-weight: 400;
               color: #8C8C8C;

+ 3 - 4
h5_web/pages/mine/mine.scss

@@ -114,16 +114,16 @@
 				text-align: center;
 				view {
 					&:first-child {
-						font-size: 70rpx;
+						font-size: 50rpx;
 						font-weight: 500;
 						text {
-							font-size: 38rpx;
+							font-size: 32rpx;
 							font-weight: 400;
 							color: #6E6E6E;
 						}
 					}
 					&:last-child {
-						font-size: 32rpx;
+						font-size: 30rpx;
 						margin-top: 10rpx;
 						font-weight: 400;
 					}
@@ -155,7 +155,6 @@
 		&-cell1 {
 			width: calc(100% - 60rpx);
 			margin: 20rpx auto;
-			padding: 0 34rpx;
 			background-color: #fff;
 			border-radius: 10rpx;
 			.cell-icon {

+ 21 - 21
h5_web/pages/myResume/myResume.scss

@@ -25,7 +25,7 @@
 				display: flex;
 				margin-top: 20rpx;
 				color: #4C4C4C;
-				font-size: 24rpx;
+				font-size: 26rpx;
 				.position {
 					color: #FF6901;
 					margin-left: 10rpx;
@@ -40,12 +40,12 @@
 		border-bottom: solid 1px #DBDBDB;
 		padding: 38rpx 0;
 		&-left {
-			font-size: 24rpx;
+			font-size: 26rpx;
 			color: #4C4C4C;
 			line-height: 50rpx;
 			font-weight: 400;
 			.title {
-				font-size: 32rpx;
+				font-size: 34rpx;
 				color: #000000;
 			}
 		}
@@ -64,12 +64,12 @@
 		padding: 38rpx 0;
 		
 		&-left {
-			font-size: 24rpx;
+			font-size: 26rpx;
 			color: #4C4C4C;
 			line-height: 50rpx;
 			font-weight: 400;
 			.title {
-				font-size: 32rpx;
+				font-size: 34rpx;
 				color: #000000;
 			}
 			.supple {
@@ -92,11 +92,11 @@
 		
 		&-left {
 			.title {
-				font-size: 32rpx;
+				font-size: 34rpx;
 				color: #000000;
 			}
 			.supple {
-				font-size: 24rpx;
+				font-size: 26rpx;
 				color: #7B7B7B;
 				line-height: 50rpx;
 			}
@@ -110,7 +110,7 @@
 		&-info {
 			.rsei-box {
 				color: #666666;
-				font-size: 24rpx;
+				font-size: 26rpx;
 				margin-top: 20rpx;
 				line-height: 40rpx;
 			}
@@ -118,7 +118,7 @@
 				color: #2a82e4;
 				text-align: center;
 				margin-top: 30rpx;
-				font-size: 24rpx;
+				font-size: 26rpx;
 			}
 		}
 	}
@@ -131,11 +131,11 @@
 			justify-content: space-between;
 			margin-bottom: 12rpx;
 			image {
-				width: 28rpx;
-				height: 28rpx;
+				width: 32rpx;
+				height: 32rpx;
 			}
 			.title {
-				font-size: 32rpx;
+				font-size: 34rpx;
 				color: #000;
 				font-weight: 400;
 				font-family: 'PingFangSC-Regular, PingFang SC';
@@ -149,11 +149,11 @@
 				&-left {
 					font-size: 24rpx;
 					color: #7B7B7B;
-					line-height: 40rpx;
+					line-height: 44rpx;
 					view {
 						&:first-child {
 							color: #4C4C4C;
-							font-size: 26rpx;
+							font-size: 28rpx;
 						}
 						text {
 							color: #EF651F;
@@ -163,7 +163,7 @@
 				&-right {
 					display: flex;
 					color: #7B7B7B;
-					font-size: 20rpx;
+					font-size: 24rpx;
 					view {
 						&:first-child {
 							margin-right: 10rpx;
@@ -191,11 +191,11 @@
 			justify-content: space-between;
 			margin-bottom: 12rpx;
 			image {
-				width: 28rpx;
-				height: 28rpx;
+				width: 32rpx;
+				height: 32rpx;
 			}
 			.title {
-				font-size: 32rpx;
+				font-size: 34rpx;
 				color: #000;
 				font-weight: 400;
 				font-family: 'PingFangSC-Regular, PingFang SC';
@@ -207,12 +207,12 @@
 				&-left {
 					font-size: 24rpx;
 					color: #7B7B7B;
-					line-height: 40rpx;
+					line-height: 42rpx;
 					max-width: 50%;
 					view {
 						&:first-child {
 							color: #4C4C4C;
-							font-size: 26rpx;
+							font-size: 28rpx;
 						}
 						text {
 							color: #EF651F;
@@ -222,7 +222,7 @@
 				&-right {
 					display: flex;
 					color: #7B7B7B;
-					font-size: 20rpx;
+					font-size: 24rpx;
 					view {
 						&:first-child {
 							margin-right: 10rpx;

+ 7 - 6
h5_web/pages/myResume/myResume.vue

@@ -42,8 +42,9 @@
 		<view class="resume-job-intention">
 			<view class="resume-job-intention-left">
 				<view class="title">期望薪资</view>
-				<view v-if="memberinfo.workCity">{{ memberinfo.workCity }}  {{ `${memberinfo.expectedLowestSalary}k ~ ${memberinfo.expectedHighestSalary}k` }}</view>
-				<view class="supple" v-else>暂末补充求意向… </view>
+				<view v-if="memberinfo.cityName && memberinfo.provinceName && memberinfo.areaName">{{ `${memberinfo.provinceName}-${memberinfo.cityName}-${memberinfo.areaName}` }}</view>
+				<view v-if="memberinfo.expectedLowestSalary && memberinfo.expectedHighestSalary">{{ `${memberinfo.expectedLowestSalary}k ~ ${memberinfo.expectedHighestSalary}k` }}</view>
+				<view class="supple" v-if="!memberinfo.workCity && !memberinfo.expectedLowestSalary && !memberinfo.expectedLowestSalary">暂末补充求意向… </view>
 			</view>
 			<view class="resume-job-intention-right">
 				<image src="../../static/img/edit-icon.png" mode="" @click="jumpPage('/pages/evaluationIntention/evaluationIntention', { tabCur: 0 })"></image>
@@ -69,7 +70,7 @@
 		<view class="resume-work-experience">
 			<view class="resume-work-experience-header">
 				<view class="title">工作经历</view>
-				<image src="../../static/img/add-experience-icon.png" mode="" @click="jumpPage('/pages/myResume/addExperience')"></image>
+				<!-- <image src="../../static/img/add-experience-icon.png" mode="" @click="jumpPage('/pages/myResume/addExperience')"></image> -->
 			</view>
 			<view class="resume-work-experience-list" :class="isExpand ? 'height-auto' : 'height-130'">
 				<view class="rwel-item" v-for="(item, index) in workExperice" :key="index">
@@ -81,7 +82,7 @@
 					<view class="rwel-item-right">
 						<view>{{ item.dateLine }}</view>
 						<view>
-							<u-icon name="arrow-right" color="#7B7B7B" size="20" @click="jumpPage('/pages/myResume/addExperience')"/>
+							<!-- <u-icon name="arrow-right" color="#7B7B7B" size="20" @click="jumpPage('/pages/myResume/addExperience')"/> -->
 						</view>
 					</view>
 				</view>
@@ -95,7 +96,7 @@
 		<view class="resume-train-experience">
 			<view class="resume-train-experience-header">
 				<view class="title">培训与教育经历</view>
-				<image src="../../static/img/add-experience-icon.png" mode="" @click="jumpPage('/pages/myResume/addEducation')"/>
+				<!-- <image src="../../static/img/add-experience-icon.png" mode="" @click="jumpPage('/pages/myResume/addEducation')"/> -->
 			</view>
 			<view class="resume-train-experience-list" :class="isTrainExpand ? 'height-auto' : 'height-130'">
 				<view class="rtel-item"  v-for="(item, index) in trainExperice" :key="index">
@@ -108,7 +109,7 @@
 					<view class="rtel-item-right">
 						<view>{{ item.dateLine }}</view>
 						<view>
-							<u-icon name="arrow-right" color="#7B7B7B" size="20" @click="jumpPage('/pages/myResume/addEducation')"/>
+							<!-- <u-icon name="arrow-right" color="#7B7B7B" size="20" @click="jumpPage('/pages/myResume/addEducation')"/> -->
 						</view>
 					</view>
 				</view>

+ 1 - 1
h5_web/pages/newsDetails/newsDetails.vue

@@ -83,7 +83,7 @@
 				display: flex;
 				justify-content: space-between;
 				color: #6F6F6F;
-				font-size: 20rpx;
+				font-size: 24rpx;
 			}
 		}
 		&-content {

+ 1 - 1
h5_web/pages/newsInformation/newsInformation.vue

@@ -107,7 +107,7 @@
 				.date {
 					margin-top: 12rpx;
 					color: #6F6F6F;
-					font-size: 20rpx;
+					font-size: 24rpx;
 					display: flex;
 					justify-content: space-between;
 					view {

+ 1 - 1
h5_web/pages/recruitment/scss/recruitment.scss

@@ -12,7 +12,7 @@ page{background-color: #f2f2f2;}
   
   &-recommend{
     &-card{
-      margin: 20rpx 30rpx 0;
+      margin: 20rpx 30rpx 0!important;
       .recommend-card-head{
         display: flex;
         flex-wrap: wrap;

+ 1 - 1
h5_web/pages/schools/schools.scss

@@ -37,7 +37,7 @@
 					}
 				}
 				.title {
-					font-size: 22rpx;
+					font-size: 24rpx;
 					color: #9B9B9B;
 					.name {
 						font-size: 32rpx;

+ 1 - 1
h5_web/uview-ui/components/u-cell-item/u-cell-item.vue

@@ -237,7 +237,7 @@ export default {
 
 .u-cell__right-icon-wrap {
 	margin-left: 10rpx;
-	color: #969799;
+	color: #d2d3d5;
 	font-size: 28rpx;
 }