修改以及对接退役军人码/申请退役军人码/修改城市选择器/增加积分规则页面

h5_web/common/apiurl.js

@@ -125,6 +125,13 @@ const apiurl = {
 	evaluation: {
 		// 获取我的评价列表
 		getEvaluationListUrl: ''
+	},
+	/**
+	 * 我的
+	 */
+	mine: {
+		// 提交就业情况
+		employmentConditionUrl: '/employmentcollect'
 	}
 }
 

h5_web/common/config.js

@@ -4,6 +4,7 @@
 let base = '';
 if(process.env.NODE_ENV=="development"){
 	base = 'https://wx.hw.hongweisoft.com/veterans/app';
+	// base = 'http://172.16.90.110:7200/app';
 } else if(process.env.NODE_ENV=="production"){
 	base = 'https://wx.hw.hongweisoft.com/veterans/app';
 	// base = 'https://veterwebpro.hw.hongweisoft.com/veterans-prod-api/app';

h5_web/common/http.api.js

@@ -119,6 +119,11 @@ const install = (Vue, vm) => {
 	let evaluation = {
 		getEvaluationList: (params = {}) => vm.$u.get(apiurl.evaluation.getEvaluationListUrl, params)
 	}
+	
+	// 我的
+	let mine = {
+		submitEmploymentCondition: (params = {}) => vm.$u.post(apiurl.mine.employmentConditionUrl, params)
+	}
 	// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
 	vm.$u.api = {
 		test,
@@ -153,7 +158,8 @@ const install = (Vue, vm) => {
 		interview,
 		resume,
 		modifyUserInfo,
-		evaluation
+		evaluation,
+		mine
 	};
 }
 

h5_web/pages.json

@@ -355,9 +355,10 @@
 		}, {
 			"path": "pages/schoolDetails/schoolDetails",
 			"style": {
-				"navigationBarTitleText": "学校详情",
+				"navigationBarTitleText": "学院详情",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#fff"
+				"navigationBarBackgroundColor": "#3D5D4C",
+				"navigationBarTextStyle": "white"
 			}
 		}, {
 			"path": "pages/professionalDetails/professionalDetails",
@@ -398,6 +399,14 @@
 				"navigationBarBackgroundColor": "#3D5D4C",
 				"navigationBarTextStyle": "white"
 			}
+		}, {
+			"path": "pages/integralRule/integralRule",
+			"style": {
+				"navigationBarTitleText": "积分规则",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+
 		}
 	],
 	"globalStyle": {

h5_web/pages/applyEducationCode/applyEducationCode.vue

@@ -37,25 +37,25 @@
 				</u-radio-group>
 			</u-form-item>
 			<u-form-item label="户籍地：" prop="veteHousehRegi" :required="true">
-				<u-input v-model="form.veteHousehRegi" placeholder="请选择您的户籍地" type="select" @click="regionShow = true"/>
+				<u-input v-model="form.veteHousehRegi" placeholder="请选择您的户籍地" type="select" @click="regionClick"/>
 			</u-form-item>
-			<u-form-item label="户籍区域：" prop="" :required="true">
+			<u-form-item label="户籍区域：" prop="veteHousehArea" :required="true">
 				<u-input v-model="form.veteHousehArea" placeholder="请选择您的户籍区域" type="select" @click="areaShow = true"/>
 			</u-form-item>
 			<u-form-item label="就业状况：" prop="jobStatus" :required="true">
-				<u-radio-group v-model="form.jobStatus" @change="employmentStatusChange">
+				<u-radio-group v-model="form.jobStatus">
 					<u-radio v-for="(item, index) in employmentStatusList" :key="index" :name="item.value">
 						{{ item.label }}
 					</u-radio>
 				</u-radio-group>
 			</u-form-item>
-			<u-form-item label="薪资范围：" prop="salaryRange" :required="true">
-				<u-input v-model="form.salaryRange" placeholder="请选择您的薪资范围" type="select" @click="salaryRangeShow = true"/>
+			<u-form-item label="薪资范围：" prop="salaryRangeName" :required="true">
+				<u-input v-model="form.salaryRangeName" placeholder="请选择您的薪资范围" type="select" @click="salaryRangeShow = true"/>
 			</u-form-item>
 			<u-form-item label="现家庭详细地址：" label-position="top" label-width="200" label-align="left" prop="veteResiAddress" :required="true">
 				<u-input v-model="form.veteResiAddress" placeholder="请输入您的现家庭详细地址" />
 			</u-form-item>
-			<u-form-item label="近期1寸免冠照片：" label-position="top" label-width="200" label-align="left" prop="national">
+			<u-form-item label="近期1寸免冠照片：" label-position="top" label-width="200" label-align="left" :required="true">
 				<view class="pic">
 					<u-upload
 						ref="uUpload"
@@ -99,7 +99,7 @@
 		<u-select v-model="politOutlookShow" :list="politOutlookList" @confirm="politOutlookChange" :default-value="politOutlookIndex"/>
 		
 		<!-- 户籍地下拉 -->
-		<city-select-province v-model="regionShow" :default-region="['贵州省', '贵阳市']" @city-change="regionConfirm"/>
+		<city-select-province v-model="regionShow" :default-region="[]" @city-change="regionConfirm"/>
 		
 		<!-- 户籍区域下拉 -->
 		<u-city-select v-model="areaShow" :default-region="[]" @city-change="areaConfirm"/>
@@ -123,8 +123,7 @@
 					veteName: '',
 					veteIdCard: '',
 					veteSex: '',
-					national: '',
-					phoneNumber: '',
+					nation: '',
 					qqNum: '',
 					wxNum: '',
 					degrEduc: '',
@@ -138,12 +137,16 @@
 					veteResiAddress: '',
 					veteDateBirth:'',
 					veteStatus: '1',
-					veteAttribute: '',
 					files: [],
 					jobStatus: '',
-					jobStatusId: '',
 					salaryRange: '',
-					salaryRangeId: ''
+					salaryRangeName: '',
+					provinceId: '',
+					provinceName: '',
+					cityId: '',
+					cityName: '',
+					areaId: '',
+					areaName: ''
 				},
 				// 表单验证
 				rules: {
@@ -212,7 +215,7 @@
 							trigger: ['change', 'blur']
 						}
 					],
-					salaryRange: [
+					salaryRangeName: [
 						{
 							required: true,
 							message: '请选择薪资范围',
@@ -237,6 +240,7 @@
 				politOutlookIndex: [],
 				// 户籍地
 				regionShow: false,
+				regionDefault: [],
 				// 户籍类型
 				houseTypeShow: false,
 				houseTypeList: [],
@@ -245,6 +249,7 @@
 				areaShow: false,
 				// 薪资范围
 				salaryRangeShow: false,
+				salaryRangeIndex: [],
 				salaryRangeList: [],
 				salaryRangeIndex: [],
 				// 就业状态
@@ -270,33 +275,46 @@
 			getVeteEducData(){
 				this.$u.api.getVeteEducData().then(res => {
 					if(res.code == 200){
-						for(let key  in res.data.veteEduc) {
+						const data = res.data
+						for(let key  in data.veteEduc) {
 							if(key !== 'files'){
-								this.form[key] = res.data.veteEduc[key];
+								this.form[key] = data.veteEduc[key];
 							}
 						};
-						if (res.data.veteEduc) {
-							this.form.veteSex = res.data.veteEduc.veteSex === 0 ? '男' : '女';
+						if (data.veteEduc) {
+							this.form.veteSex = data.veteEduc.veteSex === 0 ? '男' : '女';
 							// 文化程度
 							this.degrEducList.forEach((item, index) => {
-								if (item.text === res.data.veteEduc.degrEducId) {
+								if (item.text === data.veteEduc.degrEducId) {
 									this.degrEducIndex = [index]
 								}
 							})
 							// 政治面貌
 							this.politOutlookList.forEach((item, index) => {
-								if (item.text === res.data.veteEduc.politOutlookId) {
+								if (item.text === data.veteEduc.politOutlookId) {
 									this.politOutlookIndex = [index]
 								}
 							})
 							// 户籍类型
 							this.houseTypeList.forEach((item, index) => {
-								if (item.text === res.data.veteEduc.houseTypeId) {
+								if (item.text === data.veteEduc.houseTypeId) {
 									this.houseTypeIndex = [index]
 								}
 							})
+							// 户籍区域
+							if(data.veteEduc.provinceName && data.veteEduc.cityName && data.veteEduc.areaName) {
+								this.form.veteHousehArea = data.veteEduc.provinceName + '-' + data.veteEduc.cityName + '-' + data.veteEduc.areaName;
+							}
+							// 薪资范围
+							this.form.salaryRange = data.veteEduc.salaryRange
+							this.salaryRangeList.forEach((item, index) => {
+								if (Number(item.value) === Number(data.veteEduc.salaryRange)) {
+									this.salaryRangeIndex = [index]
+									this.form.salaryRangeName = item.label
+								}
+							})
 						}
-						this.form.files = res.data.files;
+						this.form.files = data.files;
 					}
 				});
 			},
@@ -350,11 +368,23 @@
 			regionConfirm(e){
 				this.form.veteHousehRegi = `${e.province.label}-${e.city.label}`
 			},
+			/**
+			 * 户籍地点击
+			 */
+			regionClick() {
+				this.regionShow = true
+			},
 			/**
 			 * 户籍区域
 			 */
 			areaConfirm(e) {
 				this.form.veteHousehArea = `${e.province.label}-${e.city.label}-${e.area.label}`
+				this.form.provinceId = e.province.value
+				this.form.provinceName = e.province.label
+				this.form.cityId = e.city.value
+				this.form.cityName = e.city.label
+				this.form.areaId = e.area.value
+				this.form.areaName = e.area.label
 			},
 			/**
 			 * 获取户籍类别
@@ -381,17 +411,6 @@
 					}
 				})
 			},
-			/**
-			 * 就业状态单选触发
-			 * @param { String } val
-			 */
-			employmentStatusChange(val) {
-				// this.employmentStatusList.forEach(item => {
-				// 	if (item.value === val) {
-				// 		this.form.jobStatus = 
-				// 	}
-				// })
-			},
 			/**
 			 * 获取薪资范围
 			 */
@@ -412,8 +431,8 @@
 			 * @param {Object} e
 			 */
 			salaryRangeChange(e) {
-				this.form.salaryRange = e[0].label
-				this.form.salaryRangeId = e[0].value
+				this.form.salaryRangeName = e[0].label
+				this.form.salaryRange = e[0].value
 			},
 			/**
 			 * 就业状态
@@ -506,7 +525,6 @@
 				});
 			},
 			submit() {
-				console.log(this.form)
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
 						if (this.form.files.length < 1){

h5_web/pages/basicTraining/basicTrainingDetails/basicTrainingDetails.vue

@@ -40,7 +40,7 @@
 					  autoplay: false,
 					  playsinline: true,
 					  url: this.details.videoUrl,
-					  "screenShot": true,
+					  screenShot: true,
 					  fluid: true,
 					  videoInit: true,
 					  enableVideoDbltouch: true,

h5_web/pages/index/index.scss

@@ -93,6 +93,10 @@
   }
 }
 
+.notice {
+	padding: 16rpx 30rpx 0;
+}
+
 .service{
   padding: 20rpx 30rpx;
   

h5_web/pages/index/index.vue

@@ -29,6 +29,12 @@
       </view>
     </view>
     
+		<!-- 滚动通知 -->
+		<view class="notice">
+			<u-notice-bar mode="horizontal" type="none" :list="noticeList" bg-color="#fff" duration="1000"/>
+		</view>
+		
+		<!-- 宫格 -->
     <view class="service">
       <view class="service-body u-flex u-flex-wrap u-row-left">
         <!-- <view class="service-item" @click="openPage('pages/policyNews/policyNews')"> -->
@@ -67,6 +73,7 @@
       </view>
     </view>
     
+		<!-- 新闻动态 -->
     <view class="news">
       <u-card class="news-list"
       	:body-style="{'padding-top':0}"
@@ -112,7 +119,7 @@
       :inactive-color="tabbarConfig.inactiveColor"
       :active-color="tabbarConfig.activeColor"
       :mid-button-size="tabbarConfig.midButtonSize"
-    ></u-tabbar>
+    />
 	</view>
 </template>
 
@@ -124,18 +131,20 @@
 			return {
         headerTopKeyword: '',
 				paginationConfig:{
-					  pageNo: 1,
-					  pageSize: 10
+					pageNo: 1,
+					pageSize: 10
 				},
+				// 轮播图
 				bannerList: [],
+				// 新闻列表
 				newsList:[],
-				noticeList:['贵州轮胎股份有限公司对您感兴趣，为您提供了职位。','您有一个面试邀请'],
+				// 消息通知
+				noticeList:['贵州轮胎股份有限公司对您感兴趣，为您提供了职位。' , '您有一个面试邀请', '到你面试了'],
         tabbarConfig: tabbarconfig
 			}
 		},
 		onLoad() {
 			// console.log(this.$u.config.v);
-			
 		},
 		onShow() {
 			this.getBannerList();
@@ -160,8 +169,8 @@
 			getNewsList(){
 				let params ={
 					// artCategoryId:2,
-					pageNum:1,
-					pageSize:10
+					pageNum: 1,
+					pageSize: 10
 				}
 				this.$u.api.getIndexNewsList(params)
 				.then(res=>{

h5_web/pages/integralRule/integralRule.vue

@@ -0,0 +1,52 @@
+<!-- 积分规则 -->
+<template>
+	<view class="rules">
+		<!-- 导航栏 -->
+		<u-navbar class="evaluate-intention-bar" back-text="" title="积分规则" :background="background" title-color="#fff" back-icon-color="#fff"/>
+		<view class="rules-list">
+			<view>
+				1，完成各段时间采集信息提交  +50
+			</view>
+			<view>
+				2，教师评价大于3星，+50
+			</view>
+			<view>
+				3，完成一项课程（看完一个课程中所有视频），  +5
+			</view>
+			<view>
+				4，完成适应性培训   +100
+			</view>
+			<view>
+				5，上传证书及成绩（每张）    +10
+			</view>
+			<view>
+				6，开展一项技能培训（某技能报名成功并开班）  +20
+			</view>
+			<view>
+				7，通过平台入职   +30
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				background: {
+					backgroundColor: '#FE7C0F'
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.rules {
+	padding: 30rpx;
+	
+	&-list {
+		line-height: 50rpx;
+	}
+}
+</style>

h5_web/pages/mine/mine.scss

@@ -44,13 +44,6 @@
 					color: #fff;
 					font-size: 40rpx;
 					font-family: 'PingFangSC-Medium, PingFang SC';
-					// width: 180rpx;
-					// overflow: hidden !important;
-					// word-break: break-all;  /* break-all(允许在单词内换行。) */
-					// text-overflow: ellipsis;  /* 超出部分省略号 */
-					// display: -webkit-box; /** 对象作为伸缩盒子模型显示 **/
-					// -webkit-box-orient: vertical; /** 设置或检索伸缩盒对象的子元素的排列方式 **/
-					// -webkit-line-clamp: 1; /** 显示的行数 **/
 				}
 			}
 			
@@ -84,7 +77,7 @@
 			display: flex;
 			justify-content: space-between;
 			width: calc(100% - 220rpx);
-			margin: 30rpx auto;
+			margin: 50rpx auto;
 			font-size: 24rpx;
 			color: rgba(255, 255, 255, .6);
 			&-item {

h5_web/pages/mycode/mycode.scss

@@ -0,0 +1,113 @@
+/* 退役军人码 */
+.bg {
+	z-index: -1;
+	width: calc(100% - 60rpx);
+	height: auto;
+	position: fixed;
+	left: 30rpx;
+	top: 200rpx;
+}
+
+.header {
+	padding: 0 30rpx;
+	height: 94rpx;
+	line-height: 74rpx;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	border-bottom: solid 20rpx #F2F2F2;
+	
+	&-left {
+		display: flex;
+		align-items: center;
+		
+		&-point {
+			width: 14rpx;
+			height: 14rpx;
+			background-color: #B3B3B3;
+			border-radius: 50%;
+			margin-right: 22rpx;
+		}
+		
+		&-tips {
+			color: #4B4B4B;
+			font-size: 24rpx;
+			margin-right: 20rpx;
+		}
+		
+		&-view {
+			color: #EF651F;
+			font-size: 24rpx;
+			
+			.icon {
+				margin-left: 7rpx;
+			}
+		}
+	}
+	
+	&-close {
+		align-content: flex-end;
+	}
+}
+.qrimg {
+	min-height: 100rpx;
+}
+
+.content {
+	text-align: center;
+	padding: 60vh 24rpx 24rpx;
+}
+
+.content.fixed {
+	position: absolute;
+	left: 0;
+	top: 60vh;
+	right: 0;
+	padding-top: 0;
+}
+
+.content .tip {
+	font-size: 32rpx;
+	margin: 0 40rpx;
+	text-align: left;
+	text-align: center;
+	color: #3D5D4C;
+}
+
+.code-text {
+	margin: 0 auto;
+	text-align: center;
+}
+
+.code-id {
+	font-size: 36rpx;
+	font-weight: 500;
+	color: #000000;
+}
+
+.thanks {
+	margin-top: 100rpx;
+	font-size: 36rpx;
+	color: #3D5D4C;
+}
+.no-submit {
+	position: absolute;
+	left: 0;
+	top: 40vh;
+	right: 0;
+	padding-top: 0;
+}
+.submit {
+	width: 388rpx;
+	height: 80rpx;
+	line-height: 80rpx;
+	text-align: center;
+	margin: 276rpx auto 0;
+	border-radius: 40rpx;
+	background-color: #028DFE;
+	color: #fff;
+	font-size: 30rpx;
+}
+.condition-form {
+	padding: 30rpx;
+}

h5_web/pages/mycode/mycode.vue

@@ -1,7 +1,17 @@
 <!-- 0审核中,1不通过,2通过,9未提交 -->
 	<template>
 		<view>
-			<image class="bg" src="../../static/img/mycode-bg.png" mode="widthFix"></image>
+			<image class="bg" src="../../static/img/mycode-bg-copy.png" mode="widthFix"></image>
+			<view class="header" v-if="isHeaderShow">
+				<view class="header-left">
+					<view class="header-left-point"></view>
+					<view class="header-left-tips">请提交采集信息，提交后可获得进步积分</view>
+					<view class="header-left-view" @click="viewDetails">查看详细<u-icon class="icon" name="arrow-right" size="20"/></view>
+				</view>
+				<view class="header-right">
+					<u-icon name="close" color="#A7A7A7" size="24" @click="isHeaderShow = false"/>
+				</view>
+			</view>
 			<view class="content" style="padding-top: 20vh;">
 				<view class="qrimg">
 					<tki-qrcode
@@ -17,40 +27,88 @@
 						:onval="true"
 						@result="qrR"
 					/>
-					<!-- :icon="icon"
-						:iconSize="40" -->
 				</view>
 			</view>
-			<view class="code-text" v-if="memberinfo.auditStatus == 2">
+			
+			<!-- 0审核中 -->
+			<view class="content fixed" v-if="memberinfo.auditStatus == 0">
+				<view class="tip">
+					您已提交退役军人身份审核，通过后生成退役军人码，并可享受平台提供的专享培训、就业服务，请耐心等待。
+				</view>
+			</view>
+			
+			<!-- 1不通过 -->
+			<view class="content fixed" v-else-if="memberinfo.auditStatus == 1">
+				<view class="tip">
+					很抱歉，您提交的退役军人身份信息未通过审核，请审查后重新提交。
+				</view>
+				<view class="submit" @click="jumpPage('/pages/applyEducationCode/applyEducationCode')">立即提交</view>
+			</view>
+			
+			<!-- 2通过审核 -->
+			<view class="code-text" v-else-if="memberinfo.auditStatus == 2">
 				<view class="code-id">{{ memberinfo.id }}</view>
 				<view class="thanks">
 					{{memberinfo.name}}{{memberinfo.menSex | verifySexFilter}},感谢您为国家的付出
 				</view>
 				<view v-if="!memberinfo.id">还没有退役军人码</view>
 			</view>
-			<view class="content fixed" v-if="memberinfo.auditStatus == 9">
-				<!-- 9未提交 -->
+			
+			<!-- 3撤销审核 -->
+			<view class="content no-submit" v-else-if="memberinfo.auditStatus == 3">
 				<view class="tip">
-					提交退役军人身份审核，获取退役军人码，并享受平台提供的专享培训、就业服务。
+					您已撤销审核，请重新提交退役军人身份审核，获取退役军人码，并享受平台提供的专享培训、就业服务。
 				</view>
+				<view class="submit" @click="jumpPage('/pages/applyEducationCode/applyEducationCode')">立即提交</view>
 			</view>
-			<view class="content fixed" v-else-if="memberinfo.auditStatus == 0">
-				<!-- 0审核中 -->
+			
+			<!-- 9未提交 -->
+			<view class="content no-submit" v-else-if="memberinfo.auditStatus == 9">
 				<view class="tip">
-					您已提交退役军人身份审核，通过后生成退役军人码，并可享受平台提供的专享培训、就业服务，请耐心等待。
+					提交退役军人身份审核，获取退役军人码，并享受平台提供的专享培训、就业服务。
 				</view>
+				<view class="submit" @click="jumpPage('/pages/applyEducationCode/applyEducationCode')">立即提交</view>
 			</view>
-			<view class="content fixed" v-else-if="memberinfo.auditStatus==1">
-				<!-- 1不通过 -->
-				<view class="tip">
-					很抱歉，您提交的退役军人身份信息未通过审核，请审查后重新提交。
+			
+			<u-modal
+				ref="uModal"
+				v-model="updateShow"
+				title="填写当前情况"
+				:show-cancel-button="true"
+				@cancel="updateCancel"
+				@confirm="updateConfirm"
+				:async-close="true"
+			>
+				<view class="slot-content">
+					<view class="condition-form">
+						<u-form :model="conditionForm" label-width="180" ref="conditionForm">
+							<u-form-item label="就业状态：" prop="jobStatus" :required="true">
+								<u-radio-group v-model="conditionForm.jobStatus" :wrap="true" icon-size="16">
+									<u-radio v-for="(item, index) in employmentStatusList" :key="index" :name="item.value">
+										{{ item.label }}
+									</u-radio>
+								</u-radio-group>
+							</u-form-item>
+							<u-form-item label="薪资范围：" prop="salaryRangeName" :required="true">
+								<u-input v-model="conditionForm.salaryRangeName" placeholder="请选择您的薪资范围" type="select" @click="salaryRangeClick"/>
+							</u-form-item>
+						</u-form>
+					</view>
 				</view>
-			</view>
+			</u-modal>
 
 			<!-- ########################## -- 底部导航栏 -- ################################ -->
-			<u-tabbar :list="tabbarConfig.tabbarList" :height="tabbarConfig.height" :mid-button="tabbarConfig.midButton"
-				:inactive-color="tabbarConfig.inactiveColor" :active-color="tabbarConfig.activeColor"
-				:mid-button-size="tabbarConfig.midButtonSize"></u-tabbar>
+			<u-tabbar
+				:list="tabbarConfig.tabbarList"
+				:height="tabbarConfig.height"
+				:mid-button="tabbarConfig.midButton"
+				:inactive-color="tabbarConfig.inactiveColor"
+				:active-color="tabbarConfig.activeColor"
+				:mid-button-size="tabbarConfig.midButtonSize"
+			/>
+			<!-- 工资范围下拉 -->
+			<u-select v-model="salaryRangeShow" :list="salaryRangeList" @confirm="salaryRangeChange" :default-value="salaryRangeIndex"/>
+			<u-toast ref="uToast" />
 		</view>
 	</template>
 
@@ -65,11 +123,40 @@
 				return {
 					memberinfo: {},
 					icon: '/static/icons/index.png',
-					tabbarConfig: tabbarconfig
+					tabbarConfig: tabbarconfig,
+					isHeaderShow: false,
+					updateShow: false,
+					conditionForm: {
+						jobStatus:'',
+						salaryRangeName: '',
+						salaryRange: ''
+					},
+					conditionFormRules: {
+						jobStatus: [
+							{
+								required: true,
+								message: '请选择就业状态',
+								trigger: ['change', 'blur']
+							}
+						],
+						salaryRangeName: [
+							{
+								required: true,
+								message: '请选择薪资范围',
+								trigger: ['change', 'blur']
+							}
+						]
+					},
+					employmentStatusList: [],
+					// 薪资范围
+					salaryRangeShow: false,
+					salaryRangeList: [],
+					salaryRangeIndex: []
 				}
 			},
 			onLoad(page) {
-
+				this.getSalaryRange();
+				this.getEmploymentStatus();
 			},
 			onShow() {
 				this.getmemberinfo();
@@ -84,6 +171,9 @@
 				}
 			},
 			methods: {
+				/**
+				 * 获取用户信息
+				 */
 				getmemberinfo() {
 					this.$u.api.getmemberinfo().then(res => {
 						if (res.code == 200) {
@@ -92,6 +182,20 @@
 								this.memberinfo.id = null;
 								this.$refs.qrcode._clearCode()
 							}
+							this.conditionForm.jobStatus = res.data.jobStatus;
+							this.conditionForm.salaryRange = res.data.salaryRange;
+							this.salaryRangeList.forEach((item, index) => {
+								if (res.data.salaryRange === item.value) {
+									this.salaryRangeIndex = [index]
+									this.conditionForm.salaryRangeName = item.label
+								}
+							})
+							if (res.data.isShowButton) {
+								this.isHeaderShow = true
+								this.viewDetails()
+							} else {
+								this.isHeaderShow = false
+							}
 						} else {
 							uni.showToast({
 								icon: 'none',
@@ -102,62 +206,118 @@
 				},
 				qrR(e) {
 					// console.log(e)
+				},
+				/**
+				 * 跳转到指定页面
+				 */
+				jumpPage(url) {
+					this.$u.route(url)
+				},
+				/**
+				 * 查看详情
+				 */
+				viewDetails() {
+					this.updateShow = true
+					setTimeout(() => {
+						this.$refs.conditionForm.setRules(this.conditionFormRules);
+					}, 200)
+				},
+				/**
+				 * 就业状态
+				 */
+				getEmploymentStatus(){
+					this.$u.api.getDictdataUrl({ key:'member_job_status' }).then(res => {
+						if(res.code === 200){						
+							this.employmentStatusList = res.data.map(item => {
+								return {
+									...item,
+									value: item.text
+								}
+							});
+						}
+					});
+				},
+				/**
+				 * 获取薪资范围
+				 */
+				getSalaryRange(){
+					this.$u.api.getDictdataUrl({ key:'salary_range' }).then(res => {
+						if(res.code === 200){						
+							this.salaryRangeList = res.data.map(item => {
+								return {
+									...item,
+									value: item.text
+								}
+							});
+						}
+					});
+				},
+				/**
+				 * 薪资范围下拉触发
+				 * @param {Object} e
+				 */
+				salaryRangeChange(e) {
+					this.conditionForm.salaryRange = e[0].value
+					this.conditionForm.salaryRangeName = e[0].label
+				},
+				/**
+				 * 点击薪资范围
+				 */
+				salaryRangeClick() {
+					this.salaryRangeShow = true
+				},
+				/**
+				 * 弹框返回操作
+				 */
+				updateCancel() {
+					this.conditionForm.jobStatus = this.memberinfo.jobStatus;
+					this.conditionForm.salaryRange = this.memberinfo.salaryRange;
+					this.salaryRangeList.forEach((item, index) => {
+						if (this.memberinfo.salaryRange === item.value) {
+							this.salaryRangeIndex = [index]
+							this.conditionForm.salaryRangeName = item.label
+						}
+					})
+				},
+				/**
+				 * 弹框确认操作
+				 */
+				updateConfirm() {
+					this.$refs.conditionForm.validate(valid => {
+						if (valid) {
+							const params = {
+								salaryRange: this.conditionForm.salaryRange,
+								jobStatus: this.conditionForm.jobStatus
+							}
+							this.$u.api.mine.submitEmploymentCondition(params).then(res => {
+								if (res.code === 200) {
+									this.getmemberinfo();
+									this.$refs.uToast.show({
+										title: '更新成功!',
+										type: 'success'
+									})
+									this.updateShow = false
+								} else {
+									this.$refs.uToast.show({
+										title: res.msg,
+										type: 'error'
+									})
+								}
+							}).catch(() => {
+								this.$refs.uToast.show({
+									title: '系统异常!',
+									type: 'error'
+								})
+							})
+						} else {
+							this.$refs.uModal.clearLoading();
+						}
+					});
 				}
 			}
 		}
 	</script>
 
 	<style lang="scss" scoped>
-		.bg {
-			z-index: -1;
-			width: 100%;
-			height: auto;
-			position: fixed;
-			left: 0;
-			top: 100rpx;
-			opacity: 0.2;
-		}
-
-		.qrimg {
-			min-height: 100rpx;
-		}
-
-		.content {
-			text-align: center;
-			padding: 60vh 24rpx 24rpx;
-		}
-
-		.content.fixed {
-			position: absolute;
-			left: 0;
-			top: 60vh;
-			right: 0;
-			padding-top: 0;
-		}
-
-		.content .tip {
-			font-size: 32rpx;
-			margin: 0 40rpx;
-			text-align: left;
-			// text-indent: 2em;
-			text-align: center;
-			color: #3D5D4C;
-		}
-
-		.code-text {
-			margin: 0 auto;
-			text-align: center;
-		}
-
-		.code-id {
-			font-size: 36rpx;
-			font-weight: 500;
-			color: #000000;
-		}
-
-		.thanks {
-			margin-top: 100rpx;
-			font-size: 36rpx;
-			color: #3D5D4C;
-		}
+		@import './mycode.scss';
 	</style>

h5_web/pages/progressiveIntegral/progressiveIntegral.vue

@@ -23,7 +23,7 @@
 						<view></view>
 					</view>
 				</view>
-				<view class="integral-content-header-rules">积分规则<u-icon name="arrow-right"/></view>
+				<view class="integral-content-header-rules" @click="jumpPage('/pages/integralRule/integralRule')">积分规则<u-icon name="arrow-right"/></view>
 				<view class="integral-content-header-behavior">
 					<view class="item">0<text>个加分行为</text></view>
 					<view class="item">0<text>个减分行为</text></view>
@@ -113,7 +113,12 @@
 			}
 		},
 		methods: {
-			
+			/**
+			 * @param { String } url
+			 */
+			jumpPage(url) {
+				this.$u.route(url)
+			}
 		}
 	}
 </script>

h5_web/pages/schools/schools.scss

@@ -31,6 +31,7 @@
 					justify-content: center;
 					align-items: center;
 					margin-right: 22rpx;
+					border-radius: 10rpx;
 					image {
 						width: 78rpx;
 						height: 78rpx;

h5_web/uview-ui/components/u-city-select-province/u-city-select-province.vue

@@ -30,7 +30,7 @@
 					</view>
 				</view>
 
-				<view class="area-item">
+				<!-- <view class="area-item">
 					<view class="u-padding-10 u-bg-gray" style="height: 100%;">
 						<scroll-view :scroll-y="true" style="height: 100%">
 							<u-cell-group v-if="isChooseC">
@@ -41,7 +41,7 @@
 							</u-cell-group>
 						</scroll-view>
 					</view>
-				</view>
+				</view> -->
 			</view>
 		</view>
 	</u-popup>
@@ -125,12 +125,12 @@
 				}
 				if (this.isChooseC) {
 					tabsList[1]['name'] = this.citys[this.city]['label'];
-					tabsList[2] = {
-						name: "请选择"
-					};
+					// tabsList[2] = {
+					// 	name: "请选择"
+					// };
 				}
 				if (this.isChooseA) {
-					tabsList[2]['name'] = this.areas[this.area]['label'];
+					// tabsList[2]['name'] = this.areas[this.area]['label'];
 				}
 				return tabsList;
 			},
@@ -145,10 +145,9 @@
 					this.setProvince("", this.areaCode[0]);
 					this.setCity("", this.areaCode[1]);
 					this.setArea("", this.areaCode[2]);
-				} else if (this.defaultRegion.length == 3) {
+				} else if (this.defaultRegion.length == 2) {
 					this.setProvince(this.defaultRegion[0], "");
 					this.setCity(this.defaultRegion[1], "");
-					this.setArea(this.defaultRegion[2], "");
 				};
 			},
 			setProvince(label = "", value = "") {
@@ -192,7 +191,7 @@
 				this.isChooseA = false;
 				this.city = index;
 				this.areas = areas[this.province][index];
-				this.tabsIndex = 2;
+				// this.tabsIndex = 2;
 				// 只选到市添加以下代码
 				let result = {};
 				result.province = this.provinces[this.province];