11.15

pages/index/index.vue

@@ -150,7 +150,8 @@
 	import {
 		getList,
 		getareacity,
-		is_auth
+		is_auth,
+		resumeDetail 
 	} from "../../units/inquire.js"
 	export default {
 		data() {
@@ -192,10 +193,10 @@
 		},
 		onLoad() {
 			this.category_industry_id = uni.getStorageSync("category_industry_id")
-			this.category_industry_name = uni.getStorageSync("category_industry_name")
 			this.getlist()
 			this.getcity()
 			this.auth()
+			this.resumeDetail()
 			this.city = {
 				name: '',
 				id: ''
@@ -214,6 +215,11 @@
 			}
 		},
 		methods: {
+			resumeDetail(){
+					resumeDetail().then(res=>{
+						console.log(res);
+					})
+			},
 			toindexsearch(){
 				uni.navigateTo({
 					url:"/pagesA/index-search"

pagesA/Project .vue

@@ -44,15 +44,13 @@
 			<view class="body-input u-flex-col u-row-center">
 				<text class="input-title">公司名称</text>
 				<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;"
+					border placeholderClass='input-style' 
 					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 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;"
+					border placeholderClass='input-style'
 					v-model="project_experience.role"></u--input>
 			</view>
 			<view class="body-input u-flex-col u-row-center" @click="todcp">
@@ -62,18 +60,16 @@
 					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;">
-
-			</view>
+			<view class="body-input u-flex-col u-row-center " style="height: 250rpx;"></view>
 			<view class="button" @click="next">
 				下一步
 			</view>
 		</view>
 		<!-- 选择器 -->
-		<u-datetime-picker title="项目开始时间" :minDate="minDate1" @confirm="entryConfirm" :show="entryShow" mode="date"
+		<u-datetime-picker title="项目开始时间" :minDate="minDate1" @confirm="entryConfirm" :show="entryShow" mode="year-month"
 			@cancel='entryShow = false'></u-datetime-picker>
 		<u-datetime-picker title="项目结束时间" :minDate="minDate" @confirm="dimissionConfirm" :show="dimissionShow"
-			mode="date" @cancel='dimissionShow = false'></u-datetime-picker>
+			mode="year-month" @cancel='dimissionShow = false'></u-datetime-picker>
 	</view>
 </template>
 
@@ -102,18 +98,21 @@
 		onLoad() {
 			this.minDate = Number(new Date('2000-01-01'));
 			this.minDate1 = Number(new Date('2000-01-01'));
+			if(uni.getStorageSync("project_experience1")){
+				this.project_experience = uni.getStorageSync("project_experience1")
+			}
 		},
 		methods: {
 			async entryConfirm(e) {
 				const timeFormat = uni.$u.timeFormat;
 				console.log(e.value);
-				let timeValue = await timeFormat(e.value, 'yyyy-mm-dd');
+				let timeValue = await timeFormat(e.value, 'yyyy-mm');
 				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');
+				let timeValue = await timeFormat(e.value, 'yyyy-mm');
 				this.project_experience.end_time = timeValue;
 				this.dimissionShow = false
 			},
@@ -161,6 +160,7 @@
 				let pre = "project_experience"
 				let nObj = Object.keys(this.project_experience).reduce((a, c) => (a[`${pre}.${c}`] = this.project_experience[c], a), {});
 				uni.setStorageSync("project_experience",nObj)
+				uni.setStorageSync("project_experience1",this.project_experience)
 				uni.navigateTo({
 					url:'../pagesA/teach'
 				})

pagesA/expectation.vue

@@ -35,7 +35,7 @@
 					<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_intention.city_name"></u--input>
+						v-model="job_intention.city"></u--input>
 				</view>
 			</view>
 			<view class="body-input u-flex-col u-row-center">
@@ -60,8 +60,10 @@
 				<text class="input-title">优势亮点(选填)</text>
 				<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;"></u--input>
+					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;"
+					v-model="job_intention.advantage"></u--input>
 			</view>
+			<view class="" style="height: 250rpx;"></view>
 			<view class="button" @click="next">
 				开启求职之旅
 			</view>
@@ -104,21 +106,21 @@
 					isDefault: false
 				}, //地址数据
 				job_intention: {
-					city_name: "", //城市地点
+					city: "", //城市地点
 					advantage: '', //优势亮点
 					province_id: "", //期望省份ID
 					city_id: "", //期望城市ID
 					salary_type: "", //薪资类型: year = 年薪;month = 月薪
-					salary: "", //薪水
 					salary_month: "", //一年多少薪
 					category_job_first: "", //职位分类一级ID
 					category_job_second: "", //职位分类二级ID
 					category_job_id: "", //职位分类三级ID
-					category_job_name: "", //职业名称
 					category_industry_first: "", //行业一级ID
 					category_industry_id: "", //行业二级ID
-					category_industry_name: "", //行业名称
-					category_field_id: "", //领域ID
+					
+					
+					// category_industry_name: "", //行业名称
+					// category_job_name: "", //职业名称
 				},
 
 				xinzilist: [{
@@ -154,11 +156,25 @@
 		},
 		onLoad() {
 			this.AllArea()
-			this.from = uni.getStorageSync("from")
-			this.addressData = uni.getStorageSync("addressData")
-			this.job_experience = uni.getStorageSync("job_experience")
-			this.project_experience = uni.getStorageSync("project_experience")
-			this.education_experience = uni.getStorageSync("education_experience")
+			if (uni.getStorageSync("from1")) {
+				console.log(uni.getStorageSync("from1"));
+				this.from = uni.getStorageSync("from1")
+			}
+			if (uni.getStorageSync("addressData1")) {
+				this.addressData = uni.getStorageSync("addressData1")
+			}
+			if (uni.getStorageSync("job_experience1")) {
+				this.job_experience = uni.getStorageSync("job_experience1")
+			}
+			if (uni.getStorageSync("project_experience1")) {
+				this.project_experience = uni.getStorageSync("project_experience1")
+			}
+			if (uni.getStorageSync("education_experience1")) {
+				this.education_experience = uni.getStorageSync("education_experience1")
+			}
+			if (uni.getStorageSync("job_intention1")) {
+				this.job_intention = uni.getStorageSync("job_intention1")
+			}
 		},
 		methods: {
 			//户口地址
@@ -174,14 +190,14 @@
 				this.job_intention.city_id = e.value[1].id
 				this.job_intention.province_id = e.value[0].id
 				// this.city1 = e.value.join("")
-				this.job_intention.city_name = a
+				this.job_intention.city = a
 				this.cityShow = false
 			},
-			jobConfirm(e) {
-				this.job = e.value[0].name
-				this.from.job_status_id = e.value[0].id
-				this.jobShow = false
-			}, //所有地区
+			// jobConfirm(e) {
+			// 	// this.job = e.value[0].name
+			// 	// this.from.job_status_id = e.value[0].id
+			// 	// this.jobShow = false
+			// }, //所有地区
 			AllArea() {
 				getAllArea().then((res) => {
 					this.province = res.data.map(t => {
@@ -303,30 +319,30 @@
 						changehangye: (res) => {
 							console.log(res);
 							console.log(res[1].name);
-							this.job_intention.category_industry_first = res[0].id, //行业一级ID
-								this.job_intention.category_industry_id = res[1].id, //行业二级ID
-								this.job_intention.category_industry_name = res[1].name //行业名称
+							this.job_intention.category_industry_first = res[0].id //行业一级ID
+							this.job_intention.category_industry_id = res[1].id //行业二级ID
+							this.job_intention.category_industry_name = res[1].name //行业名称
 						}
 					}
 				})
 			},
 			return1() {
 				uni.navigateBack()
-
 			},
 			next() {
 				let pre = "job_intention"
-				let nObj = Object.keys(this.job_intention).reduce((a, c) => (a[`${pre}.${c}`] = this.job_intention[c],a), {});
+				let nObj = Object.keys(this.job_intention).reduce((a, c) => (a[`${pre}.${c}`] = this.job_intention[c],
+					a), {});
 				uni.setStorageSync("job_intention", nObj)
+				uni.setStorageSync("job_intention1", this.job_intention)
 				create({
 					...this.from,
-					...this.addressData,
-					...this.job_experience,
-					...this.project_experience,
-					...this.education_experience,
-					...nObj
-				}).then(res=>{
-					if(res.c0de == 1){
+					job_experience: [this.job_experience],
+					project_experience: [this.project_experience],
+					education_experience:[this.education_experience],
+					// job_intention: [this.job_intention]
+				}).then(res => {
+					if (res.code == 1) {
 						this.$u.toast(res.msg)
 						uni.switchTab({
 							url: '../pages/index/index'
@@ -335,7 +351,6 @@
 				})
 				uni.setStorageSync("category_industry_name", this.job_intention.category_industry_name)
 				uni.setStorageSync("category_industry_id", this.job_intention.category_industry_id)
-
 			}
 		}
 	}
@@ -418,7 +433,7 @@
 				font-weight: 500;
 				color: #FFFFFF;
 				line-height: 88rpx;
-				margin: 170rpx 0 0rpx 0;
+				margin: 10rpx 0 0rpx 0;
 				display: flex;
 				justify-content: center;
 				margin-bottom: 60rpx;

pagesA/jianli.vue

@@ -23,21 +23,22 @@
 		<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' v-model="from.name"></u--input>
+				<u-input customStyle="padding:0 !important" type="text" placeholder="请填写您的真实姓名" border
+					placeholderClass='input-style' v-model="user.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"
+				<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="sexvalue"></u--input>
+					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;"
+					v-model="user.sexvalue"></u-input>
 			</view>
 			<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="from.birthday"></u--input>
+					v-model="user.birthday"></u--input>
 			</view>
 			<view class="body-input u-flex-col u-row-center" style="height: 128rpx;">
 				<view class="u-flex u-row-between ">
@@ -45,49 +46,51 @@
 						<text class="input-title">求职身份</text>
 					</view>
 					<u-subsection :list="list" :current="current" @change="sectionChange"
-						v-model="from.job_role"></u-subsection>
+						v-model="user.job_role"></u-subsection>
 				</view>
 			</view>
 			<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="city1"></u--input>
+					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" v-model="user.city1"></u--input>
 			</view>
 			<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"></u--input>
+					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" v-model="user.job"></u--input>
 			</view>
 			<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="from.job_time"></u--input>
+					v-model="user.job_time"></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' v-model="from.email"></u--input>
+					placeholderClass='input-style' v-model="user.email"></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' v-model="from.mobile"></u--input>
+					placeholderClass='input-style' v-model="user.mobile"></u--input>
 			</view>
 			<view class="body-input u-flex-col u-row-center" @click="maritalShow = 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="status"></u--input>
+					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;"
+					v-model="user.status"></u--input>
 			</view>
 			<view class="body-input u-flex-col u-row-center" @click="politicsShow = 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="politics"></u--input>
+					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;"
+					v-model="user.politics"></u--input>
 			</view>
 			<view class="button" @click="next">
 				保存
@@ -103,8 +106,8 @@
 			@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-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>
@@ -121,7 +124,6 @@
 	export default {
 		data() {
 			return {
-
 				addressData: {
 					id: "",
 					province: "",
@@ -139,8 +141,6 @@
 				cityid: "", //市数据
 				areaid: "", //区数据
 				indexs: [], //默认地区下标
-
-
 				//选择器状态
 				sexShow: false, //性别
 				birthdayShow: false, //出生年月
@@ -149,17 +149,7 @@
 				workShow: false, //工作时间
 				cityShow: false, //户口所在地
 				jobShow: false, //工作显示
-
-
-
-
-				// 列表数据
-				sexvalue: "", //性别传的值
-				status: "", //婚姻状态
-				politics: "", //政治面貌
-				city1: "", //地址
-				job: "",
-				from: {
+				user: {
 					name: "",
 					sex: "",
 					birthday: "",
@@ -177,7 +167,12 @@
 					political_status_id: "", //政治面貌
 					marital_status_id: "", //婚姻状态
 					job_status_id: "", //求职
-					email: "" //邮箱
+					email: "", //邮箱
+					sexvalue: "",
+					city1: "",
+					politics: "",
+					status: "",
+					job: "",
 				},
 				minDate: "",
 				minDate1: "",
@@ -205,10 +200,19 @@
 			this.getpolitics()
 			this.getmarital()
 			this.AllArea()
-			this.getJob()  
+			this.getJob()
+			if(uni.getStorageSync('from')) {
+				this.user = uni.getStorageSync("from")
+				if (this.user.job == "student") {
+					this.current = 0
+				}else{
+					this.current = 1
+				}
+			}
+			console.log(this.user);
 		},
 		methods: {
-			workBtn(){
+			workBtn() {
 				this.workShow = true
 				this.$refs.pickers.innerValue = new Date(1672502400000).getTime()
 			},
@@ -337,24 +341,26 @@
 			// 选择器
 			// 求职身份选择器
 			sectionChange(index) {
+				console.log(index);
 				this.current = index;
 				if (index == 0) {
-					this.from.job_role = "student"
+					this.user.job_role = "student"
 				} else {
-					this.from.job_role = "employee"
+					this.user.job_role = "employee"
 				}
 			},
 			//性别选择器确认
 			sexConfirm(e) {
+				console.log(e);
 				if (e.value[0] == '男') {
-					this.sexvalue = "男",
-						this.from.sex = "male"
+					this.user.sexvalue = "男",
+					this.user.sex = "male"
 				} else if (e.value[0] == "女") {
-					this.sexvalue = "女",
-						this.from.sex = "female"
+					this.user.sexvalue = "女",
+					this.user.sex = "female"
 				} else {
-					this.sexvalue = "保密",
-						this.from.sex = "secret"
+					this.user.sexvalue = "保密",
+					this.user.sex = "secret"
 				}
 				this.sexShow = false
 			},
@@ -368,41 +374,41 @@
 			async birthdayConfirm(e) {
 				const timeFormat = uni.$u.timeFormat;
 				let timeValue = await timeFormat(e.value, 'yyyy-mm-dd');
-				this.from.birthday = timeValue;
+				this.user.birthday = timeValue;
 				this.birthdayShow = false
 			},
 			//政治面貌
 			politicsConfirm(e) {
-				this.from.political_status_id = e.value[0].id
-				this.politics = e.value[0].name
+				this.user.political_status_id = e.value[0].id
+				this.user.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.user.marital_status_id = e.value[0].id
+				this.user.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.user.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.domicile_city_id = e.value[1].id
-				this.from.domicile_province_id = e.value[0].id
+				this.user.domicile_city_id = e.value[1].id
+				this.user.domicile_province_id = e.value[0].id
 				// this.city1 = e.value.join("")
-				this.city1 = a
+				this.user.city1 = a
 				this.cityShow = false
 			},
 			jobConfirm(e) {
-				this.job = e.value[0].name
-				this.from.job_status_id = e.value[0].id
+				this.user.job = e.value[0].name
+				this.user.job_status_id = e.value[0].id
 				this.jobShow = false
 			},
 			//关闭模态框
@@ -416,45 +422,40 @@
 				this.jobShow = false
 			},
 			next() {
-				if (!this.from.name) {
+				if (!this.user.name) {
 					this.$u.toast("请填写姓名")
 					return
 				}
-				if (!this.sexvalue) {
+				if (!this.user.sexvalue) {
 					this.$u.toast("请选择性别")
 					return
 				}
-				if (!this.from.birthday) {
-					this.$u.toast("请选择出生年月")
-					return
-				}
-				if (!this.city1) {
-					this.$u.toast("请选择户口所在地")
-					return
-				}
-				if (!this.job) {
-					this.$u.toast("请选择当前求职状态")
-					return
-				}
-				if (!this.from.job_time) {
-					this.$u.toast("请选择工作时间")
-					return
-				}
-				if (!this.$u.test.mobile(this.from.mobile)) {
-					this.$u.toast("请输入正确的手机号")
-					return
-				}
-				if (uni.$u.test.email(this.from.email)) {
-					this.$u.toast("请输入正确的邮箱号")
-					return
-				}
-				profile({
-					...this.from
-				}).then(res => {
-					
-				})
-				
-				uni.setStorageSync("from",this.from)
+				// if (!this.user.birthday) {
+				// 	this.$u.toast("请选择出生年月")
+				// 	return
+				// }
+				// if (!this.user.city1) {
+				// 	this.$u.toast("请选择户口所在地")
+				// 	return
+				// }
+				// if (!this.user.job) {
+				// 	this.$u.toast("请选择当前求职状态")
+				// 	return
+				// }
+				// if (!this.user.job_time) {
+				// 	this.$u.toast("请选择工作时间")
+				// 	return
+				// }
+				// if (!this.$u.test.mobile(this.user.mobile)) {
+				// 	this.$u.toast("请输入正确的手机号")
+				// 	return
+				// }
+				// if (!this.$u.test.email(this.user.email)) {
+				// 	this.$u.toast("请输入正确的邮箱号")
+				// 	return
+				// }
+
+				uni.setStorageSync("from", this.user)
 
 				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 @leftClick="return1">
+				
 				</u-navbar>
 				<view class="header-down " :style="{marginTop:height+'rpx'}"
 					style="padding: 28rpx 0 0 32rpx;box-sizing: border-box;">
@@ -31,7 +31,7 @@
 					<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>
+						v-model="education_name"></u--input>
 				</view>
 			</view>
 			<view class="body-input u-flex-col u-row-center">
@@ -55,15 +55,16 @@
 					</view>
 				</view>
 			</view>
+			<view class="" style="height: 422rpx;"></view>
 			<view class="button" @click="next">
 				下一步
 			</view>
 		</view>
 		<!-- 选择器 -->
 		<!-- 选择器 -->
-		<u-datetime-picker title="上学时间" :minDate="minDate1" @confirm="entryConfirm" :show="entryShow" mode="date"
+		<u-datetime-picker title="上学时间" :minDate="minDate1" @confirm="entryConfirm" :show="entryShow" mode="year-month"
 			@cancel='close()'></u-datetime-picker>
-		<u-datetime-picker title="毕业时间" :minDate="minDate" @confirm="dimissionConfirm" :show="dimissionShow" mode="date"
+		<u-datetime-picker title="毕业时间" :minDate="minDate" @confirm="dimissionConfirm" :show="dimissionShow" mode="year-month"
 			@cancel='close()'></u-datetime-picker>
 
 		<u-picker keyName="name" :show="xueli" @confirm="confirm" :columns="list" @close="close()"></u-picker>
@@ -85,6 +86,7 @@
 				dimissionShow: false,
 				entryShow: false,
 				xueli: false,
+				education_name: "", //学历
 				education_experience: {
 					name: "", //学校名称
 					is_recruit: "", //是否统招
@@ -92,7 +94,7 @@
 					major: "", //专业名称
 					start_time: "", //开始时间
 					end_time: "", //结束时间
-					education: "", //学历
+					
 				}
 			}
 		},
@@ -100,6 +102,9 @@
 			this.minDate = Number(new Date('2000-01-01'));
 			this.minDate1 = Number(new Date('2000-01-01'));
 			this.get_education()
+			if(uni.getStorageSync("education_experience1")){
+				this.education_experience = uni.getStorageSync("education_experience1")
+			}
 		},
 		methods: {
 			close() {
@@ -109,7 +114,7 @@
 			},
 			confirm(e) {
 				this.education_experience.education_id = e.value[0].id
-				this.education_experience.education = e.value[0].name
+				this.education_name = e.value[0].name
 				this.xueli = false
 			},
 			get_education() {
@@ -121,13 +126,13 @@
 			async entryConfirm(e) {
 				const timeFormat = uni.$u.timeFormat;
 				console.log(e.value);
-				let timeValue = await timeFormat(e.value, 'yyyy-mm-dd');
+				let timeValue = await timeFormat(e.value, 'yyyy-mm');
 				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');
+				let timeValue = await timeFormat(e.value, 'yyyy-mm');
 				this.education_experience.end_time = timeValue;
 				this.dimissionShow = false
 			},
@@ -139,7 +144,7 @@
 					this.$u.toast("请填写学校名称")
 					return
 				}
-				if (!this.education_experience.education) {
+				if (!this.education_name) {
 					this.$u.toast("请选择学历")
 					return
 				}
@@ -158,7 +163,8 @@
 				let pre = "education_experience"
 				let nObj = Object.keys(this.education_experience).reduce((a, c) => (a[`${pre}.${c}`] = this
 					.education_experience[c], a), {});
-				uni.setStorageSync("project_experience", nObj)
+				uni.setStorageSync("education_experience", nObj)
+				uni.setStorageSync("education_experience1", this.education_experience)
 				uni.navigateTo({
 					url: '../pagesA/expectation'
 				})
@@ -246,8 +252,8 @@
 				margin: 10rpx 0 0rpx 0;
 				display: flex;
 				justify-content: center;
-				position: fixed;
-				bottom: 60rpx;
+				// position: fixed;
+				// bottom: 60rpx;
 			}
 		}
 

pagesA/userinfo.vue

@@ -5,7 +5,6 @@
 			<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 :safeAreaInsetTop="true" @leftClick="return1">
-
 				</u-navbar>
 				<view class="header-down " style="padding: 28rpx 0 0 32rpx;box-sizing: border-box;">
 					<view class="mingpianfont">
@@ -30,7 +29,8 @@
 				<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="sexvalue"></u--input>
+					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;"
+					v-model="from.sexvalue"></u--input>
 			</view>
 			<view class="body-input u-flex-col u-row-center" @click="birthdayBtn">
 				<text class="input-title">出生年月</text>
@@ -43,7 +43,7 @@
 				<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"></u--input>
+					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" v-model="from.job"></u--input>
 			</view>
 			<view class="body-input u-flex-col u-row-center" @click="workBtn">
 				<text class="input-title">参加工作时间</text>
@@ -56,7 +56,10 @@
 				<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="city1"></u--input>
+					suffixIconStyle="font-size: 32rpx;font-weight: 400;color: #CACACA;" v-model="from.city1"></u--input>
+			</view>
+			<view class="" style="height: 78rpx;">
+				
 			</view>
 			<view class="button" @click="next">
 				下一步
@@ -124,12 +127,15 @@
 
 
 				// 列表数据
-				sexvalue: "", //性别传的值
+				// sexvalue: "", //性别传的值
 				status: "", //婚姻状态
 				politics: "", //政治面貌
-				city1: "", //地址
-				job: "",
+
+
 				from: {
+					city1: "", //地址
+					job: "",
+					sexvalue: "",
 					name: "",
 					sex: "",
 					birthday: "",
@@ -169,12 +175,15 @@
 		},
 		onLoad() {
 			// this.getHeight()
-			this.minDate = Number(new Date('1900-01-01'));
+			this.minDate = Number(new Date('1970-01-01'));
 			this.minDate1 = Number(new Date('1980-01-01'));
 			this.getpolitics()
 			this.getmarital()
 			this.AllArea()
 			this.getJob()
+			if (uni.getStorageSync("from1")) {
+				this.from = uni.getStorageSync("from1")
+			}
 		},
 		methods: {
 			workBtn() {
@@ -316,13 +325,13 @@
 			//性别选择器确认
 			sexConfirm(e) {
 				if (e.value[0] == '男') {
-					this.sexvalue = "男",
+					this.from.sexvalue = "男",
 						this.from.sex = "male"
 				} else if (e.value[0] == "女") {
-					this.sexvalue = "女",
+					this.from.sexvalue = "女",
 						this.from.sex = "female"
 				} else {
-					this.sexvalue = "保密",
+					this.from.sexvalue = "保密",
 						this.from.sex = "secret"
 				}
 				this.sexShow = false
@@ -366,11 +375,11 @@
 				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.from.city1 = a
 				this.cityShow = false
 			},
 			jobConfirm(e) {
-				this.job = e.value[0].name
+				this.from.job = e.value[0].name
 				this.from.job_status_id = e.value[0].id
 				this.jobShow = false
 			},
@@ -389,7 +398,7 @@
 					this.$u.toast("请填写姓名")
 					return
 				}
-				if (!this.sexvalue) {
+				if (!this.from.sexvalue) {
 					this.$u.toast("请选择性别")
 					return
 				}
@@ -397,7 +406,7 @@
 					this.$u.toast("请选择出生年月")
 					return
 				}
-				if (!this.job) {
+				if (!this.from.job) {
 					this.$u.toast("请选择求职状态")
 					return
 				}
@@ -406,17 +415,12 @@
 					return
 				}
 
-				if (!this.from.city_id) {
+				if (!this.from.city1) {
 					this.$u.toast("请选择所在城市")
 					return
 				}
-				profile({
-					...this.from
-				}).then(res => {
-
-				})
-				uni.setStorageSync("addressData",this.addressData)
-
+				uni.setStorageSync("addressData", this.addressData)
+				uni.setStorageSync("from1", this.from)
 				uni.navigateTo({
 					url: '../pagesA/work'
 				})
@@ -442,6 +446,7 @@
 	.index-page {
 		overflow: hidden;
 		margin-bottom: 60rpx;
+		height: 100vh;
 
 		.mingpianfont {
 			height: 50rpx;
@@ -472,8 +477,8 @@
 			margin-top: -40rpx;
 			position: relative;
 			z-index: 99;
-			padding: 40rpx 32rpx 0;
-			margin-bottom: 60rpx;
+			padding: 40rpx 32rpx 60rpx;
+			// margin-bottom: 60rpx;s
 			box-sizing: border-box;
 
 			.body-input {
@@ -508,9 +513,10 @@
 				font-weight: 500;
 				color: #FFFFFF;
 				line-height: 88rpx;
-				margin: 10rpx 0 0rpx 0;
-				display: flex;
-				justify-content: center;
+				margin: 10rpx 0 60rpx 0;
+				// display: flex;
+				// justify-content: center;
+				text-align: center;
 			}
 		}
 

pagesA/work.vue

@@ -31,7 +31,7 @@
 						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>
+						v-model="job_experience.industry_name"></u--input>
 				</view>
 			</view>
 			<view class="body-input u-flex-col u-row-center">
@@ -75,9 +75,9 @@
 			</view>
 		</view>
 		<!-- 选择器 -->
-		<u-datetime-picker title="入职时间" :minDate="minDate1" @confirm="entryConfirm" :show="entryShow" mode="date"
+		<u-datetime-picker title="入职时间" :minDate="minDate1" @confirm="entryConfirm" :show="entryShow" mode="year-month"
 			@cancel='entryShow = false'></u-datetime-picker>
-		<u-datetime-picker title="离职时间" :minDate="minDate" @confirm="dimissionConfirm" :show="dimissionShow" mode="date"
+		<u-datetime-picker title="离职时间" :minDate="minDate" @confirm="dimissionConfirm" :show="dimissionShow" mode="year-month"
 			@cancel='dimissionShow = false'></u-datetime-picker>
 	</view>
 </template>
@@ -95,7 +95,7 @@
 				minDate: "",
 				minDate1: "",
 				job_experience: {
-					industry: "", //公司行业名称
+					industry_name: "", //公司行业名称
 					industry_id: "", //公司行业id
 					company_name: "", //公司名称
 					start_time: "", //在职时间
@@ -110,6 +110,9 @@
 		onLoad() {
 			this.minDate = Number(new Date('2000-01-01'));
 			this.minDate1 = Number(new Date('1980-01-01'));
+			if(uni.getStorageSync("job_experience1")){
+				this.job_experience = uni.getStorageSync("job_experience1")
+			}
 		},
 		methods: {
 			getdata(item) {
@@ -120,9 +123,9 @@
 					url: "../pagesA/change-hangye1",
 					events: {
 						changehangye: (res) => {
-							this.job_experience.industry_first = res[0].id
+							// this.job_experience.industry_first = res[0].id
 							this.job_experience.industry_id = res[1].id
-							this.job_experience.industry = res[1].name
+							this.job_experience.industry_name = res[1].name
 						}
 					}
 				})
@@ -130,13 +133,13 @@
 			async entryConfirm(e) {
 				const timeFormat = uni.$u.timeFormat;
 				console.log(e.value);
-				let timeValue = await timeFormat(e.value, 'yyyy-mm-dd');
+				let timeValue = await timeFormat(e.value, 'yyyy-mm');
 				this.job_experience.start_time = timeValue;
 				this.entryShow = false
 			},
 			async dimissionConfirm(e) {
 				const timeFormat = uni.$u.timeFormat;
-				let timeValue = await timeFormat(e.value, 'yyyy-mm-dd');
+				let timeValue = await timeFormat(e.value, 'yyyy-mm');
 				this.job_experience.end_time = timeValue;
 				this.dimissionShow = false
 			},
@@ -148,7 +151,7 @@
 					this.$u.toast("请填写公司名称")
 					return
 				}
-				if (!this.job_experience.industry) {
+				if (!this.job_experience.industry_name) {
 					this.$u.toast("请选择您的公司行业")
 					return
 				}
@@ -176,11 +179,10 @@
 					this.$u.toast("请填写工作内容")
 					return
 				}
-				
 				let pre = "job_experience"
 				let nObj = Object.keys(this.job_experience).reduce((a, c) => (a[`${pre}.${c}`] = this.job_experience[c], a), {});
 				uni.setStorageSync("job_experience", nObj)
-				
+				uni.setStorageSync("job_experience1", this.job_experience)
 				uni.navigateTo({
 					url: "../pagesA/Project "
 				})