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

pages/friend/index.vue

@@ -190,7 +190,7 @@
 				slideMin: 18,
 				slideMax: 80,
 				//身高
-				slideMin2: 140,
+				slideMin2: 130,
 				slideMax2: 220,
 				isLiveMode: true,
 				rangeValues2: [170, 180],

pages/user/edit.vue

@@ -7,9 +7,9 @@
 		
 		<view class="edit-form">
 			<u-form :model="form" ref="uForm" label-width ="160">
-				<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="idCard" 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="personal_info.realName" input-align="right" placeholder=""/></u-form-item>
+				<u-form-item label="身份证号"><u-input :disabled='true' v-model="idCard" input-align="right" placeholder=""/></u-form-item>
+				<u-form-item label="手机号"><u-input :disabled='true' v-model="personal_info.phone" input-align="right" placeholder=""/></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="所属工会">
@@ -133,6 +133,10 @@
 		</view>
 		
 		<view>
+			<uni-popup ref="alertDialog" type="dialog">
+<!--				<uni-popup-dialog type="success" title="提示" :content="content" @confirm="confirm"
+					@close="dialogClose"></uni-popup-dialog>-->
+			</uni-popup>
 			<u-modal v-model="submitShow" @confirm="confirm" show-cancel-button='true' ref="uModal" :asyncClose="true" :content="content"></u-modal>
 		</view>
 		<view class="personal-btn">
@@ -922,11 +926,28 @@
 				 
 			},
 			formsubmit() {
+				this.personal_info.hobby = ''
+				for(let i=0;i<this.base_dictionary.hobbyInfoList.length;i++)
+				{
+					if(this.base_dictionary.hobbyInfoList[i].isMemberSelect)
+					{
+						if(this.personal_info.hobby.length>0)
+						{
+							this.personal_info.hobby+=','
+						}
+						this.personal_info.hobby += this.base_dictionary.hobbyInfoList[i].id;
+					}
+				} 
+				// console.log(this.personalInfoChange)
+				// console.log(this.personal_info)
 				for(var item in this.personal_info) {
 					if(this.personalInfoChange[item] != this.personal_info[item]) {
 						this.change = true;
+						// console.log(this.personalInfoChange[item])
+						// console.log(this.personal_info[item])
 					}
 				}
+				
 				if(!this.change) {
 					uni.switchTab({
 						url:'./index'
@@ -936,6 +957,7 @@
 				}			
 			},
 			confirm(){
+				console.log('确认保存')
 				let personal_info = {type:1,id:this.personal_info.id};
 				let _personal_info = this.personal_info;
 				if(_personal_info.faceImage)
@@ -1173,6 +1195,7 @@
 						url:'../user/index'
 					})*/
 				},function(err){
+					_self.submitShow = false;
 					console.log('保存失败'+JSON.stringify(personal_info)+ JSON.stringify(err));
 				});
 			},