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

pages/user/edit.vue

@@ -83,8 +83,8 @@
 				
 				<view class="edit-line"></view>				 
 				 
-				<view class="edit-row">
-					<view class="u-flex u-row-between ">
+				<view class="edit-row" @click="editSelfEvaluation">
+					<view class="u-flex u-row-between " >
 						<p>自我评价</p>
 						<u-icon custom-prefix="custom-icon" name="youjiantou"></u-icon>
 					</view>
@@ -122,6 +122,31 @@
 				<span>保存</span>
 			</u-button>
 		</view>
+		<view>
+			<!--
+			<u-popup :show="showSelfEvaluation" mode="bottom"  @close="close" @open="open">
+				<view>
+					<text>人生若只如初见，何事秋风悲画扇</text>
+				</view>
+			</u-popup>-->
+			<u-popup border-radius="20" v-model="showSelfEvaluation" @close="close"   mode="bottom" length="90%" height="570rpx">
+				<view style="display: flex; flex-direction: column;">
+					<view style="display:flex;flex-direction:row;margin-top: 50rpx;justify-content: space-between; ">
+						<view style="margin-left: 50rpx;font-weight: bold!important; font-size:30rpx;margin-bottom: 20rpx;">自我评价</view>
+						<view style="font-color:#E5E7EA;margin-right: 50rpx;">{{selfEvaluation.length}}/200</view>
+					</view>
+					<view style="uni-textarea; margin-left: 50rpx;margin-right: 50rpx;margin-bottom: 20rpx;">
+						<textarea style="padding-top: 10rpx;padding-bottom: 10rpx; border-radius:30rpx;padding-left: 20rpx;padding-right: 20rpx; background-color: #E5E7EA;overflow: auto;" :adjust-position="false" placeholder="请填写内容" maxlength="200" name="summary"  v-model="selfEvaluation">			
+							 
+						</textarea> 
+					</view>
+					<view>
+						<button style="border-radius:100rpx;background-color: #FF5E5E;width:75%;color:#FFFFFF" @click="saveSelfEvaluation">保存</button>
+					</view> 
+				</view>
+			</u-popup>
+ 		</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>		
@@ -256,13 +281,14 @@
 					house_statusId:'',
 					marriage_statusId:'',
 					children_statusId:'',
-				
-				},
+				},				
+				selfEvaluation:'',
 				personal_info:{
 					faceImage:' /static/img/sexMan.png'
 				},
 				height_ranges:[],
 				weight_ranges:[],
+				showSelfEvaluation:false,
 				show_height:false,
 				show_weight:false,
 				
@@ -299,6 +325,7 @@
 
 		},
 		computed:{
+			 
 			idCard(){
 				if(this.personal_info.idCard && this.personal_info.idCard.length>=15){
 					let prefix = this.personal_info.idCard.substr(0,5);
@@ -526,7 +553,24 @@
 //			console.log('个人信息'+JSON.stringify(this.personal_info))
 		},
 		methods:{
-			
+			saveSelfEvaluation(){
+				this.showSelfEvaluation = false;
+				this.personal_info.selfEvaluation = this.selfEvaluation;
+				console.log('自我评价'+JSON.stringify(this.selfEvaluation))
+			},
+			editSelfEvaluation(){
+				this.selfEvaluation = this.personal_info.selfEvaluation;
+				this.showSelfEvaluation = true
+				
+				console.log('editSelfEvaluation')
+			},
+			open() {
+			         console.log('open');
+			      },
+			  close() {
+				this.showSelfEvaluation = false
+				 console.log('close');
+			  },
 			selectInterest(index){
 //				let interest = this.interests;
 				this.base_dictionary.hobbyInfoList[index].isMemberSelect = !this.base_dictionary.hobbyInfoList[index].isMemberSelect;
@@ -584,7 +628,11 @@
 						personal_info.hobby += _self.base_dictionary.hobbyInfoList[i].id;
 					}
 				} 
-				
+				if(_personal_info.selfEvaluation)
+				{
+					personal_info.selfEvaluation = _personal_info.selfEvaluation;
+					console.log('selfEvaluation'+personal_info.selfEvaluation);
+				}
 				if(_personal_info.weight)
 				{
 					personal_info.weight = _personal_info.weight;
@@ -1039,7 +1087,7 @@
 						'X-Requested-With': 'XMLHttpRequest',
 					}
 				}).then((response) => {
-					console.log('findByOpenId')
+//					console.log('findByOpenId' +JSON.stringify(response))
 					let [error, res] = response;
 				  
 					if (res.data.code == 200&&res.data.result) {