Browse Source

Merge branch 'master' of http://47.92.161.104:10080/zkx/jp-xqjy

zxz 3 years ago
parent
commit
6f979f3ecb

+ 1 - 0
pages/friend/personal.vue

@@ -294,6 +294,7 @@
 				}
 		},
 		onLoad(op) {	
+			console.log('op'+JSON.stringify(op))
 			if(op.id){
 				this.id =op.id;
 			}

+ 18 - 0
pages/praise/index.vue

@@ -29,6 +29,9 @@
 						<view class="praiseMain-pic-item">
 							<u-image class="newsList-img" :src="item.likeMemberFaceImage" height="260" width="260" border-radius="10"></u-image>
 						</view>
+						<view class="praiseMain-add" v-if="item.chatNotReadNum != '0'">
+							<span>{{item.chatNotReadNum}}条未读消息</span>
+						</view>
 					</view>
 					<view class="praiseMain-pic-text">恭喜!您与「{{item.likeMemberName}}」相互点赞!</view>
 					<view class="praiseMain-btn">
@@ -96,6 +99,9 @@
 	}
 </style>
 <style lang="scss" scoped>
+	.newsList-img{
+		z-index: -1;
+	}
 	.title{
 		font-size: 16px;
 		margin-bottom: 10px;
@@ -141,6 +147,18 @@
 		.praiseMain-btn{
 			padding: 0 15px;
 		}
+		.praiseMain-add{
+			position: absolute;
+			z-index: 9;
+			right: 36px;
+			top: 168px;
+			background: rgba(0,0,0,0.5);
+			padding:2px 24px;
+			span{
+				margin-left: 3px;
+				font-size: 14px;
+			}
+		}
 	}
 	.navbar-tit{
 		padding-left:15px;

+ 958 - 31
pages/user/edit.vue

@@ -2,43 +2,74 @@
 	<view>
 		<u-navbar back-text="编辑资料"></u-navbar>
 		<view class="edit-head">
-			<u-avatar src="/static/img/sexMan.png" size="160" :show-level="true" level-icon="edit-pen-fill" level-bg-color ="#4E8DF6"></u-avatar>
+			<u-avatar :src="personal_info.faceImage" size="160" :show-level="true" level-icon="edit-pen-fill" level-bg-color ="#4E8DF6" @click="uploadPhoto"></u-avatar>
 		</view>
 		
 		<view class="edit-form">
 			<u-form :model="form" ref="uForm" label-width ="160">
-				<u-form-item label="姓名"><u-input v-model="form.name" input-align="right" placeholder="周扬青"/></u-form-item>
-				<u-form-item label="身份证号"><u-input v-model="form.name" input-align="right" placeholder="42100***************111"/></u-form-item>
-				<u-form-item label="手机号"><u-input v-model="form.name" input-align="right" placeholder="1380****9999"/></u-form-item>
-				<u-form-item label="性别"><u-input v-model="form.name" input-align="right" placeholder="男"/></u-form-item>
-				<u-form-item label="年龄"><u-input v-model="form.name" input-align="right" placeholder="31岁"/></u-form-item>
-				<u-form-item label="身高"><u-input v-model="form.sex" input-align="right" placeholder="172cm" type="select" /></u-form-item>
-				<u-form-item label="体重"><u-input v-model="form.sex" input-align="right" placeholder="75kg" type="select" /></u-form-item>
+				<u-form-item label="姓名"><u-input  :disabled='true' v-model="personal_info.realName" input-align="right" placeholder="周扬青"/></u-form-item>
+				<u-form-item label="身份证号"><u-input :disabled='true' v-model="form.name" input-align="right" placeholder="42100***************111"/></u-form-item>
+				<u-form-item label="手机号"><u-input :disabled='true' v-model="personal_info.phone" input-align="right" placeholder="1380****9999"/></u-form-item>
+				<u-form-item label="性别"><u-input :disabled='true' v-model="form.sex" input-align="right" placeholder="男"/></u-form-item>
+				<u-form-item label="年龄"><u-input :disabled='true' v-model="personal_info.age" input-align="right" placeholder="31岁"/></u-form-item>
+				<u-form-item label="身高">
+					<u-input v-model="form.height" input-align="right" placeholder="172cm" type="select" @click="show_height = true" />
+					<u-select v-model="show_height" mode="single-column" :list="height_ranges" @confirm="heightConfirm"></u-select>
+				</u-form-item>
+				<u-form-item label="体重">
+					<u-input v-model="form.weight" input-align="right" placeholder="75kg" type="select" @click="show_weight = true"/>
+					<u-select v-model="show_weight" mode="single-column" :list="weight_ranges" @confirm="weightConfirm"></u-select>
+				</u-form-item>
 				
 				<view class="edit-line"></view>
 				
-				<u-form-item label="出身地"><u-input v-model="form.sex" input-align="right" placeholder="荆州市沙市区" type="select" /></u-form-item>
-				<u-form-item label="户口所在地"><u-input v-model="form.sex" input-align="right" placeholder="荆州市沙市区" type="select" /></u-form-item>
-				<u-form-item label="工作所在地"><u-input v-model="form.sex" input-align="right" placeholder="荆州市沙市区" type="select" /></u-form-item>
+				<u-form-item label="出身地"><u-input v-model="personal_info.birthplaceN" input-align="right" placeholder="荆州市沙市区" type="select" @click='birthdayAddressChange'/></u-form-item>
+				<u-form-item label="户口所在地"><u-input v-model="personal_info.registeredResidenceN" input-align="right" placeholder="荆州市沙市区" type="select" @click='registeredResidenceAddressChange'/></u-form-item>
+				<u-form-item label="工作所在地"><u-input v-model="personal_info.workplaceN" input-align="right" placeholder="荆州市沙市区" type="select" @click='workAddressChange'/></u-form-item>
 				
 				<view class="edit-line"></view>
 				
-				<u-form-item label="学历"><u-input v-model="form.sex" input-align="right" placeholder="大学本科" type="select" /></u-form-item>
-				<u-form-item label="行业"><u-input v-model="form.sex" input-align="right" placeholder="IT/互联网" type="select" /></u-form-item>
-				<u-form-item label="工作单位"><u-input v-model="form.sex" input-align="right" placeholder="湖北荆鹏软件开发有限公司" type="select" /></u-form-item>
-				<u-form-item label="岗位"><u-input v-model="form.sex" input-align="right" placeholder="软件工程师" type="select" /></u-form-item>
+			
+				
+				<u-form-item label="学历" >
+					<u-input v-model="personal_info.educationN" input-align="right" placeholder="大学本科" type="select" @click="show_education = true"/>
+					<u-select v-model="show_education" mode="single-column" :list="base_dictionary.xlList" @confirm="educationConfirm"></u-select> 				
+				</u-form-item>
+				<u-form-item label="行业" >
+					<u-input v-model="personal_info.industryN" input-align="right" placeholder="IT/互联网" type="select" @click="show_profession = true"/></u-form-item>
+					<u-select v-model="show_profession" mode="single-column" :list="base_dictionary.hyList" @confirm="professionConfirm"></u-select> 				
+				<u-form-item label="工作单位">
+					<u-input v-model="personal_info.workUnit" input-align="right" placeholder="湖北荆鹏软件开发有限公司"  /></u-form-item>
+				<u-form-item label="岗位">
+					<u-input v-model="personal_info.post" input-align="right" placeholder="软件工程师" /></u-form-item>
 				
 				<view class="edit-line"></view>
 				
-				<u-form-item label="月薪"><u-input v-model="form.sex" input-align="right" placeholder="请选择" type="select" /></u-form-item>
-				<u-form-item label="住房状况"><u-input v-model="form.sex" input-align="right" placeholder="请选择" type="select" /></u-form-item>
-				<u-form-item label="婚姻状况"><u-input v-model="form.sex" input-align="right" placeholder="未婚" type="select" /></u-form-item>
-				<u-form-item label="子女状况"><u-input v-model="form.sex" input-align="right" placeholder="无" type="select" /></u-form-item>
+				<u-form-item label="月薪" >
+					<u-input v-model="personal_info.salaryRangeN" input-align="right" placeholder="请选择" type="select" @click="show_salary = true" />
+					<u-select v-model="show_salary" mode="single-column" :list="base_dictionary.yxList" @confirm="salaryConfirm"></u-select> 				
+				</u-form-item>
+				<u-form-item label="住房状况">
+					<u-input v-model="personal_info.housingSituationN" input-align="right" placeholder="请选择" type="select"  @click="show_house = true"/>
+					<u-select v-model="show_house" mode="single-column" :list="base_dictionary.zfqkList" @confirm="houseConfirm"></u-select> 				
+				</u-form-item>
+				<u-form-item label="婚姻状况">
+					<u-input v-model="personal_info.maritalStatusN" input-align="right" placeholder="未婚" type="select"  @click="show_marriage = true"/>
+					<u-select v-model="show_marriage" mode="single-column" :list="base_dictionary.hyqkList" @confirm="marriageConfirm"></u-select> 				
+				</u-form-item>
+				<u-form-item label="子女状况" >
+					<u-input v-model="personal_info.childStatusN" input-align="right" placeholder="无" type="select" @click="show_children = true"/>
+					<u-select v-model="show_children" mode="single-column" :list="base_dictionary.znqkList" @confirm="childrenConfirm"></u-select> 				
+				</u-form-item>
 				
 				<view class="edit-line"></view>
 				<view class="edit-row">
 					<p>兴趣爱好</p>
 					<view class="edit-label">
+						<span v-for="(item,index) in base_dictionary.hobbyInfoList" :key="index"  :class="item.isMemberSelect ? 'active' : ''"  @tap="selectInterest(index)">
+							{{item.name}}
+						</span>
+						<!--
 						<span class="active">摄影</span>
 						<span>烹饪</span>
 						<span>健身</span>
@@ -46,58 +77,954 @@
 						<span>摄影</span>
 						<span>烹饪</span>
 						<span>健身</span>
-						<span>打游戏</span>
+						<span>打游戏</span>-->
 					</view>
 				</view>
 				
-				<view class="edit-line"></view>
-				
+				<view class="edit-line"></view>				 
+				 
 				<view class="edit-row">
 					<view class="u-flex u-row-between ">
 						<p>自我评价</p>
 						<u-icon custom-prefix="custom-icon" name="youjiantou"></u-icon>
 					</view>
 					<view class="edit-text">
-						憧憬“执子之手与子偕老的美好爱情”,对感情忠诚专一,有强烈的责任感,有担当也有一颗浪漫之心。热爱生活,一直相信美好的生活是靠勤奋的双手奋斗出来的,对生活的态度一直是不求飞黄腾达,但求衣食无忧,追求真实平淡。平日爱好书法、运动、电影。对父母孝顺,对家庭懂得家和万事兴。事业上不怕吃苦,兢兢业业,有上进心。
+						{{personal_info.selfEvaluation}}	
 					</view>
 				</view>
 				<view class="edit-title">择偶标准</view>
+			
+				<u-form-item label="年龄范围" >
+					<u-input v-model="personal_info.taAgeRangeN" input-align="right" placeholder="20~35" type="select" @click="show_ta_age_ranges = true"/>
+					<u-select v-model="show_ta_age_ranges" mode="single-column" :list="base_dictionary.nlfwList" @confirm="taAgeRangeConfirm"></u-select> 				
+				</u-form-item>
 				
-				<u-form-item label="年龄范围"><u-input v-model="form.sex" input-align="right" placeholder="20~35" type="select" /></u-form-item>
-				<u-form-item label="月薪"><u-input v-model="form.sex" input-align="right" placeholder="不限" type="select" /></u-form-item>
-				<u-form-item label="学历"><u-input v-model="form.sex" input-align="right" placeholder="不限" type="select" /></u-form-item>
-				<u-form-item label="职业"><u-input v-model="form.sex" input-align="right" placeholder="不限" type="select" /></u-form-item>
-				<u-form-item label="所在地"><u-input v-model="form.sex" input-align="right" placeholder="请选择" type="select" /></u-form-item>
-				<u-form-item label="其他要求"><u-input v-model="form.sex" input-align="right" placeholder="请选择" type="select" /></u-form-item>
+				<u-form-item label="月薪" >
+					<u-input v-model="personal_info.taIncomeRangeN" input-align="right" placeholder="不限" type="select" @click="show_ta_salary = true"/>
+					<u-select v-model="show_ta_salary" mode="single-column" :list="base_dictionary.yxList" @confirm="taSalaryRangeConfirm"></u-select> 				
+				</u-form-item>
+				<u-form-item label="学历" >
+					<u-input v-model="personal_info.taEduN" input-align="right" placeholder="不限" type="select" @click="show_ta_education = true"/>
+					<u-select v-model="show_ta_education" mode="single-column" :list="base_dictionary.xlList" @confirm="taEducationConfirm"></u-select>
+				</u-form-item>
+				<u-form-item label="职业">
+					<u-input v-model="personal_info.taOccupation" input-align="right" placeholder="不限"  /></u-form-item>
+				<u-form-item label="所在地">
+					<u-input v-model="personal_info.taWorkplaceN" input-align="right" placeholder="请选择" type="select" @click='taWorkAddressChange'/></u-form-item>
+				<u-form-item label="其他要求">
+					<u-input v-model="personal_info.taOther" input-align="right" placeholder="请选择" /></u-form-item>
 			</u-form>
 		</view>
 		
 		
 		<view class="personal-btn">
-			<u-button type="error" shape="circle" :custom-style="customStyle">
+			<u-button type="error" shape="circle" :custom-style="customStyle" @click="formsubmit">
 				<span>保存</span>
 			</u-button>
 		</view>
+		<mpvue-city-picker themeColor="#007AFF" ref="mpvuebirtydayCityPicker" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onBirthdayCityConfirm"></mpvue-city-picker>		
+		<mpvue-city-picker themeColor="#007AFF" ref="mpvueRegisteredResidenceCityPicker" :pickerValueDefault="cityPickerValueDefault"  @onConfirm="onResidenceRegisteredCityConfirm"></mpvue-city-picker>		
+		<mpvue-city-picker themeColor="#007AFF" ref="mpvueWorkCityPicker"  :pickerValueDefault="cityPickerValueDefault" @onConfirm="onWorkCityConfirm"></mpvue-city-picker>		
+		<mpvue-city-picker themeColor="#007AFF" ref="mpvueTaWorkCityPicker"  :pickerValueDefault="cityPickerValueDefault" @onConfirm="onTaWorkCityConfirm"></mpvue-city-picker>		
+<!--
+		<u-action-sheet
+				:show="show_education"
+				:actions="base_dictionary.xlList"
+				title="请选择学历"
+				description=""
+				@close="show_education = false"
+				@select="educationSelect"
+		>
+		</u-action-sheet>
+		<u-action-sheet
+				:show="show_salary"
+				:actions="base_dictionary.yxList"
+				title="请选择月薪"
+				description=""
+				@close="show_salary = false"
+				@select="salarySelect"
+		>
+		</u-action-sheet>
+		<u-action-sheet
+				:show="show_profession"
+				:actions="base_dictionary.hyList"
+				title="请选择行业"
+				description=""
+				@close="show_profession = false"
+				@select="professionSelect"
+		>
+		</u-action-sheet>
+		<u-action-sheet
+				:show="show_house"
+				:actions="base_dictionary.zfqkList"
+				title="请选择住房状况"
+				description=""
+				@close="show_house = false"
+				@select="houseSelect"
+		>
+		</u-action-sheet>
+		<u-action-sheet
+				:show="show_marriage"
+				:actions="base_dictionary.hyList"
+				title="请选择婚姻状况"
+				description=""
+				@close="show_marriage = false"
+				@select="marriageSelect"
+		>
+		</u-action-sheet>
+		<u-action-sheet
+				:show="show_children"
+				:actions="base_dictionary.znqkList"
+				title="请选择子女状况"
+				description=""
+				@close="show_children = false"
+				@select="childrenSelect"
+		>
+		</u-action-sheet>
+		 
+		<u-action-sheet
+				:show="show_ta_age_ranges"
+				:actions="base_dictionary.nlfwList"
+				title="请选择年龄范围"
+				description=""
+				@close="show_ta_age_ranges = false"
+				@select="taAgeRangeSelect"
+		>
+		</u-action-sheet>
+		<u-action-sheet
+				:show="show_ta_education"
+				:actions="base_dictionary.xlList"
+				title="请选择学历"
+				description=""
+				@close="show_ta_education = false"
+				@select="taEducationSelect"
+		>
+		</u-action-sheet>
+		<u-action-sheet
+				:show="show_ta_salary"
+				:actions="base_dictionary.nlfwList"
+				title="请选择月薪"
+				description="xxxxxxx"
+				@close="show_ta_salary = false"
+				@select="taSalarySelect"
+		>
+		</u-action-sheet>-->
  	</view>
 </template>
 
 <script>
+	import * as loginApi from '@/apis/login.js'
+	import mpvueCityPicker from "../../pagesB/components/mpvue-citypicker/mpvueCityPicker.vue";
+	import {provinceData,setCityData,getCityData} from '../../pagesB/components/mpvue-citypicker/city-data/province.js';
+	let _self;
 	export default {
+		components:{
+			mpvueCityPicker
+		},
 		data() {
 			return {
+				
+				cityPickerValueDefault:[16,6,0],
 				customStyle: {
 					background: '#FF5E5E'
 				}, 
 				form: {
 					name: '',
-					sex: ''
+					sex: '',
+					height:'',
+					weight:'',
+					
+					address:'',
+					registered_residence:'',
+					work_address:'',
+					work_corporation:'',
+					work_post:'',
+					education:'',
+					profession:'',
+					salary_range:'',
+					house_status:'',
+					marriage_status:'',
+					children_status:'',
+					self_assess:'',
+					
+					addressId:'',
+					registered_residenceId:'',
+					work_addressId:'',
+					educationId:'',
+					professionId:'',
+					salary_rangeId:'',
+					house_statusId:'',
+					marriage_statusId:'',
+					children_statusId:'',
+				
+				},
+				personal_info:{
+					faceImage:' /static/img/sexMan.png'
 				},
+				height_ranges:[],
+				weight_ranges:[],
+				show_height:false,
+				show_weight:false,
+				
+				show_birthday_address:false,
+				show_registered_residence:false,
+				show_work_address:false,
+				show_salary:false,
+				show_profession:false,
+				show_education:false,
+				show_house:false,
+				show_marriage:false,
+				show_children:false,				
+				show_ta_age_ranges:false,
+				show_ta_education:false,
+				show_ta_salary:false,
+				show_ta_work_address:false,
+				base_dictionary:{
+					zfqkList:[],
+					yxList:[],
+					znqkList:[],
+					qyList:[],
+					xlList:[],
+					hyList:[],
+					nlfwList:[],
+					hyqkList:[],
+					hobbyInfoList:[],
+					
+				}
 			}
 
 			methods: {
 				
 			}
 
+		},
+		onLoad(){
+			_self = this;
+			this.personal_info = this.carhelp.getPersonInfo();	
+			let subject = {subject:''}		
+			loginApi.getBaseDictionary(subject).then(function(data){
+				//console.log('基础字典'+JSON.stringify(data));
+				let personal_info = _self.carhelp.getPersonInfo();
+				if(data.data)
+				{
+					_self.base_dictionary = data.data;
+					if(_self.base_dictionary.zfqkList){ 
+						
+						for(let i = 0;i< _self.base_dictionary.zfqkList.length;i++)
+						{
+							_self.base_dictionary.zfqkList[i].label = _self.base_dictionary.zfqkList[i].name;
+						}
+						if(_self.personal_info.housingSituation!=null && _self.personal_info.housingSituation<= _self.base_dictionary.zfqkList.length)
+						{
+							_self.personal_info.housingSituationN =_self.base_dictionary.zfqkList[_self.personal_info.housingSituation-1].label						
+						}
+					}
+					
+					//console.log('住房情况'+JSON.stringify(_self.base_dictionary.zfqkList));
+					if(_self.base_dictionary.yxList){
+						
+						for(let i = 0;i< _self.base_dictionary.yxList.length;i++)
+						{
+							_self.base_dictionary.yxList[i].label = _self.base_dictionary.yxList[i].name;
+						}
+						if(_self.personal_info.salaryRange!=null && _self.personal_info.salaryRange<= _self.base_dictionary.yxList.length)
+						{
+							_self.personal_info.salaryRangeN =_self.base_dictionary.yxList[_self.personal_info.salaryRange-1].label						
+						}
+						if(_self.personal_info.taIncomeRange!=null && _self.personal_info.taIncomeRange<= _self.base_dictionary.yxList.length)
+						{
+							_self.personal_info.taIncomeRangeN =_self.base_dictionary.yxList[_self.personal_info.taIncomeRange-1].label						
+						}
+					}
+					
+					//console.log('月薪情况'+JSON.stringify(_self.base_dictionary.yxList));
+					if(_self.base_dictionary.znqkList){
+						
+						for(let i = 0;i< _self.base_dictionary.znqkList.length;i++)
+						{
+							_self.base_dictionary.znqkList[i].label = _self.base_dictionary.znqkList[i].name;
+						}
+						if(_self.personal_info.childStatus!=null && _self.personal_info.childStatus<= _self.base_dictionary.znqkList.length)
+						{
+							_self.personal_info.childStatusN =_self.base_dictionary.znqkList[_self.personal_info.childStatus-1].label						
+						}
+					} 
+					//console.log('子女情况'+JSON.stringify(_self.base_dictionary.znqkList));
+					/*
+					if(_self.base_dictionary.qyList){ 
+						
+						for(let i = 0;i< _self.base_dictionary.qyList.length;i++)
+						{
+							_self.base_dictionary.qyList[i].label = _self.base_dictionary.qyList[i].name;
+						}
+					}
+					console.log('区域'+JSON.stringify(_self.base_dictionary.qyList));
+					*/
+					if(_self.base_dictionary.xlList){ 
+						
+						for(let i = 0;i< _self.base_dictionary.xlList.length;i++)
+						{
+							_self.base_dictionary.xlList[i].label = _self.base_dictionary.xlList[i].name;
+						}
+						
+						//console.log('学历'+JSON.stringify(_self.base_dictionary.xlList.length))
+						if(_self.personal_info.education!=null && _self.personal_info.education <= _self.base_dictionary.xlList.length)
+						{
+							//console.log('学历'+JSON.stringify(_self.personal_info.education))
+							_self.personal_info.educationN =_self.base_dictionary.xlList[Number(_self.personal_info.education)-1].label						
+						}
+						if(_self.personal_info.taEdu!=null && _self.personal_info.taEdu<= _self.base_dictionary.xlList.length)
+						{
+							_self.personal_info.taEduN =_self.base_dictionary.xlList[_self.personal_info.taEdu-1].label						
+						}
+					}
+					//console.log('学历情况'+JSON.stringify(_self.base_dictionary.xlList));
+					
+					if(_self.base_dictionary.hyList){ 
+						
+						for(let i = 0;i< _self.base_dictionary.hyList.length;i++)
+						{
+							_self.base_dictionary.hyList[i].label = _self.base_dictionary.hyList[i].name;
+						}
+						if(_self.personal_info.industry!=null && _self.personal_info.industry<= _self.base_dictionary.hyList.length)
+						{
+							_self.personal_info.industryN =_self.base_dictionary.hyList[_self.personal_info.industry-1].label						
+						}
+ 					
+					}
+//					console.log('行业情况'+JSON.stringify(_self.base_dictionary.hyList));
+					if(_self.base_dictionary.nlfwList){ 
+						
+						for(let i = 0;i< _self.base_dictionary.nlfwList.length;i++)
+						{
+							_self.base_dictionary.nlfwList[i].label = _self.base_dictionary.nlfwList[i].name;
+						}
+						if(_self.personal_info.taAgeRange!=null && _self.personal_info.taAgeRange<= _self.base_dictionary.nlfwList.length)
+						{
+							_self.personal_info.taAgeRangeN =_self.base_dictionary.nlfwList[_self.personal_info.taAgeRange-1].label						
+						}
+					}
+					//console.log('年龄范围'+JSON.stringify(_self.base_dictionary.nlfwList));
+					if(_self.base_dictionary.hyqkList){ 
+						
+						for(let i = 0;i< _self.base_dictionary.hyqkList.length;i++)
+						{
+							_self.base_dictionary.hyqkList[i].label = _self.base_dictionary.hyqkList[i].name;
+						}
+						if(_self.personal_info.maritalStatus!=null && _self.personal_info.maritalStatus<= _self.base_dictionary.hyqkList.length)
+						{
+							_self.personal_info.maritalStatusN =_self.base_dictionary.hyqkList[_self.personal_info.maritalStatus-1].label						
+						}
+					}
+					//console.log('婚姻情况'+JSON.stringify(_self.base_dictionary.hyqkList));
+					if(_self.base_dictionary.hobbyInfoList){ 
+						
+						for(let i = 0;i< _self.base_dictionary.hobbyInfoList.length;i++)
+						{
+							_self.base_dictionary.hobbyInfoList[i].isMemberSelect = false;
+							_self.base_dictionary.hobbyInfoList[i].label = _self.base_dictionary.hobbyInfoList[i].name;
+							if(_self.personal_info.hobbys!=null){
+//								console.log('hobbys'+JSON.stringify(_self.personal_info.hobbys))
+								if(_self.personal_info.hobbys.indexOf(_self.base_dictionary.hobbyInfoList[i].id)>=0)
+								{
+									_self.base_dictionary.hobbyInfoList[i].isMemberSelect = true;
+									console.log('选中'+JSON.stringify(_self.base_dictionary.hobbyInfoList[i]))
+								} 
+							}
+						}
+					} 
+//					console.log('兴趣爱好'+JSON.stringify(_self.base_dictionary.hobbyInfoList));
+					 if(_self.personal_info.birthplace!=null){
+					 	_self.personal_info.birthplaceN = getCityData(Number(_self.personal_info.birthplace));
+ //						console.log('address'+JSON.stringify(_self.form.addressId))
+					 }
+					 if(_self.personal_info.registeredResidence!=null){
+						 _self.personal_info.registeredResidenceN = getCityData(Number(_self.personal_info.registeredResidence));
+ 					 } 
+					 if(_self.personal_info.workplace!=null){
+					 	_self.personal_info.workplaceN = getCityData(Number(_self.personal_info.workplace));
+ 					 							 
+					 } 
+					 if(_self.personal_info.taWorkplace!=null){
+					 	_self.personal_info.taWorkplaceN = getCityData(Number(_self.personal_info.taWorkplace));
+					 							 
+					 }  
+				} 
+			},function(err){
+				console.log('获取基础字典错误'+JSON.stringify(err))
+			}) 
+						
+			for(let i = 130;i<=220;i++)
+			{
+				let height_range = {value: i, label: i.toString()+"cm"};
+				this.height_ranges.push(height_range);
+				//this.height_ranges.push(i.toString());
+			}
+			for(let i = 20;i<=120;i++)
+			{
+//				this.weight_ranges.push(i.toString());
+				let weight_range = {value:i, label:i.toString()+"kg"};
+				this.weight_ranges.push(weight_range);
+			}
+			if(this.personal_info){
+				this.form.sex = this.personal_info.gender?'男':'女'
+				if(this.personal_info.height)
+				{
+					this.form.height = this.personal_info.height+'cm'
+					
+				}
+				if(this.personal_info.weight)
+				{
+					this.form.weight = this.personal_info.weight+'kg'
+					
+				}
+			}
+			
+			if(provinceData.length<=0){
+				  loginApi.getCityList().then(function(data){
+//					console.log('获取城市成功'+JSON.stringify(data));
+					if(data.result &&  data.data){
+						setCityData(data.data);
+						//_self.$refs.mpvuebirtydayCityPicker.setCityData(data.data);		
+						//console.log('province data '+JSON.stringify(provinceData))
+						if(_self.personal_info.birthplace!=null){
+							_self.personal_info.birthplaceN = getCityData(Number(_self.personal_info.birthplace));
+	//						console.log('address'+JSON.stringify(_self.form.addressId))
+						 }
+						 if(_self.personal_info.registeredResidence!=null){
+							 _self.personal_info.registeredResidenceN = getCityData(Number(_self.personal_info.registeredResidence));
+						 } 
+						 if(_self.personal_info.workplace!=null){
+							_self.personal_info.workplaceN = getCityData(Number(_self.personal_info.workplace));
+													 
+						 } 
+						 if(_self.personal_info.taWorkplace!=null){
+							_self.personal_info.taWorkplaceN = getCityData(Number(_self.personal_info.taWorkplace));
+													 
+						 } 
+					} 
+					
+				  },function(err){
+					console.log('获取城市列表错误'+JSON.stringify(err))
+				  })		
+			}
+			
+			
+//			console.log('个人信息'+JSON.stringify(this.personal_info))
+		},
+		methods:{
+			
+			selectInterest(index){
+//				let interest = this.interests;
+				this.base_dictionary.hobbyInfoList[index].isMemberSelect = !this.base_dictionary.hobbyInfoList[index].isMemberSelect;
+ 				console.log('item'+JSON.stringify(this.base_dictionary.hobbyInfoList[index])) 
+			},
+			birthdayAddressChange(){
+				this.$refs.mpvuebirtydayCityPicker.show()
+			},
+			registeredResidenceAddressChange(){
+				this.$refs.mpvueRegisteredResidenceCityPicker.show()
+			},
+			workAddressChange(){
+				this.$refs.mpvueWorkCityPicker.show()
+			},
+			taWorkAddressChange(){
+				this.$refs.mpvueTaWorkCityPicker.show()
+			},
+			onBirthdayCityConfirm(e) {
+				_self.personal_info.birthplaceN = e.label;
+				_self.personal_info.birthplace = e.cityCode.toString();
+				console.log('地址选择'+JSON.stringify(_self.form.addressId))
+			},
+			onResidenceRegisteredCityConfirm(e) {
+				_self.personal_info.registeredResidenceN= e.label;
+				_self.personal_info.registeredResidence = e.cityCode.toString();
+				console.log('地址选择'+JSON.stringify(_self.form.registered_residenceId))
+			},
+			onWorkCityConfirm(e) {
+				_self.personal_info.workplaceN = e.label;
+				_self.personal_info.workplace = e.cityCode.toString();
+				console.log('地址选择'+JSON.stringify(_self.form.work_addressId))
+			},
+			onTaWorkCityConfirm(e) {
+				_self.personal_info.taWorkplaceN = e.label;
+				_self.personal_info.taWorkplace = e.cityCode.toString();
+				console.log('地址选择'+JSON.stringify(_self.form.work_addressId))
+			},
+			formsubmit(){
+				let personal_info = {type:1,id:this.personal_info.id};
+				let _personal_info = this.personal_info;
+				if(_personal_info.faceImage)
+				{
+					personal_info.faceImage = _personal_info.faceImage;
+					console.log('faceImage'+personal_info.faceImage)
+				} 
+				personal_info.hobbys = ''
+				for(let i=0;i<_self.base_dictionary.hobbyInfoList.length;i++)
+				{
+					if(_self.base_dictionary.hobbyInfoList[i].isMemberSelect)
+					{
+						if(personal_info.hobbys.length>0)
+						{
+							personal_info.hobbys+=','
+						}
+						personal_info.hobbys += _self.base_dictionary.hobbyInfoList[i].id;
+					}
+				} 
+				
+				if(_personal_info.weight)
+				{
+					personal_info.weight = _personal_info.weight;
+					console.log('weight'+personal_info.weight)
+				}
+				if(_personal_info.height)
+				{
+					personal_info.height = _personal_info.height;
+					console.log('height'+personal_info.height)
+				} 
+				if(_personal_info.education)
+				{
+					personal_info.education = _personal_info.education;
+					console.log('education'+personal_info.education)
+				} 
+				/*
+				if(_personal_info.educationN)
+				{
+					personal_info.educationN = _personal_info.educationN;
+					console.log('education'+personal_info.educationN)
+				} */
+				if(_personal_info.workUnit)
+				{
+					personal_info.workUnit = _personal_info.workUnit;
+					console.log('workUnit'+personal_info.workUnit)
+				}  
+				if(_personal_info.post)
+				{
+					personal_info.post = _personal_info.post;
+					console.log('post'+personal_info.post)
+				}   
+				
+				if(_personal_info.industry)
+				{
+					personal_info.industry = _personal_info.industry;
+					console.log('industry'+personal_info.industry)
+				} 
+				/*
+				if(_personal_info.industryN)
+				{
+					personal_info.industryN = _personal_info.industryN;
+					console.log('industryN'+personal_info.industryN)
+				} */
+				if(_personal_info.salaryRange)
+				{
+					personal_info.salaryRange = _personal_info.salaryRange;
+					console.log('salaryRange'+personal_info.salaryRange)
+				} 
+				/*
+				if(_personal_info.salaryRangeN)
+				{
+					personal_info.salaryRangeN = _personal_info.salaryRangeN;
+					console.log('salaryRangeN'+personal_info.salaryRangeN)
+				} */
+				if(_personal_info.housingSituation)
+				{
+					personal_info.housingSituation = _personal_info.housingSituation;
+					console.log('housingSituation'+personal_info.housingSituation)
+				} 
+				/*
+				if(_personal_info.housingSituationN)
+				{
+					personal_info.housingSituationN = _personal_info.housingSituationN;
+					console.log('housingSituationN'+personal_info.housingSituationN)
+				} */
+				
+				if(_personal_info.maritalStatus)
+				{
+					personal_info.maritalStatus = _personal_info.maritalStatus;
+					console.log('maritalStatus'+personal_info.maritalStatus)
+				} 
+				/*
+				if(_personal_info.maritalStatusN)
+				{
+					personal_info.maritalStatusN = _personal_info.maritalStatusN;
+					console.log('maritalStatusN'+personal_info.maritalStatusN)
+				} */
+				if(_personal_info.childStatus)
+				{
+					personal_info.childStatus = _personal_info.childStatus;
+					console.log('childStatus'+personal_info.childStatus)
+				} 
+				/*
+				if(_personal_info.childStatusN)
+				{
+					personal_info.childStatusN = _personal_info.childStatusN;
+					console.log('childStatusN'+personal_info.childStatusN)
+				} */
+				if(_personal_info.taIncomeRange)
+				{
+					personal_info.taIncomeRange = _personal_info.taIncomeRange;
+					console.log('taIncomeRange'+personal_info.taIncomeRange)
+				} 
+				/*
+				if(_personal_info.taIncomeRangeN)
+				{
+					personal_info.taIncomeRangeN = _personal_info.taIncomeRangeN;
+					console.log('taIncomeRangeN'+personal_info.taIncomeRangeN)
+				} */
+				if(_personal_info.birthplace)
+				{
+					personal_info.birthplace = _personal_info.birthplace;
+					console.log('birthplace'+personal_info.birthplace)
+				} 
+				/*
+				if(_personal_info.birthplaceN)
+				{
+					personal_info.birthplaceN = _personal_info.birthplaceN;
+					console.log('birthplaceN'+personal_info.birthplaceN)
+				} */
+				if(_personal_info.registeredResidence)
+				{
+					personal_info.registeredResidence = _personal_info.registeredResidence;
+					console.log('registeredResidence'+personal_info.registeredResidence)
+				} 
+				/*
+				if(_personal_info.registeredResidenceN)
+				{
+					personal_info.registeredResidenceN = _personal_info.registeredResidenceN;
+					console.log('registeredResidenceN'+personal_info.registeredResidenceN)
+				} */
+				if(_personal_info.workplace)
+				{
+					personal_info.workplace = _personal_info.workplace;
+					console.log('workplace'+personal_info.workplace)
+				} 
+				/*
+				if(_personal_info.workplaceN)
+				{
+					personal_info.workplaceN = _personal_info.workplaceN;
+					console.log('workplaceN'+personal_info.workplaceN)
+				} */
+				
+				if(_personal_info.taWorkplace)
+				{
+					personal_info.taWorkplace = _personal_info.taWorkplace;
+					console.log('taWorkplace'+personal_info.taWorkplace)
+				} 
+				/*
+				if(_personal_info.taWorkplaceN)
+				{
+					personal_info.taWorkplaceN = _personal_info.taWorkplaceN;
+					console.log('taWorkplaceN'+personal_info.taWorkplaceN)
+				} */
+				if(_personal_info.taAgeRange)
+				{
+					personal_info.taAgeRange = _personal_info.taAgeRange;
+					console.log('taAgeRange'+personal_info.taAgeRange)
+				} 
+				/*
+				if(_personal_info.taAgeRangeN)
+				{
+					personal_info.taAgeRangeN = _personal_info.taAgeRangeN;
+					console.log('taAgeRangeN'+personal_info.taAgeRangeN)
+				} */
+				if(_personal_info.taEdu)
+				{
+					personal_info.taEdu = _personal_info.taEdu;
+					console.log('taEdu'+personal_info.taEdu)
+				} 
+				/*
+				if(_personal_info.taEduN)
+				{
+					personal_info.taEduN = _personal_info.taEduN;
+					console.log('education'+personal_info.taEduN)
+				} */
+				
+				if(_personal_info.taOccupation)
+				{
+					personal_info.taOccupation = _personal_info.taOccupation;
+					console.log('taOccupation'+personal_info.taOccupation)
+				} 
+				/*
+				if(_personal_info.taOccupationN)
+				{
+					personal_info.taOccupationN = _personal_info.taOccupationN;
+					console.log('education'+personal_info.taOccupationN)
+				} */
+				if(_personal_info.taOther)
+				{
+					personal_info.taOther = _personal_info.taOther;
+					console.log('taOther'+personal_info.taOther)
+				} 
+				/*
+				if(_personal_info.taOccupationN)
+				{
+					personal_info.taOccupationN = _personal_info.taOccupationN;
+					console.log('education'+personal_info.taOccupationN)
+				} */
+				
+				loginApi.save_personal_info(personal_info).then(function(data){
+					//console.log('保存成功'+JSON.stringify(data));
+					_self.findByOpenId();
+					/*uni.navigateTo({
+						url:'../user/index'
+					})*/
+				},function(err){
+					console.log('保存失败'+JSON.stringify(personal_info)+ JSON.stringify(err));
+				});
+			},
+			childrenConfirm(e){
+				console.log('e'+JSON.stringify(e))
+				this.personal_info.childStatusN = '';
+				e.map((val, index) => {
+					// this.result += this.result == '' ? val.label : '-' + val.label;
+					let result = val.label
+					_self.personal_info.childStatus = val.value;
+					this.personal_info.childStatusN  += result;
+				}) 
+			},
+			marriageConfirm(e){
+				console.log('e'+JSON.stringify(e))
+				this.personal_info.maritalStatusN = '';
+				e.map((val, index) => {
+					// this.result += this.result == '' ? val.label : '-' + val.label;
+					let result = val.label
+					console.log('val'+JSON.stringify(val))
+					_self.personal_info.maritalStatus =val.value;
+					this.personal_info.maritalStatusN  += result;
+				}) 
+			},
+			houseConfirm(e){
+				console.log('e'+JSON.stringify(e))
+				this.personal_info.housingSituationN = '';
+				e.map((val, index) => {
+					// this.result += this.result == '' ? val.label : '-' + val.label;
+					let result = val.label
+					_self.personal_info.housingSituation = val.value;
+					_self.personal_info.housingSituationN  += result;
+				}) 
+			},		
+			educationConfirm(e){
+				console.log('e'+JSON.stringify(e))
+				this.personal_info.educationN = '';
+				e.map((val, index) => {
+					// this.result += this.result == '' ? val.label : '-' + val.label;
+					let result = val.label
+					_self.personal_info.education = val.value;
+					_self.personal_info.educationN  += result;
+				}) 
+			},
+			professionConfirm(e){
+				console.log('e'+JSON.stringify(e))
+				this.personal_info.industryN = '';
+				e.map((val, index) => {
+					// this.result += this.result == '' ? val.label : '-' + val.label;
+					let result = val.label
+					_self.personal_info.industry = val.value;
+					this.personal_info.industryN  += result;
+				}) 
+			},
+			salaryConfirm(e){
+				console.log('e'+JSON.stringify(e))
+				this.personal_info.salaryRangeN = '';
+				e.map((val, index) => {
+					// this.result += this.result == '' ? val.label : '-' + val.label;
+					let result = val.label
+					_self.personal_info.salaryRange = val.value;
+					this.personal_info.salaryRangeN  += result;
+				}) 
+			},
+			taSalaryRangeConfirm(e){
+				console.log('e111'+JSON.stringify(e))
+				this.personal_info.taIncomeRangeN = '';
+				e.map((val, index) => {
+					// this.result += this.result == '' ? val.label : '-' + val.label;
+					console.log('val'+val + 'index '+index)
+					let result = val.label
+					_self.personal_info.taIncomeRange = val.value;
+					_self.personal_info.taIncomeRangeN  += result; 
+				}) 
+			},
+			taAgeRangeConfirm(e){
+				console.log('e'+JSON.stringify(e))
+				this.personal_info.taAgeRangeN = '';
+				e.map((val, index) => {
+					console.log('val'+val + 'index '+index)
+					// this.result += this.result == '' ? val.label : '-' + val.label;
+					let result = val.label
+					_self.personal_info.taAgeRange = val.value;
+					_self.personal_info.taAgeRangeN  += result;
+				}) 
+			},
+			taEducationConfirm(e){
+				console.log('e'+JSON.stringify(e))
+				this.personal_info.taEduN = '';
+				e.map((val, index) => {
+					console.log('val'+val + 'index '+index)
+					// this.result += this.result == '' ? val.label : '-' + val.label;
+					let result = val.label
+					_self.personal_info.taEdu = val.value;
+					_self.personal_info.taEduN  += result;
+				}) 
+			},
+			/*
+			educationSelect(e) {
+				this.personal_info.education = e.value;
+				this.personal_info.educationN = e.name;
+				//this.$refs.uForm.validateField('personal_info.education')
+			},
+			salarySelect(e) {
+				this.personal_info.salaryRange = e.value;
+				this.personal_info.salaryRangeN = e.name;
+				//this.$refs.uForm.validateField('personal_info.salaryRange')
+			},
+			professionSelect(e) {
+				this.personal_info.industry = e.value;
+				this.personal_info.industryN = e.name;
+				//this.$refs.uForm.validateField('personal_info.industry')
+			},
+			houseSelect(e) {
+				this.personal_info.housingSituation = e.value;
+				this.personal_info.housingSituationN = e.name;
+				//this.$refs.uForm.validateField('personal_info.housingSituation')
+			},   
+			childrenSelect(e) {
+				this.personal_info.childStatus = e.value;
+				this.personal_info.childStatusN = e.name;
+				//this.$refs.uForm.validateField('personal_info.childStatus')
+			},   
+			marriageSelect(e) {
+				this.personal_info.maritalStatus = e.value;
+				this.personal_info.maritalStatusN = e.name;
+				//this.$refs.uForm.validateField('personal_info.maritalStatus')
+			},  
+			taAgeRangeSelect(e) {
+				this.personal_info.taAgeRange = e.value;
+				this.personal_info.taAgeRangeN = e.name;
+				//this.$refs.uForm.validateField('personal_info.taAgeRange')
+			},   
+			taEducationSelect(e) {
+				this.personal_info.taEdu = e.value;
+				this.personal_info.taEduN = e.name;
+				//this.$refs.uForm.validateField('personal_info.taEdu')
+			},   
+			taSalarySelect(e) {
+				this.personal_info.taIncomeRange = e.value;
+				this.personal_info.taIncomeRangeN = e.name;
+				//this.$refs.uForm.validateField('personal_info.taIncomeRange')
+			},*/
+			heightConfirm(e){
+				console.log('e'+JSON.stringify(e))
+				this.form.height = '';
+				e.map((val, index) => {
+					// this.result += this.result == '' ? val.label : '-' + val.label;
+					let result = val.label
+					_self.personal_info.height = val.value
+					this.form.height  += result;
+				}) 
+			},
+			weightConfirm(e){
+				console.log('e'+JSON.stringify(e))
+				this.form.weight = '';
+				e.map((val, index) => {
+					// this.result += this.result == '' ? val.label : '-' + val.label;
+					let result = val.label
+					_self.personal_info.weight = val.value;
+					this.form.weight  += result;
+				}) 
+			},
+			uploadPhoto(){
+			    // 上传图片
+				//const ctx = uni.createCanvasContext('myCanvas');
+				//console.log('url'+this.uploadUrl)
+				//console.log(this.carhelp.getToken())
+				let _this = this;
+			    uni.chooseImage({
+			        count: 1, //默认9
+			        // sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
+			        sourceType: ['album','camera'], //从相册选择
+			        success:(res)=> {
+			            let imgFile = res.tempFilePaths;
+						console.log(process.car.BASE_URL+"mobile/member/uploadBase64")
+						console.log(imgFile)
+							console.log(process.car.NODE_ENV)
+						
+							console.log()
+						var token=this.carhelp.getToken()
+						for(let i = 0;i < imgFile.length;i++)
+						{
+							 
+							 wx.uploadFile({
+								 url:process.car.BASE_URL+"uploadPicture",
+								 
+								// url:process.car.BASE_URL+"mobile/member/uploadBase64",
+								 name: 'photoFile',
+								     header: {
+								 
+								         //   'appId': process.car.VUE_APP_WXAPPID ,
+								 
+								             'Authorization':token ,
+								 
+								          //   'openId': "wxa8954f417fa7c32f" ,
+								 
+								 
+								               'accept': 'application/json',
+								 //#ifdef MP-WEIXIN
+								                "Content-Type": "multipart/form-data",//记得设置
+								 //#endif
+								 
+								       },
+								  filePath: imgFile[0],
+								    success: function(result) {
+										let imgUrls = JSON.parse(result.data) //百度支持 this.site_url +'/' +
+										//let image ={url: imgUrls.data};											  		 
+										//_self.fileList.push(image); //微信
+										_self.personal_info.faceImage = imgUrls.data;
+									}
+								  
+								  
+								  
+							 })
+							  
+							
+						}
+			        },
+			    }); 
+			},
+			findByOpenId(){
+				var openId=this.carhelp.getOpenId()
+				if(openId==""){
+					console.log("------------------")
+					setTimeout(()=>{
+						this.findByOpenId()
+					},1000)
+					return
+				}
+				uni.request({
+					method:'get',
+					url: process.car.BASE_URL + "/mobile/regUser/findByOpenId",
+					data: {
+						openId:openId,			
+					},
+					header: {
+						'Content-Type': 'application/x-www-form-urlencoded',
+						'X-Requested-With': 'XMLHttpRequest',
+					}
+				}).then((response) => {
+					console.log('findByOpenId')
+					let [error, res] = response;
+				  
+					if (res.data.code == 200&&res.data.result) {			
+						var token = res ? res.data.data.token : '';					
+						this.carhelp.setPersonInfo(res.data.data.memberInfo );
+						this.carhelp.setToken(token);
+						this.carhelp.setPersonInfoPlus(res.data.data);
+						 
+					
+					}  
+				}).catch(error => {
+					 
+				})
+			}
 		}
 	}
 </script>

+ 1 - 1
pages/user/index.vue

@@ -130,7 +130,7 @@
 			},
 			viewPersonalInfo(){
 				uni.navigateTo({
-					url:'./personal'
+					url:'../friend/personal?id='+this.personalInfo.id
 				})
 			},
 			improvePersonalInfo(){

+ 7 - 2
pages/user/personal.vue

@@ -130,7 +130,7 @@
 					</view>
 				</view>
 				<view class="personal-btn">
-					<u-button type="error" shape="circle" :custom-style="customStyle">
+					<u-button type="error" shape="circle" :custom-style="customStyle" @click="edit">
 						<span>编辑</span>
 						<u-icon custom-prefix="custom-icon" name="edit-2-line"></u-icon>
 					</u-button>
@@ -177,7 +177,11 @@
 
 		},
 		methods:{
-			
+			edit(){
+				uni.navigateTo({
+					url:'./edit'
+				})
+			}
 		}, 
 		onLoad(options){
 			_self = this;
@@ -412,6 +416,7 @@
 			
 			
 		},
+		
 		onReady(){
 //			console.log('个人信息'+JSON.stringify(this.personalInfo))
 			if(this.personalInfo.age !=null){

+ 1 - 1
pagesB/components/mpvue-citypicker/mpvueCityPicker.vue

@@ -49,7 +49,7 @@ export default {
 	  _self = this;
 	  if(provinceData.length<=0){
 		  loginApi.getCityList().then(function(data){
-		  	//console.log('获取城市成功'+JSON.stringify(data));
+//		  	console.log('获取城市成功'+JSON.stringify(data));
 		  	if(data.result &&  data.data){
 		  		setCityData(data.data);
 		  		//_self.$refs.mpvuebirtydayCityPicker.setCityData(data.data);		

+ 14 - 19
pagesB/pages/login/step1.vue

@@ -34,7 +34,7 @@
 				<u-form :model="form" ref="uForm">
 					<view class="jpLogin-input">
 						<u-form-item :required="true">
-							<u-input v-model="form.birthday" type="select" placeholder="请选择生日" @click="birthdayChange"/>
+							<u-input :disabled='true' v-model="form.birthday" type="select" placeholder="请选择生日" /><!--@click="birthdayChange"-->
  						</u-form-item>
 					</view>
 					<view class="jpLogin-input">
@@ -121,9 +121,7 @@
 					selected: []
 				},
 				show_height : false,
-				show_weight : false,
-				height_ranges:[],
-				weight_ranges:[],
+				show_weight : false, 
 				height_ranges_by_names:[],
 				weight_ranges_by_names:[], 
 				background:{
@@ -157,15 +155,18 @@
 				let personal_info = _self.carhelp.getPersonInfo();
 				if(personal_info)
 				{
-					console.log('个人信息'+JSON.stringify(personal_info))
+//					console.log('个人信息'+JSON.stringify(personal_info))
 					if(personal_info.gender!=null){
 						if(personal_info.gender)
 							_self.form.sex = "male";
 						else
 							_self.form.sex = "female";
 					}
-					 if(personal_info.birthday!=null){
-					 	_self.form.birthday = personal_info.birthday;
+					 if(personal_info.birthday!=null){
+						 let idCard = personal_info.idCard;
+						 let birthday = idCard.substr(6,8);
+					 	_self.form.birthday = birthday.substr(0,4)+'-'+birthday.substr(4,2)+'-'+birthday.substr(6,2)
+//personal_info.birthday;
 					 }
 					 if(personal_info.height!=null){
 					 	_self.form.height_val = personal_info.height;
@@ -189,24 +190,18 @@
 			
 			for(let i = 130;i<=220;i++)
 			{
-				this.height_ranges.push(i.toString());
-			}
-			for(let i = 20;i<=120;i++)
-			{
-				this.weight_ranges.push(i.toString());
-			}
-			
-			for(let i = 0;i< _self.height_ranges.length;i++)
-			{
-				let height_range = {value: _self.height_ranges[i], label: _self.height_ranges[i]+"cm"};
+				let height_range = {value: i, label: i.toString()+"cm"};
 				_self.height_ranges_by_names.push(height_range);
+				//this.height_ranges.push(i.toString());
 			}
-			for(let i = 0;i< _self.weight_ranges.length;i++)
+			for(let i = 20;i<=120;i++)
 			{
-				let weight_range = {value:_self.weight_ranges[i], label:_self.weight_ranges[i]+"kg"};
+//				this.weight_ranges.push(i.toString());
+				let weight_range = {value:i, label:i.toString()+"kg"};
 				_self.weight_ranges_by_names.push(weight_range);
 			}
 			
+ 			
 		},
 		methods: { 
 			changeSex(sex){

+ 1 - 6
pagesB/pages/login/step4.vue

@@ -207,12 +207,7 @@
 						this.carhelp.setPersonInfo(res.data.data.memberInfo );
 						this.carhelp.setToken(token);
 						this.carhelp.setPersonInfoPlus(res.data.data);
-						
-						setTimeout(()=>{
-							uni.switchTab({
-								url: '/pages/index/index'
-							});
-						},1000)
+						 
 					
 					}  
 				}).catch(error => {