用户编辑

pages/friend/personal.vue

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

pages/user/edit.vue

@@ -2,18 +2,24 @@
 	<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"></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>
 				
@@ -78,26 +84,142 @@
 				<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="onWorkCityConfirm"></mpvue-city-picker>		
  	</view>
 </template>
 
 <script>
+	import mpvueCityPicker from "../../pagesB/components/mpvue-citypicker/mpvueCityPicker.vue";
+	import {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,
+				
 			}
 
 			methods: {
 				
 			}
 
+		},
+		onLoad(){
+			_self = this;
+			this.personal_info = this.carhelp.getPersonInfo();	
+			
+						
+			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'
+					
+				}
+			}
+			
+			
+			console.log('个人信息'+JSON.stringify(this.personal_info))
+		},
+		methods:{
+			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;
+				}) 
+			},
 		}
 	}
 </script>

pages/user/index.vue

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

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){

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:{
@@ -164,8 +162,11 @@
 						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){