10.26

pages.json

@@ -131,16 +131,21 @@
 					"enablePullDownRefresh": false
 				}
 
-			}    ,{
-                    "path" : "change-hangye1",
-                    "style" :                                                                                    
-                {
-                    "navigationBarTitleText": "",
-                    "enablePullDownRefresh": false
-                }
-                
-                }
-            ]
+			}, {
+				"path": "change-hangye1",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "change-hangye",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
+			}]
 		},
 		{
 			"root": "pagesB",
@@ -173,16 +178,14 @@
 					"enablePullDownRefresh": false,
 					"navigationStyle": "custom"
 				}
-			}    ,{
-                    "path" : "zixun-info",
-                    "style" :                                                                                    
-                {
-                    "navigationBarTitleText": "",
-                    "enablePullDownRefresh": false
-                }
-                
-                }
-            ]
+			}, {
+				"path": "zixun-info",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
+			}]
 		},
 		{
 			"root": "pagesC",
@@ -333,25 +336,21 @@
 					"enablePullDownRefresh": false
 				}
 
-			}    ,{
-                    "path" : "my-order",
-                    "style" :                                                                                    
-                {
-                    "navigationBarTitleText": "我的投递",
-                    "enablePullDownRefresh": false
-                }
-                
-                }
-                ,{
-                    "path" : "renzheng",
-                    "style" :                                                                                    
-                {
-                    "navigationBarTitleText": "",
-                    "enablePullDownRefresh": false
-                }
-                
-                }
-            ]
+			}, {
+				"path": "my-order",
+				"style": {
+					"navigationBarTitleText": "我的投递",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "renzheng",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
+			}]
 		}
 	],
 	"globalStyle": {

pagesA/Project .vue

@@ -22,32 +22,42 @@
 		<view class="personal">
 			<view class="body-input u-flex-col u-row-center ">
 				<text class="input-title">项目名称</text>
-				<u--input customStyle="padding:0 !important" type="text" placeholder="请填写您的公司名称" border
-					placeholderClass='input-style' ></u--input>
+				<u--input customStyle="padding:0 !important" type="text" placeholder="请填写您的项目名称" border
+					placeholderClass='input-style' v-model="project_experience.name" ></u--input>
 			</view>
-			<view class="body-input u-flex-col u-row-center" >
+			<view class="body-input u-flex-col u-row-center">
 				<text class="input-title">项目时间</text>
-				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
-					placeholder="请选择您的公司行业" border placeholderClass='input-style' suffixIcon="arrow-right"
-					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" ></u--input>
+				<view class="u-flex u-row-between">
+					<view class="" @click="entryShow = true">
+						<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
+							placeholder="开始时间" border placeholderClass='input-style'
+							v-model="project_experience.start_time"></u--input>
+					</view>
+					<view class="">-</view>
+					<view class="" @click="dimissionShow = true">
+						<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
+							placeholder="结束时间" inputAlign="center" border placeholderClass='input-style'
+							v-model="project_experience.end_time"></u--input>
+					</view>
+				</view>
 			</view>
 			<view class="body-input u-flex-col u-row-center" >
 				<text class="input-title">公司名称</text>
-				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
-					placeholder="请选择您的公司名称" border placeholderClass='input-style' suffixIcon="arrow-right"
-					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" ></u--input>
+				<u--input  disabledColor="#fff" customStyle="padding:0 !important" type="text"
+					placeholder="请填写您的公司名称" border placeholderClass='input-style' suffixIcon="arrow-right"
+					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" v-model="project_experience.company_name"></u--input>
 			</view>
 			<view class="body-input u-flex-col u-row-center">
 				<text class="input-title">项目角色</text>
-				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
-					placeholder="请选择您的项目角色" border placeholderClass='input-style' suffixIcon="arrow-right"
-					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;"></u--input>
+				<u--input  disabledColor="#fff" customStyle="padding:0 !important" type="text"
+					placeholder="请填写您的项目角色" border placeholderClass='input-style' suffixIcon="arrow-right"
+					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" v-model="project_experience.role"></u--input>
 			</view>
 			<view class="body-input u-flex-col u-row-center" @click="todcp">
 				<text class="input-title">项目描述</text>
 				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
 					placeholder="请填写" border placeholderClass='input-style' suffixIcon="arrow-right"
-					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;"
+					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" v-model="project_experience.description"
 					></u--input>
 			</view>
 			<view class="body-input u-flex-col u-row-center " style="height: 250rpx;">
@@ -58,9 +68,10 @@
 			</view>
 		</view>
 		<!-- 选择器 -->
-		<u-picker title="性别" :show="sexShow" @confirm="sexConfirm" :columns="sexdata" @cancel='close()'></u-picker>
-		<u-datetime-picker title="出生日期" :minDate="minDate" @confirm="birthdayConfirm" :show="birthdayShow" mode="date"
-			@cancel='close()'></u-datetime-picker>
+		<u-datetime-picker title="项目开始时间" :minDate="minDate1" @confirm="entryConfirm" :show="entryShow" mode="date"
+			@cancel='entryShow = false'></u-datetime-picker>
+		<u-datetime-picker title="项目结束时间" :minDate="minDate" @confirm="dimissionConfirm" :show="dimissionShow" mode="date"
+			@cancel='dimissionShow = false'></u-datetime-picker>
 	</view>
 </template>
 
@@ -71,19 +82,41 @@
 	export default {
 		data() {
 			return {
-				height:''
+				height:'',
+				dimissionShow:false,
+				entryShow:false,
+				minDate:'',
+				minDate1:"",
+				project_experience:{
+					name:"",//项目名称
+					start_time:"",//项目开始时间
+					end_time:"",//项目结束时间
+					description:"",//项目描述
+					role:"",//项目角色
+					company_name:"",//公司名称
+				}
 			}
 		},
 		onLoad() {
-			this.getHeight()
-			this.minDate = Number(new Date('1900-01-01'));
+			this.minDate = Number(new Date('2000-01-01'));
+			this.minDate1 = Number(new Date('2000-01-01'));
 		},
 		methods: {
-			getHeight() {
-				const query = uni.createSelectorQuery().in(this);
-				query.select('#height').boundingClientRect(data => {
-					this.height = (data.height) * 2
-				}).exec();
+			async entryConfirm(e) {
+				const timeFormat = uni.$u.timeFormat;
+				console.log(e.value);
+				let timeValue = await timeFormat(e.value, 'yyyy-mm-dd');
+				this.project_experience.start_time = timeValue;
+				this.entryShow = false
+			},
+			async dimissionConfirm(e) {
+				const timeFormat = uni.$u.timeFormat;
+				let timeValue = await timeFormat(e.value, 'yyyy-mm-dd');
+				this.project_experience.end_time = timeValue;
+				this.dimissionShow = false
+			},
+			return1(){
+				uni.navigateBack()
 			},
 			todcp(){
 				uni.navigateTo({
@@ -91,6 +124,33 @@
 				})
 			},
 			next(){
+				if (!this.project_experience.name) {
+					this.$u.toast("请填写项目名称")
+					return
+				}
+				if (!this.project_experience.start_time) {
+					this.$u.toast("请填写项目开始时间")
+					return
+				}
+				if (!this.project_experience.end_time) {
+					this.$u.toast("请填写项目项目结束时间")
+					return
+				}
+				if (!this.project_experience.description) {
+					this.$u.toast("请填写项目描述")
+					return
+				}
+				if (!this.project_experience.role) {
+					this.$u.toast("请填写项目角色")
+					return
+				}
+				if (!this.project_experience.company_name) {
+					this.$u.toast("请填写公司名称")
+					return
+				}
+				
+				
+				uni.setStorageSync("project_experience",this.project_experience)
 				uni.navigateTo({
 					url:'../pagesA/teach'
 				})
@@ -106,7 +166,8 @@
 
 	.index-page {
 		overflow: hidden;
-		margin-bottom: 60rpx;
+		background: #fff;
+		height: 100vh;
 
 		.mingpianfont {
 			height: 50rpx;
@@ -176,8 +237,7 @@
 				margin: 10rpx 0 0rpx 0;
 				display: flex;
 				justify-content: center;
-				// position: fixed;
-				// bottom: 60rpx;
+				margin-bottom: 60rpx;
 			}
 		}
 		.index-item {

pagesA/description.vue

@@ -26,6 +26,7 @@
 
 		},
 		methods: {
+			
 			toteach(){
 				uni.navigateBack()
 			}

pagesA/expectation.vue

@@ -68,23 +68,18 @@
 	export default {
 		data() {
 			return {
-				height:''
+				job_intention:{
+					advantage:'',//优势亮点
+				}
 			}
 		},
 		onLoad() {
-			this.getHeight()
 			this.minDate = Number(new Date('1900-01-01'));
 		},
 		methods: {
 			return1(){
 				uni.navigateBack()
 			},
-			getHeight() {
-				const query = uni.createSelectorQuery().in(this);
-				query.select('#height').boundingClientRect(data => {
-					this.height = (data.height) * 2
-				}).exec();
-			},
 			next(){
 				uni.switchTab({
 					url:'../pages/index/index'
@@ -101,9 +96,9 @@
 
 	.index-page {
 		overflow: hidden;
-		// height: 100vh;
+		height: 100vh;
 		background: #fff;
-		margin-bottom: 60rpx;
+		
 
 		.mingpianfont {
 			height: 50rpx;
@@ -174,6 +169,7 @@
 				margin: 170rpx 0 0rpx 0;
 				display: flex;
 				justify-content: center;
+				margin-bottom: 60rpx;
 				// position: fixed;
 				// bottom: 60rpx;
 			}

pagesA/jianli.vue

@@ -32,7 +32,7 @@
 					placeholder="请选择您的性别" border placeholderClass='input-style' suffixIcon="arrow-right"
 					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" v-model="sexvalue"></u--input>
 			</view>
-			<view class="body-input u-flex-col u-row-center" @click="birthdayShow = true">
+			<view class="body-input u-flex-col u-row-center" @click="birthdayBtn">
 				<text class="input-title">出生年月</text>
 				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
 					placeholder="请选择您的出生年月" border placeholderClass='input-style' suffixIcon="arrow-right"
@@ -60,7 +60,7 @@
 					placeholder="请选择您当前求职状态" border placeholderClass='input-style' suffixIcon="arrow-right"
 					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" v-model="job"></u--input>
 			</view>
-			<view class="body-input u-flex-col u-row-center" @click="workShow = true">
+			<view class="body-input u-flex-col u-row-center" @click="workBtn">
 				<text class="input-title">参加工作时间</text>
 				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
 					placeholder="请选择您参加工作的时间" border placeholderClass='input-style' suffixIcon="arrow-right"
@@ -70,7 +70,7 @@
 			<view class="body-input u-flex-col u-row-center">
 				<text class="input-title">邮箱</text>
 				<u--input customStyle="padding:0 !important" type="text" placeholder="请填写(选填)" border
-					placeholderClass='input-style' v-model="email"></u--input>
+					placeholderClass='input-style' v-model="from.email"></u--input>
 			</view>
 			<view class="body-input u-flex-col u-row-center">
 				<text class="input-title">手机号</text>
@@ -101,13 +101,10 @@
 			@cancel='close()'>
 		</u-picker><u-picker title="求职状态" keyName="name" :show="jobShow" @confirm="jobConfirm" :columns="joblist"
 			@cancel='close()'></u-picker>
-		<u-datetime-picker title="出生日期" :minDate="minDate" @confirm="birthdayConfirm" :show="birthdayShow" mode="date"
+		<u-datetime-picker ref="picker" title="出生日期" :minDate="minDate" @confirm="birthdayConfirm" :show="birthdayShow"
+			mode="date" @cancel='close()'></u-datetime-picker>
+		<u-datetime-picker ref="pickers" title="参加工作时间" :minDate="minDate1" @confirm="workConfirm" :show="workShow" mode="date"
 			@cancel='close()'></u-datetime-picker>
-		<u-datetime-picker title="参加工作时间" :minDate="minDate1" @confirm="workConfirm" :show="workShow" mode="date"
-			@cancel='close()'></u-datetime-picker>
-			
-			
-			
 		<u-picker ref="uPicker" keyName="name" title="户口所在地" :defaultIndex="indexs" :show="cityShow" :columns="cityList"
 			@confirm="cityconfirm" @cancel="cityShow = false" @change="changeHandler"></u-picker>
 	</view>
@@ -118,7 +115,8 @@
 		politics,
 		marital,
 		getAllArea,
-		getjob
+		getjob,
+		profile
 	} from "@/units/inquire.js"
 	export default {
 		data() {
@@ -137,9 +135,9 @@
 				province: [], //省数据
 				city: [], //市数据
 				area: [], //区数据
-				provinceid: [], //省数据
-				cityid: [], //市数据
-				areaid: [], //区数据
+				provinceid: "", //省数据
+				cityid: "", //市数据
+				areaid: "", //区数据
 				indexs: [], //默认地区下标
 
 
@@ -161,24 +159,26 @@
 				politics: "", //政治面貌
 				city1: "", //地址
 				job: "",
-
-
-
 				from: {
 					name: "",
-					marital_status_id: "",
-					job_time: "",
 					sex: "",
 					birthday: "",
-					job_role: "student",
-					political_status_id: "",
-					job_status_id: "",
-					mobile: ""
+					job_name: "",
+					industry_id: "", //行业id
+					province_id: "", //省份id
+					city_id: "", //城市id
+					invitation_code: "", //邀请码
+					avatar: "", //头像
+					job_role: "student", //求职身份
+					job_time: "", //参加工作时间
+					mobile: "", //手机号
+					domicile_province_id: "", //户籍省份
+					domicile_city_id: "", //市
+					political_status_id: "", //政治面貌
+					marital_status_id: "", //婚姻状态
+					job_status_id: "", //求职
+					email: "" //邮箱
 				},
-
-
-
-
 				minDate: "",
 				minDate1: "",
 				height: '',
@@ -205,9 +205,13 @@
 			this.getpolitics()
 			this.getmarital()
 			this.AllArea()
-			this.getJob()
+			this.getJob()  
 		},
 		methods: {
+			workBtn(){
+				this.workShow = true
+				this.$refs.pickers.innerValue = new Date(1672502400000).getTime()
+			},
 			// 获取政治面貌
 			getpolitics() {
 				politics().then((res) => {
@@ -236,7 +240,7 @@
 							id: t.id
 						}
 					})
-					console.log("aaa",this.province);
+					console.log("aaa", this.province);
 					this.city = res.data.map(t => t.children.map(v => {
 						return {
 							name: v.name,
@@ -258,27 +262,27 @@
 					let a = []
 					let b = []
 					let c = []
-						this.province.map(res =>{
-							a.push({
-								name: res.name,
-								id: res.id,
-							})
+					this.province.map(res => {
+						a.push({
+							name: res.name,
+							id: res.id,
 						})
-						this.city[0].map(res =>{
-							b.push({
-								name: res.name,
-								id: res.id,
-							})
+					})
+					this.city[0].map(res => {
+						b.push({
+							name: res.name,
+							id: res.id,
 						})
-						this.area[0][0].map(res => {
-							c.push({
-								name: res.name,
-								id: res.id,
-							})
+					})
+					this.area[0][0].map(res => {
+						c.push({
+							name: res.name,
+							id: res.id,
 						})
-						
-					this.cityList = [a,b,c]
-					console.log(33,this.cityList);
+					})
+
+					this.cityList = [a, b, c]
+					console.log(33, this.cityList);
 					if (this.addressData.province && this.addressData.city && this.addressData.area) {
 						//省索引
 						let pIdx = this.province.findIndex(v => v.name == this.addressData.province);
@@ -305,26 +309,26 @@
 					picker = this.$refs.uPicker
 				} = e
 				//columnIndex代表第几列，意思是下标为0的列发生变化
-				
+
 				if (columnIndex === 0) {
-					picker.setColumnValues(1, this.city[indexs[0]].map(v =>{
+					picker.setColumnValues(1, this.city[indexs[0]].map(v => {
 						return {
-							name:v.name,
-							id:v.id
+							name: v.name,
+							id: v.id
 						}
 					}))
 					picker.setColumnValues(2, this.area[indexs[0]][0].map(v => {
 						return {
-							name:v.name,
-							id:v.id
+							name: v.name,
+							id: v.id
 						}
 					}))
 				}
 				if (columnIndex === 1) {
 					picker.setColumnValues(2, this.area[indexs[0]][indexs[1]].map(v => {
 						return {
-							name:v.name,
-							id:v.id
+							name: v.name,
+							id: v.id
 						}
 					}))
 				}
@@ -354,6 +358,12 @@
 				}
 				this.sexShow = false
 			},
+			//点击显示时间选择器
+			birthdayBtn() {
+				this.birthdayShow = true
+				//new Date(this.endDate).getTime()为你需要在选择器上显示的时间戳
+				this.$refs.picker.innerValue = new Date(946656000000).getTime()
+			},
 			//出生日期选择器
 			async birthdayConfirm(e) {
 				const timeFormat = uni.$u.timeFormat;
@@ -384,14 +394,15 @@
 			cityconfirm(e) {
 				let a = e.value[0].name + e.value[1].name + e.value[2].name
 				let ids = String(e.value[0].id) + String(e.value[1].id) + String(e.value[2].id)
-				console.log(ids);
+				this.from.domicile_city_id = e.value[1].id
+				this.from.domicile_province_id = e.value[0].id
 				// this.city1 = e.value.join("")
-				this.city1  = a
+				this.city1 = a
 				this.cityShow = false
 			},
 			jobConfirm(e) {
 				this.job = e.value[0].name
-				this.job_status_id = e.value[0].id
+				this.from.job_status_id = e.value[0].id
 				this.jobShow = false
 			},
 			//关闭模态框
@@ -433,6 +444,16 @@
 					this.$u.toast("请输入正确的手机号")
 					return
 				}
+				if (uni.$u.test.email(this.from.email)) {
+					this.$u.toast("请输入正确的邮箱号")
+					return
+				}
+				profile({
+					...this.from
+				}).then(res => {
+					
+				})
+
 				uni.navigateTo({
 					url: '../pagesA/userinfo'
 				})

pagesA/teach.vue

@@ -4,8 +4,8 @@
 		<view class="index-navbar">
 			<view style="position: relative;height: 392rpx;">
 				<image class="index-bg" src="@/static/images/bg.png" mode=""></image>
-				<u-navbar bgColor='rgba(0,0,0,0)' placeholder @click = "return1">
-	
+				<u-navbar bgColor='rgba(0,0,0,0)' placeholder @click="return1">
+
 				</u-navbar>
 				<view class="header-down " :style="{marginTop:height+'rpx'}"
 					style="padding: 28rpx 0 0 32rpx;box-sizing: border-box;">
@@ -23,29 +23,35 @@
 			<view class="body-input u-flex-col u-row-center ">
 				<text class="input-title">学校名称</text>
 				<u--input customStyle="padding:0 !important" type="text" placeholder="请填写您的学校名称" border
-					placeholderClass='input-style' ></u--input>
+					placeholderClass='input-style' v-model="education_experience.name"></u--input>
 			</view>
-			<view class="body-input u-flex-col u-row-center" >
-				<text class="input-title">学历</text>
-				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
-					placeholder="请选择您的学历" border placeholderClass='input-style' suffixIcon="arrow-right"
-					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" ></u--input>
+			<view class="body-input u-flex-col u-row-center">
+				<text class="input-title" >学历</text>
+				<view class="" @click="xueli = true">
+					<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
+						placeholder="请选择您的学历" border placeholderClass='input-style' suffixIcon="arrow-right"
+						suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;"v-model="education_experience.education"></u--input>
+				</view>
 			</view>
-			<view class="body-input u-flex-col u-row-center" >
+			<view class="body-input u-flex-col u-row-center">
 				<text class="input-title">专业名称</text>
-				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
-					placeholder="请选择您的专业名称" border placeholderClass='input-style' suffixIcon="arrow-right"
-					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" ></u--input>
+				<u--input disabledColor="#fff" customStyle="padding:0 !important" type="text" placeholder="请填写专业名称"
+					border placeholderClass='input-style' v-model="education_experience.major"></u--input>
 			</view>
 			<view class="body-input u-flex-col u-row-center">
 				<text class="input-title">时间</text>
-				
 				<view class="u-flex u-row-between">
-					<u--input  disabledColor="#fff" customStyle="padding:0 !important" type="text"
-						placeholder="上学时间"  border placeholderClass='input-style'></u--input>
+					<view class="" @click="entryShow = true">
+						<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
+							placeholder="上学时间" border placeholderClass='input-style'
+							v-model="education_experience.start_time"></u--input>
+					</view>
 					<view class="">-</view>
-					<u--input  disabledColor="#fff" customStyle="padding:0 !important" type="text"
-						placeholder="毕业时间" inputAlign="center" border placeholderClass='input-style' ></u--input>
+					<view class="" @click="dimissionShow = true">
+						<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
+							placeholder="毕业时间" inputAlign="center" border placeholderClass='input-style'
+							v-model="education_experience.end_time"></u--input>
+					</view>
 				</view>
 			</view>
 			<view class="button" @click="next">
@@ -53,42 +59,110 @@
 			</view>
 		</view>
 		<!-- 选择器 -->
-		<u-picker title="性别" :show="sexShow" @confirm="sexConfirm" :columns="sexdata" @cancel='close()'></u-picker>
-		<u-datetime-picker title="教育时间" :minDate="minDate" @confirm="birthdayConfirm" :show="birthdayShow" mode="date"
+		<!-- 选择器 -->
+		<u-datetime-picker title="上学时间" :minDate="minDate1" @confirm="entryConfirm" :show="entryShow" mode="date"
 			@cancel='close()'></u-datetime-picker>
+		<u-datetime-picker title="毕业时间" :minDate="minDate" @confirm="dimissionConfirm" :show="dimissionShow" mode="date"
+			@cancel='close()'></u-datetime-picker>
+
+		<u-picker keyName="name" :show="xueli" @confirm="confirm" :columns="list" @close="close()"></u-picker>
 	</view>
 </template>
 
 <script>
 	import {
-
+		get_education
 	} from "@/units/inquire.js"
 	export default {
 		data() {
 			return {
-				height:''
+				minDate: "",
+				minDate1: "",
+				list: [
+					[]
+				],
+				dimissionShow:false,
+				entryShow:false,
+				xueli: false,
+				education_experience: {
+					name: "", //学校名称
+					is_recruit: "", //是否统招
+					education_id: "", //学历id
+					major: "", //专业名称
+					start_time: "", //开始时间
+					end_time: "", //结束时间
+					education: "", //学历
+				}
 			}
 		},
 		onLoad() {
-			this.getHeight()
-			this.minDate = Number(new Date('1900-01-01'));
+			this.minDate = Number(new Date('2000-01-01'));
+			this.minDate1 = Number(new Date('2000-01-01'));
+			this.get_education()
 		},
 		methods: {
-			return1(){
-				uni.navigateBack()
+			close() {
+				this.xueli = false
+				this.dimissionShow = false
+				this.entryShow = false
+			},
+			confirm(e) {
+				this.education_experience.education_id = e.value[0].id
+				this.education_experience.education = e.value[0].name
+				this.xueli = false
 			},
-			getHeight() {
-				const query = uni.createSelectorQuery().in(this);
-				query.select('#height').boundingClientRect(data => {
-					this.height = (data.height) * 2
-				}).exec();
+			get_education() {
+				get_education().then(res => {
+					this.list[0] = res.data
+					console.log(this.list);
+				})
 			},
-			next(){
+			async entryConfirm(e) {
+				const timeFormat = uni.$u.timeFormat;
+				console.log(e.value);
+				let timeValue = await timeFormat(e.value, 'yyyy-mm-dd');
+				this.education_experience.start_time = timeValue;
+				this.entryShow = false
+			},
+			async dimissionConfirm(e) {
+				const timeFormat = uni.$u.timeFormat;
+				let timeValue = await timeFormat(e.value, 'yyyy-mm-dd');
+				this.education_experience.end_time = timeValue;
+				this.dimissionShow = false
+			},
+			return1() {
+				uni.navigateBack()
+			},
+			next() {
+				if (!this.education_experience.name) {
+					this.$u.toast("请填写学校名称")
+					return
+				}
+				if (!this.education_experience.education) {
+					this.$u.toast("请选择学历")
+					return
+				}
+				if (!this.education_experience.major) {
+					this.$u.toast("请填写专业名称")
+					return
+				}
+				if (!this.education_experience.start_time) {
+					this.$u.toast("请选择上学时间")
+					return
+				}
+				if (!this.education_experience.end_time) {
+					this.$u.toast("请选择毕业时间")
+					return
+				}
+				
+				uni.setStorageSync("education_experience",this.education_experience)
+
+
 				uni.navigateTo({
-					url:'../pagesA/expectation'
+					url: '../pagesA/expectation'
 				})
 			}
-			
+
 		}
 	}
 </script>
@@ -175,6 +249,7 @@
 				bottom: 60rpx;
 			}
 		}
+
 		.index-item {
 			// width: 702rpx;
 			// background: #FFFFFF;

pagesA/userinfo.vue

@@ -4,14 +4,10 @@
 		<view class="index-navbar">
 			<view style="position: relative;height: 392rpx;">
 				<image class="index-bg" src="@/static/images/bg.png" mode=""></image>
-				<u-navbar bgColor='rgba(0,0,0,0)'  placeholder @leftclick = "return1">
-<!-- 					<view id="height" class="index-header  u-flex u-row-between "
-						style="position: relative; " slot="left">
-						<u-icon @click='return1' name="arrow-left" color="#fff" size="28"></u-icon>
-					</view> -->
+				<u-navbar bgColor='rgba(0,0,0,0)' placeholder :safeAreaInsetTop="true" @leftClick="return1">
+
 				</u-navbar>
-				<view class="header-down " :style="{marginTop:height+'rpx'}"
-					style="padding: 28rpx 0 0 32rpx;box-sizing: border-box;">
+				<view class="header-down " style="padding: 28rpx 0 0 32rpx;box-sizing: border-box;">
 					<view class="mingpianfont">
 						邀请你完善基础求职名片
 					</view>
@@ -28,38 +24,39 @@
 			<view class="body-input u-flex-col u-row-center ">
 				<text class="input-title">姓名</text>
 				<u--input customStyle="padding:0 !important" type="text" placeholder="请填写您的真实姓名" border
-					placeholderClass='input-style' v-model="name"></u--input>
+					placeholderClass='input-style' v-model="from.name"></u--input>
 			</view>
 			<view class="body-input u-flex-col u-row-center" @click="sexShow  = true">
 				<text class="input-title">性别</text>
 				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
 					placeholder="请选择您的性别" border placeholderClass='input-style' suffixIcon="arrow-right"
-					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" v-model="sex"></u--input>
+					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" v-model="sexvalue"></u--input>
 			</view>
-			<view class="body-input u-flex-col u-row-center" @click="birthdayShow = true">
+			<view class="body-input u-flex-col u-row-center" @click="birthdayBtn">
 				<text class="input-title">出生年月</text>
 				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
 					placeholder="请选择您的出生年月" border placeholderClass='input-style' suffixIcon="arrow-right"
-					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" v-model="birthday"></u--input>
+					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;"
+					v-model="from.birthday"></u--input>
 			</view>
-			<view class="body-input u-flex-col u-row-center">
-				<text class="input-title">当前求职状态</text>
+			<view class="body-input u-flex-col u-row-center" @click="jobShow = true">
+				<text class="input-title">求职状态</text>
 				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
-					placeholder="请选择您当前求职状态" border placeholderClass='input-style' suffixIcon="arrow-right"
-					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;"
-					v-model="job_status_id"></u--input>
+					placeholder="请选择您求职状态" border placeholderClass='input-style' suffixIcon="arrow-right"
+					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" v-model="job"></u--input>
 			</view>
-			<view class="body-input u-flex-col u-row-center">
+			<view class="body-input u-flex-col u-row-center" @click="workBtn">
 				<text class="input-title">参加工作时间</text>
 				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
-					placeholder="请选择您首次参加工作的时间" border placeholderClass='input-style' suffixIcon="arrow-right"
-					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" v-model="job_time"></u--input>
+					placeholder="请选择您参加工作的时间" border placeholderClass='input-style' suffixIcon="arrow-right"
+					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;"
+					v-model="from.job_time"></u--input>
 			</view>
-			<view class="body-input u-flex-col u-row-center">
+			<view class="body-input u-flex-col u-row-center" @click="cityShow = true">
 				<text class="input-title">所在城市</text>
 				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
-					placeholder="请选择您所在的城市" border placeholderClass='input-style' suffixIcon="arrow-right"
-					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" v-model="job_role"></u--input>
+					placeholder="请选择所在城市" border placeholderClass='input-style' suffixIcon="arrow-right"
+					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" v-model="city1"></u--input>
 			</view>
 			<view class="button" @click="next">
 				下一步
@@ -67,90 +64,371 @@
 		</view>
 		<!-- 选择器 -->
 		<u-picker title="性别" :show="sexShow" @confirm="sexConfirm" :columns="sexdata" @cancel='close()'></u-picker>
-		<u-datetime-picker title="出生日期" :minDate="minDate" @confirm="birthdayConfirm" :show="birthdayShow" mode="date"
-			@cancel='close()'></u-datetime-picker>
+		<u-picker title="政治面貌" keyName="name" :show="politicsShow" @confirm="politicsConfirm" :columns="politicslist"
+			@cancel='close()'></u-picker>
+		<u-picker title="婚姻状态" keyName="name" :show="maritalShow" @confirm="maritalConfirm" :columns="maritallist"
+			@cancel='close()'>
+		</u-picker>
+		<u-picker title="求职状态" keyName="name" :show="jobShow" @confirm="jobConfirm" :columns="joblist"
+			@cancel='close()'></u-picker>
+		<u-datetime-picker ref="picker" title="出生日期" :minDate="minDate" @confirm="birthdayConfirm" :show="birthdayShow"
+			mode="date" @cancel='close()'></u-datetime-picker>
+		<u-datetime-picker ref="pickers" title="参加工作时间" :minDate="minDate1" @confirm="workConfirm" :show="workShow"
+			mode="date" @cancel='close()'></u-datetime-picker>
+		<u-picker ref="uPicker" keyName="name" title="户口所在地" :defaultIndex="indexs" :show="cityShow" :columns="cityList"
+			@confirm="cityconfirm" @cancel="cityShow = false" @change="changeHandler"></u-picker>
 	</view>
 </template>
 
 <script>
 	import {
-
+		politics,
+		marital,
+		getAllArea,
+		getjob,
+		profile
 	} from "@/units/inquire.js"
 	export default {
 		data() {
 			return {
+
+				addressData: {
+					id: "",
+					province: "",
+					city: "",
+					area: "",
+					detail: "",
+					userName: "",
+					phone: "",
+					isDefault: false
+				}, //地址数据
+				province: [], //省数据
+				city: [], //市数据
+				area: [], //区数据
+				provinceid: "", //省数据
+				cityid: "", //市数据
+				areaid: "", //区数据
+				indexs: [], //默认地区下标
+
+
 				//选择器状态
 				sexShow: false, //性别
 				birthdayShow: false, //出生年月
-
-				// 列表数据
-				sex: "",
-				sexvalue: "", //性别传的值
-				birthday: "",
-
+				politicsShow: false, //政治面貌
+				maritalShow: false, //婚姻状态
+				workShow: false, //工作时间
+				cityShow: false, //户口所在地
+				jobShow: false, //工作显示
 
 
 
 
+				// 列表数据
+				sexvalue: "", //性别传的值
+				status: "", //婚姻状态
+				politics: "", //政治面貌
+				city1: "", //地址
+				job: "",
+				from: {
+					name: "",
+					sex: "",
+					birthday: "",
+					job_name: "",
+					industry_id: "", //行业id
+					province_id: "", //省份id
+					city_id: "", //城市id
+					invitation_code: "", //邀请码
+					avatar: "", //头像
+					job_time: "", //参加工作时间
+					mobile: "", //手机号
+					domicile_province_id: "", //户籍省份
+					domicile_city_id: "", //市
+					political_status_id: "", //政治面貌
+					marital_status_id: "", //婚姻状态
+					job_status_id: "", //求职
+					email: "" //邮箱
+				},
 				minDate: "",
+				minDate1: "",
 				height: '',
 				list: ['学生', '职场人'],
 				current: 0,
 				sexdata: [
 					['男', '女', '保密']
 				],
+				politicslist: [
+					[]
+				],
+				maritallist: [
+					[]
+				],
+				cityList: [], //数据地址
+				cityids: [], //数据地址
+				joblist: []
 			}
 		},
 		onLoad() {
 			// this.getHeight()
 			this.minDate = Number(new Date('1900-01-01'));
+			this.minDate1 = Number(new Date('1980-01-01'));
+			this.getpolitics()
+			this.getmarital()
+			this.AllArea()
+			this.getJob()
 		},
 		methods: {
-			return1() {
-				uni.navigateBack()
+			workBtn() {
+				this.workShow = true
+				this.$refs.pickers.innerValue = new Date(1672502400000).getTime()
 			},
-			getHeight() {
-				const query = uni.createSelectorQuery().in(this);
-				query.select('#height').boundingClientRect(data => {
-					this.height = (data.height ) * 2
-				}).exec();
+			// 获取政治面貌
+			getpolitics() {
+				politics().then((res) => {
+					this.politicslist[0] = res.data
+				})
+			},
+			//婚姻状态
+			getmarital() {
+				marital().then((res) => {
+					this.maritallist[0] = res.data
+				})
+			},
+			//获取求职状态
+			getJob() {
+				getjob().then((res) => {
+					this.joblist[0] = res.data
+				})
+			},
+			//所有地区
+			AllArea() {
+				getAllArea().then((res) => {
+					console.log(res);
+					this.province = res.data.map(t => {
+						return {
+							name: t.name,
+							id: t.id
+						}
+					})
+					console.log("aaa", this.province);
+					this.city = res.data.map(t => t.children.map(v => {
+						return {
+							name: v.name,
+							id: v.id
+						}
+					}))
+					this.area = res.data.map(t => t.children.map(v => v.children.map(i => {
+						return {
+							name: i.name,
+							id: i.id
+						}
+					})))
+					//默认显示数据
+					// this.cityList = [
+					// 	this.province.map(res => res.name),
+					// 	this.city[0].map(res => res.name),
+					// 	this.area[0][0].map(res => res.name)
+					// ]
+					let a = []
+					let b = []
+					let c = []
+					this.province.map(res => {
+						a.push({
+							name: res.name,
+							id: res.id,
+						})
+					})
+					this.city[0].map(res => {
+						b.push({
+							name: res.name,
+							id: res.id,
+						})
+					})
+					this.area[0][0].map(res => {
+						c.push({
+							name: res.name,
+							id: res.id,
+						})
+					})
+
+					this.cityList = [a, b, c]
+					console.log(33, this.cityList);
+					if (this.addressData.province && this.addressData.city && this.addressData.area) {
+						//省索引
+						let pIdx = this.province.findIndex(v => v.name == this.addressData.province);
+						//根据省索引设置默认市数据
+						this.columns[1] = this.city[pIdx].map(res => res.name)
+						//市索引
+						let cIdx = this.city[pIdx].findIndex(v => v.name == this.addressData.city);
+						//根据市索引设置默认区数据
+						this.columns[2] = this.area[pIdx][cIdx].map(res => res.name)
+						//区索引
+						let aIdx = this.area[pIdx][cIdx].findIndex(v => v.name == this.addressData.area);
+						this.indexs = [pIdx, cIdx, aIdx];
+						// console.log(pIdx, cIdx, aIdx);
+						console.log(this.indexs);
+					}
+				})
 			},
+			changeHandler(e) {
+				const {
+					columnIndex, //当前改变值的列下标
+					value,
+					values, // values为当前变化列的数组内容
+					indexs, //当前地区值下标
+					picker = this.$refs.uPicker
+				} = e
+				//columnIndex代表第几列，意思是下标为0的列发生变化
+
+				if (columnIndex === 0) {
+					picker.setColumnValues(1, this.city[indexs[0]].map(v => {
+						return {
+							name: v.name,
+							id: v.id
+						}
+					}))
+					picker.setColumnValues(2, this.area[indexs[0]][0].map(v => {
+						return {
+							name: v.name,
+							id: v.id
+						}
+					}))
+				}
+				if (columnIndex === 1) {
+					picker.setColumnValues(2, this.area[indexs[0]][indexs[1]].map(v => {
+						return {
+							name: v.name,
+							id: v.id
+						}
+					}))
+				}
+			},
+
+			// 选择器
 			// 求职身份选择器
 			sectionChange(index) {
 				this.current = index;
+				if (index == 0) {
+					this.from.job_role = "student"
+				} else {
+					this.from.job_role = "employee"
+				}
 			},
 			//性别选择器确认
 			sexConfirm(e) {
 				if (e.value[0] == '男') {
-					this.sex = "男",
-						this.sexvalue = "male"
+					this.sexvalue = "男",
+						this.from.sex = "male"
 				} else if (e.value[0] == "女") {
-					this.sex = "女",
-						this.sexvalue = "female"
+					this.sexvalue = "女",
+						this.from.sex = "female"
 				} else {
-					this.sex = "保密",
-						this.sexvalue = "secret"
+					this.sexvalue = "保密",
+						this.from.sex = "secret"
 				}
 				this.sexShow = false
 			},
+			//点击显示时间选择器
+			birthdayBtn() {
+				this.birthdayShow = true
+				//new Date(this.endDate).getTime()为你需要在选择器上显示的时间戳
+				this.$refs.picker.innerValue = new Date(946656000000).getTime()
+			},
 			//出生日期选择器
 			async birthdayConfirm(e) {
 				const timeFormat = uni.$u.timeFormat;
 				let timeValue = await timeFormat(e.value, 'yyyy-mm-dd');
-				this.birthday = timeValue;
+				this.from.birthday = timeValue;
 				this.birthdayShow = false
 			},
+			//政治面貌
+			politicsConfirm(e) {
+				this.from.political_status_id = e.value[0].id
+				this.politics = e.value[0].name
+				this.politicsShow = false;
+			},
+			//婚姻状态
+			maritalConfirm(e) {
+				this.from.marital_status_id = e.value[0].id
+				this.status = e.value[0].name
+				this.maritalShow = false
+			},
+			//参加工作时间
+			async workConfirm(e) {
+				const timeFormat = uni.$u.timeFormat;
+				let timeValue = await timeFormat(e.value, 'yyyy-mm-dd');
+				this.from.job_time = timeValue;
+				this.workShow = false
+			},
+			//户口地址
+			cityconfirm(e) {
+				let a = e.value[0].name + e.value[1].name + e.value[2].name
+				let ids = String(e.value[0].id) + String(e.value[1].id) + String(e.value[2].id)
+				this.from.province_id = e.value[1].id
+				this.from.city_id = e.value[0].id
+				// this.city1 = e.value.join("")
+				this.city1 = a
+				this.cityShow = false
+			},
+			jobConfirm(e) {
+				this.job = e.value[0].name
+				this.from.job_status_id = e.value[0].id
+				this.jobShow = false
+			},
 			//关闭模态框
 			close() {
 				this.sexShow = false;
-				this.birthdayShow = false
+				this.birthdayShow = false;
+				this.politicsShow = false;
+				this.maritalShow = false
+				this.workShow = false
+				this.cityShow = false
+				this.jobShow = false
 			},
-			next(){
+			next() {
+				if (!this.from.name) {
+					this.$u.toast("请填写姓名")
+					return
+				}
+				if (!this.sexvalue) {
+					this.$u.toast("请选择性别")
+					return
+				}
+				if (!this.from.birthday) {
+					this.$u.toast("请选择出生年月")
+					return
+				}
+				if (!this.job) {
+					this.$u.toast("请选择求职状态")
+					return
+				}
+				if (!this.from.job_time) {
+					this.$u.toast("请选择工作时间")
+					return
+				}
+
+				if (!this.from.city_id) {
+					this.$u.toast("请选择所在城市")
+					return
+				}
+				profile({
+					...this.from
+				}).then(res => {
+
+				})
+
 				uni.navigateTo({
-					url:"../pagesA/work"
+					url: '../pagesA/work'
 				})
+			},
+			return1() {
+				uni.navigateBack()
+			},
+			getHeight() {
+				const query = uni.createSelectorQuery().in(this);
+				query.select('#height').boundingClientRect(data => {
+					this.height = (data.height) * 2
+				}).exec();
 			}
-			
 		}
 	}
 </script>
@@ -229,7 +507,7 @@
 				font-weight: 500;
 				color: #FFFFFF;
 				line-height: 88rpx;
-				margin: 88rpx 0 0rpx 0;
+				margin: 10rpx 0 0rpx 0;
 				display: flex;
 				justify-content: center;
 			}

pagesA/work.vue

@@ -22,82 +22,163 @@
 			<view class="body-input u-flex-col u-row-center ">
 				<text class="input-title">公司名称</text>
 				<u--input customStyle="padding:0 !important" type="text" placeholder="请填写您的公司名称" border
-					placeholderClass='input-style'></u--input>
+					placeholderClass='input-style' v-model="job_experience.company_name"></u--input>
 			</view>
-			<view class="body-input u-flex-col u-row-center">
+			<view class="body-input u-flex-col u-row-center" @click="tohangye">
 				<text class="input-title">公司行业</text>
-				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
-					placeholder="请选择您的公司行业" border placeholderClass='input-style' suffixIcon="arrow-right"
-					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;"></u--input>
+				<view class="">
+					<u--input @changehangye="getdata" :disabled="true" disabledColor="#fff"
+						customStyle="padding:0 !important" type="text" placeholder="请选择您的公司行业" border
+						placeholderClass='input-style' suffixIcon="arrow-right"
+						suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;"
+						v-model="job_experience.industry"></u--input>
+				</view>
 			</view>
 			<view class="body-input u-flex-col u-row-center">
 				<text class="input-title">所属部门</text>
-				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
-					placeholder="请选择您的所属部门" border placeholderClass='input-style' suffixIcon="arrow-right"
-					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;"></u--input>
+				<u--input disabledColor="#fff" customStyle="padding:0 !important" type="text" placeholder="请填写您的的所属部门"
+					border placeholderClass='input-style' v-model="job_experience.department"></u--input>
 			</view>
 			<view class="body-input u-flex-col u-row-center">
 				<text class="input-title">职业名称</text>
-				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
-					placeholder="请选择您的职业名称" border placeholderClass='input-style' suffixIcon="arrow-right"
-					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;"></u--input>
+				<u--input disabledColor="#fff" customStyle="padding:0 !important" type="text" placeholder="请填写您的职业名称"
+					border placeholderClass='input-style' v-model="job_experience.job_name"></u--input>
 			</view>
 			<view class="body-input u-flex-col u-row-center">
 				<text class="input-title">在职时间</text>
 				<view class="u-flex u-row-between">
-					<u--input disabledColor="#fff" customStyle="padding:0 !important" type="text" placeholder="入职时间"
-						border placeholderClass='input-style'></u--input>
+					<view class="" @click="entryShow = true">
+						<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
+							placeholder="入职时间" border placeholderClass='input-style'
+							v-model="job_experience.start_time"></u--input>
+					</view>
 					<view class="">-</view>
-					<u--input disabledColor="#fff" customStyle="padding:0 !important" type="text" placeholder="离职时间"
-						inputAlign="center" border placeholderClass='input-style'></u--input>
+					<view class="" @click="dimissionShow = true">
+						<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
+							placeholder="离职时间" inputAlign="center" border placeholderClass='input-style'
+							v-model="job_experience.end_time"></u--input>
+					</view>
 				</view>
 			</view>
 			<view class="body-input u-flex-col u-row-center">
 				<text class="input-title">离职原因</text>
-				<u--input :disabled="true" disabledColor="#fff" customStyle="padding:0 !important" type="text"
-					placeholder="请填写" border placeholderClass='input-style'></u--input>
+				<u--input disabledColor="#fff" customStyle="padding:0 !important" type="text" placeholder="请填写离职原因"
+					border placeholderClass='input-style' v-model="job_experience.level_reason"></u--input>
 			</view>
 			<view class="body-input u-flex-col u-row-center">
 				<text class="input-title">工作内容</text>
-				<u--input customStyle="padding:0 !important" type="text" placeholder="请填写" border
-					placeholderClass='input-style'></u--input>
+				<u--input customStyle="padding:0 !important" type="text" placeholder="请填写工作内容" border
+					placeholderClass='input-style' v-model="job_experience.work_content"></u--input>
 			</view>
 			<view class="button" @click="next">
 				下一步
 			</view>
 		</view>
 		<!-- 选择器 -->
-		<u-picker title="性别" :show="sexShow" @confirm="sexConfirm" :columns="sexdata" @cancel='close()'></u-picker>
-		<u-datetime-picker title="出生日期" :minDate="minDate" @confirm="birthdayConfirm" :show="birthdayShow" mode="date"
-			@cancel='close()'></u-datetime-picker>
+		<u-datetime-picker title="入职时间" :minDate="minDate1" @confirm="entryConfirm" :show="entryShow" mode="date"
+			@cancel='entryShow = false'></u-datetime-picker>
+		<u-datetime-picker title="离职时间" :minDate="minDate" @confirm="dimissionConfirm" :show="dimissionShow" mode="date"
+			@cancel='dimissionShow = false'></u-datetime-picker>
 	</view>
 </template>
 
 <script>
 	import {
-
+		get_category_industry
 	} from "@/units/inquire.js"
 	export default {
 		data() {
 			return {
-				height: ''
+				height: '',
+				entryShow: false,
+				dimissionShow: false,
+				industryShow: false,
+				minDate: "",
+				minDate1: "",
+				job_experience: {
+					industry: "", //公司行业名称
+					industry_id: "", //公司行业id
+					company_name: "", //公司名称
+					start_time: "", //在职时间
+					end_time: "", //离职时间
+					department: "", //所属部门
+					job_name: "",
+					level_reason: "", //离职原因
+					work_content: "", //工作内容
+				}
 			}
 		},
 		onLoad() {
-			this.getHeight()
-			this.minDate = Number(new Date('1900-01-01'));
+			this.minDate = Number(new Date('2000-01-01'));
+			this.minDate1 = Number(new Date('1980-01-01'));
+			this.get_category_industry()
 		},
 		methods: {
-			getHeight() {
-				const query = uni.createSelectorQuery().in(this);
-				query.select('#height').boundingClientRect(data => {
-					this.height = (data.height) * 2
-				}).exec();
+			getdata(item) {
+				console.log(item);
+			},
+			tohangye() {
+				uni.navigateTo({
+					url: "../pagesA/change-hangye1"
+				})
+			},
+			get_category_industry() {
+				get_category_industry().then(res => {
+					console.log(res);
+				})
+			},
+			async entryConfirm(e) {
+				const timeFormat = uni.$u.timeFormat;
+				console.log(e.value);
+				let timeValue = await timeFormat(e.value, 'yyyy-mm-dd');
+				this.job_experience.start_time = timeValue;
+				this.entryShow = false
 			},
-			return1(){
+			async dimissionConfirm(e) {
+				const timeFormat = uni.$u.timeFormat;
+				let timeValue = await timeFormat(e.value, 'yyyy-mm-dd');
+				this.job_experience.end_time = timeValue;
+				this.dimissionShow = false
+			},
+			return1() {
 				uni.navigateBack()
 			},
 			next() {
+				if (!this.job_experience.company_name) {
+					this.$u.toast("请填写公司名称")
+					return
+				}
+				if (!his.job_experience.industry) {
+					this.$u.toast("请选择您的公司行业")
+					return
+				}
+				if (!his.job_experience.department) {
+					this.$u.toast("请填写您的所属部门")
+					return
+				}
+				if (!his.job_experience.job_name) {
+					this.$u.toast("请填写您的职业名称")
+					return
+				}
+				if (!his.job_experience.start_time) {
+					this.$u.toast("请选择入职时间")
+					return
+				}
+				if (!his.job_experience.end_time) {
+					this.$u.toast("请选择离职时间")
+					return
+				}
+				if (!his.job_experience.level_reason) {
+					this.$u.toast("请填写离职原因")
+					return
+				}
+				if (!his.job_experience.work_content) {
+					this.$u.toast("请填写工作内容")
+					return
+				}
+
+
+
 				uni.navigateTo({
 					url: "../pagesA/Project "
 				})
@@ -113,7 +194,7 @@
 
 	.index-page {
 		overflow: hidden;
-		margin-bottom: 60rpx;
+		background-color: #fff;
 
 		.mingpianfont {
 			height: 50rpx;
@@ -183,6 +264,8 @@
 				margin: 10rpx 0 0rpx 0;
 				display: flex;
 				justify-content: center;
+				margin-bottom: 60rpx;
+				margin-top: 20rpx;
 			}
 		}
 

units/inquire.js

@@ -294,4 +294,6 @@ export function get_category_industry(param){
 // 规模列表
 export function get_company_scale(param){
 	return request.post('/api/commons/get_company_scale', param)
-}
+}
+
+

unpackage/dist/dev/mp-weixin/app.json

@@ -22,7 +22,8 @@
         "teach",
         "expectation",
         "xieyi",
-        "change-hangye1"
+        "change-hangye1",
+        "change-hangye"
       ]
     },
     {

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-loading-icon/u-loading-icon.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-navbar/u-navbar.json

@@ -1,7 +1,7 @@
 {
+  "component": true,
   "usingComponents": {
     "u-status-bar": "/node-modules/uview-ui/components/u-status-bar/u-status-bar",
     "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-overlay/u-overlay.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "u-transition": "/node-modules/uview-ui/components/u-transition/u-transition"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-picker/u-picker.json

@@ -1,8 +1,8 @@
 {
+  "component": true,
   "usingComponents": {
     "u-popup": "/node-modules/uview-ui/components/u-popup/u-popup",
     "u-toolbar": "/node-modules/uview-ui/components/u-toolbar/u-toolbar",
     "u-loading-icon": "/node-modules/uview-ui/components/u-loading-icon/u-loading-icon"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-radio/u-radio.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-safe-bottom/u-safe-bottom.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-status-bar/u-status-bar.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-switch/u-switch.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "u-loading-icon": "/node-modules/uview-ui/components/u-loading-icon/u-loading-icon"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-tabs/u-tabs.json

@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "u-badge": "/node-modules/uview-ui/components/u-badge/u-badge"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/node-modules/uview-ui/components/u-transition/u-transition.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pagesA/Project .js

@@ -106,9 +106,6 @@ try {
     "u-Input": function () {
       return Promise.all(/*! import() | node-modules/uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u--input/u--input.vue */ 618))
     },
-    uPicker: function () {
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-picker/u-picker.vue */ 624))
-    },
     uDatetimePicker: function () {
       return Promise.all(/*! import() | node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-datetime-picker/u-datetime-picker.vue */ 632))
     },
@@ -134,6 +131,20 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  if (!_vm._isMounted) {
+    _vm.e0 = function ($event) {
+      _vm.entryShow = true
+    }
+    _vm.e1 = function ($event) {
+      _vm.dimissionShow = true
+    }
+    _vm.e2 = function ($event) {
+      _vm.entryShow = false
+    }
+    _vm.e3 = function ($event) {
+      _vm.dimissionShow = false
+    }
+  }
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -169,10 +180,13 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 /* WEBPACK VAR INJECTION */(function(uni) {
 
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 56));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 58));
 __webpack_require__(/*! @/units/inquire.js */ 165);
 //
 //
@@ -240,23 +254,94 @@ __webpack_require__(/*! @/units/inquire.js */ 165);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
-      height: ''
+      height: '',
+      dimissionShow: false,
+      entryShow: false,
+      minDate: '',
+      minDate1: "",
+      project_experience: {
+        name: "",
+        //项目名称
+        start_time: "",
+        //项目开始时间
+        end_time: "",
+        //项目结束时间
+        description: "",
+        //项目描述
+        role: "",
+        //项目角色
+        company_name: "" //公司名称
+      }
     };
   },
   onLoad: function onLoad() {
-    this.getHeight();
-    this.minDate = Number(new Date('1900-01-01'));
+    this.minDate = Number(new Date('2000-01-01'));
+    this.minDate1 = Number(new Date('2000-01-01'));
   },
   methods: {
-    getHeight: function getHeight() {
+    entryConfirm: function entryConfirm(e) {
       var _this = this;
-      var query = uni.createSelectorQuery().in(this);
-      query.select('#height').boundingClientRect(function (data) {
-        _this.height = data.height * 2;
-      }).exec();
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var timeFormat, timeValue;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                timeFormat = uni.$u.timeFormat;
+                console.log(e.value);
+                _context.next = 4;
+                return timeFormat(e.value, 'yyyy-mm-dd');
+              case 4:
+                timeValue = _context.sent;
+                _this.project_experience.start_time = timeValue;
+                _this.entryShow = false;
+              case 7:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
+    },
+    dimissionConfirm: function dimissionConfirm(e) {
+      var _this2 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var timeFormat, timeValue;
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                timeFormat = uni.$u.timeFormat;
+                _context2.next = 3;
+                return timeFormat(e.value, 'yyyy-mm-dd');
+              case 3:
+                timeValue = _context2.sent;
+                _this2.project_experience.end_time = timeValue;
+                _this2.dimissionShow = false;
+              case 6:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2);
+      }))();
+    },
+    return1: function return1() {
+      uni.navigateBack();
     },
     todcp: function todcp() {
       uni.navigateTo({
@@ -264,6 +349,31 @@ var _default = {
       });
     },
     next: function next() {
+      if (!this.project_experience.name) {
+        this.$u.toast("请填写项目名称");
+        return;
+      }
+      if (!this.project_experience.start_time) {
+        this.$u.toast("请填写项目开始时间");
+        return;
+      }
+      if (!this.project_experience.end_time) {
+        this.$u.toast("请填写项目项目结束时间");
+        return;
+      }
+      if (!this.project_experience.description) {
+        this.$u.toast("请填写项目描述");
+        return;
+      }
+      if (!this.project_experience.role) {
+        this.$u.toast("请填写项目角色");
+        return;
+      }
+      if (!this.project_experience.company_name) {
+        this.$u.toast("请填写公司名称");
+        return;
+      }
+      uni.setStorageSync("project_experience", this.project_experience);
       uni.navigateTo({
         url: '../pagesA/teach'
       });

unpackage/dist/dev/mp-weixin/pagesA/Project .json

@@ -5,7 +5,6 @@
   "usingComponents": {
     "u-navbar": "/node-modules/uview-ui/components/u-navbar/u-navbar",
     "u--input": "/node-modules/uview-ui/components/u--input/u--input",
-    "u-picker": "/node-modules/uview-ui/components/u-picker/u-picker",
     "u-datetime-picker": "/node-modules/uview-ui/components/u-datetime-picker/u-datetime-picker"
   }
 }

unpackage/dist/dev/mp-weixin/pagesA/Project .wxss

@@ -29,7 +29,8 @@ page {
 }
 .index-page {
   overflow: hidden;
-  margin-bottom: 60rpx;
+  background: #fff;
+  height: 100vh;
 }
 .index-page .mingpianfont {
   height: 50rpx;
@@ -92,6 +93,7 @@ page {
   margin: 10rpx 0 0rpx 0;
   display: flex;
   justify-content: center;
+  margin-bottom: 60rpx;
 }
 .index-page .index-item .item-down text:first-child {
   font-size: 22rpx;

unpackage/dist/dev/mp-weixin/pagesA/expectation.js

@@ -240,24 +240,18 @@ __webpack_require__(/*! @/units/inquire.js */ 165);
 var _default = {
   data: function data() {
     return {
-      height: ''
+      job_intention: {
+        advantage: '' //优势亮点
+      }
     };
   },
   onLoad: function onLoad() {
-    this.getHeight();
     this.minDate = Number(new Date('1900-01-01'));
   },
   methods: {
     return1: function return1() {
       uni.navigateBack();
     },
-    getHeight: function getHeight() {
-      var _this = this;
-      var query = uni.createSelectorQuery().in(this);
-      query.select('#height').boundingClientRect(function (data) {
-        _this.height = data.height * 2;
-      }).exec();
-    },
     next: function next() {
       uni.switchTab({
         url: '../pages/index/index'

unpackage/dist/dev/mp-weixin/pagesA/expectation.wxss

@@ -29,8 +29,8 @@ page {
 }
 .index-page {
   overflow: hidden;
+  height: 100vh;
   background: #fff;
-  margin-bottom: 60rpx;
 }
 .index-page .mingpianfont {
   height: 50rpx;
@@ -94,6 +94,7 @@ page {
   margin: 170rpx 0 0rpx 0;
   display: flex;
   justify-content: center;
+  margin-bottom: 60rpx;
 }
 .index-page .index-item .item-down text:first-child {
   font-size: 22rpx;

unpackage/dist/dev/mp-weixin/pagesA/jianli.js

@@ -142,24 +142,18 @@ var render = function () {
       _vm.sexShow = true
     }
     _vm.e1 = function ($event) {
-      _vm.birthdayShow = true
-    }
-    _vm.e2 = function ($event) {
       _vm.cityShow = true
     }
-    _vm.e3 = function ($event) {
+    _vm.e2 = function ($event) {
       _vm.jobShow = true
     }
-    _vm.e4 = function ($event) {
-      _vm.workShow = true
-    }
-    _vm.e5 = function ($event) {
+    _vm.e3 = function ($event) {
       _vm.maritalShow = true
     }
-    _vm.e6 = function ($event) {
+    _vm.e4 = function ($event) {
       _vm.politicsShow = true
     }
-    _vm.e7 = function ($event) {
+    _vm.e5 = function ($event) {
       _vm.cityShow = false
     }
   }
@@ -204,123 +198,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 56));
+var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 58));
 var _inquire = __webpack_require__(/*! @/units/inquire.js */ 165);
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var _default = {
   data: function data() {
     return {
@@ -341,11 +223,11 @@ var _default = {
       //市数据
       area: [],
       //区数据
-      provinceid: [],
+      provinceid: "",
       //省数据
-      cityid: [],
+      cityid: "",
       //市数据
-      areaid: [],
+      areaid: "",
       //区数据
       indexs: [],
       //默认地区下标
@@ -378,15 +260,38 @@ var _default = {
       job: "",
       from: {
         name: "",
-        marital_status_id: "",
-        job_time: "",
         sex: "",
         birthday: "",
+        job_name: "",
+        industry_id: "",
+        //行业id
+        province_id: "",
+        //省份id
+        city_id: "",
+        //城市id
+        invitation_code: "",
+        //邀请码
+        avatar: "",
+        //头像
         job_role: "student",
+        //求职身份
+        job_time: "",
+        //参加工作时间
+        mobile: "",
+        //手机号
+        domicile_province_id: "",
+        //户籍省份
+        domicile_city_id: "",
+        //市
         political_status_id: "",
+        //政治面貌
+        marital_status_id: "",
+        //婚姻状态
         job_status_id: "",
-        mobile: ""
+        //求职
+        email: "" //邮箱
       },
+
       minDate: "",
       minDate1: "",
       height: '',
@@ -412,6 +317,10 @@ var _default = {
     this.getJob();
   },
   methods: {
+    workBtn: function workBtn() {
+      this.workShow = true;
+      this.$refs.pickers.innerValue = new Date(1672502400000).getTime();
+    },
     // 获取政治面貌
     getpolitics: function getpolitics() {
       var _this = this;
@@ -572,6 +481,12 @@ var _default = {
       }
       this.sexShow = false;
     },
+    //点击显示时间选择器
+    birthdayBtn: function birthdayBtn() {
+      this.birthdayShow = true;
+      //new Date(this.endDate).getTime()为你需要在选择器上显示的时间戳
+      this.$refs.picker.innerValue = new Date(946656000000).getTime();
+    },
     //出生日期选择器
     birthdayConfirm: function birthdayConfirm(e) {
       var _this5 = this;
@@ -636,14 +551,15 @@ var _default = {
     cityconfirm: function cityconfirm(e) {
       var a = e.value[0].name + e.value[1].name + e.value[2].name;
       var ids = String(e.value[0].id) + String(e.value[1].id) + String(e.value[2].id);
-      console.log(ids);
+      this.from.domicile_city_id = e.value[1].id;
+      this.from.domicile_province_id = e.value[0].id;
       // this.city1 = e.value.join("")
       this.city1 = a;
       this.cityShow = false;
     },
     jobConfirm: function jobConfirm(e) {
       this.job = e.value[0].name;
-      this.job_status_id = e.value[0].id;
+      this.from.job_status_id = e.value[0].id;
       this.jobShow = false;
     },
     //关闭模态框
@@ -685,6 +601,11 @@ var _default = {
         this.$u.toast("请输入正确的手机号");
         return;
       }
+      if (uni.$u.test.email(this.from.email)) {
+        this.$u.toast("请输入正确的邮箱号");
+        return;
+      }
+      (0, _inquire.profile)(_objectSpread({}, this.from)).then(function (res) {});
       uni.navigateTo({
         url: '../pagesA/userinfo'
       });