1

pages/blindDate/editData.vue

@@ -96,7 +96,7 @@
 								 </view>
 								 
 							</view>
-						</view>
+						</view>	
 					</view>
 					<view class="conBox" v-if="item.type==3">
 						<textarea v-model="data[item.field]" class="textareaBox" maxlength='450' :placeholder="item.placehloder" />
@@ -166,7 +166,7 @@
 						field:"SexStr",
 						placehloder:"请选择性别",
 						subType:2,
-						array:['男','女'],
+						array:[{Name: "男", Id: 1}, {Name: "女", Id: 2}],
 						mode:"selector",
 						disabled:true,
 						must:true,
@@ -770,6 +770,21 @@
 							if(this.data.AlbumList==null){
 								this.data.AlbumList=[]
 							}
+							console.log(this.data)
+							if(this.data.Sex==1){
+								this.data.SexStr="男"
+							}else if(this.data.Sex==2){
+								this.data.SexStr="女"
+							}else{
+								this.data.SexStr="";
+								this.dataList[1].childDataList.map(x=>{
+									if(x.name == '性别'){
+										console.log(x)
+										x.disabled = false;
+										return
+									}
+								})
+							}
 							
 							
 						}
@@ -847,23 +862,23 @@
 		// 4-14
 		this.GetHouseList()//获取房屋枚举 
 		this.GetCarList()//获取车辆枚举 
-		uni.getStorage({
-		    key: 'basedata',
-		    success: (res) =>{
-				let data= res.data.user_info
-		        this.data.Name=data.nickname
-				if(data.Sex==1){
-					this.data.Sex="男"
-				}else if(data.Sex==2){
-					this.data.Sex="女"
-				}else{
-					this.data.Sex=""
-				}
-		    },
-			fail:(err)=> {
-				// console.log(err);
-			}
-		});
+		// uni.getStorage({
+		//     key: 'basedata',
+		//     success: (res) =>{
+		// 		let data= res.data.user_info
+		//         this.data.Name=data.nickname
+		// 		if(data.Sex==1){
+		// 			this.data.Sex="男"
+		// 		}else if(data.Sex==2){
+		// 			this.data.Sex="女"
+		// 		}else{
+		// 			this.data.Sex=""
+		// 		}
+		//     },
+		// 	fail:(err)=> {
+		// 		// console.log(err);
+		// 	}
+		// });
 		uni.setNavigationBarTitle({
 		    title: this.pageTitle
 		});

pages/friendcircle/friendcircle.vue

@@ -259,11 +259,11 @@
 			<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scroll='inputscroll' @scrolltolower="lower"
 			 :style="{ height: '100%' }">
 				<view class="ftBox" v-for="(x, i) in g" :key="i" :style="{'margin-top':Messagecount>0 && i==0?'80px':'20px'}">
-					<view class="ftBox-left" @click="goUserinfo(x)">
+					<view class="ftBox-left" @click="goUserinfo(x,1)">
 						<u-avatar :src="x.crearteEmPhoto" size='80' mode="square"></u-avatar>
 					</view>
 					<view class="ftBox-right">
-						<view class="text" :style="{'font-size': '14px','font-weight': 'bold','margin-bottom': '5px',color:'#010101'}">{{x.createEmName}}</view>
+						<view class="text" @click="goUserinfo(x,1)" :style="{'font-size': '14px','font-weight': 'bold','margin-bottom': '5px',color:'#010101'}">{{x.createEmName}}</view>
 						<view class="text2" style="font-size: 14px;margin-bottom: 5px;"> <text @click="gohuati(x)" :style="{'font-weight': '600','margin-right': '2px',color:mainColor}" v-if="x.TalkContent!=null && x.TalkContent!=''">#{{x.TalkContent}}#</text> {{x.content}}</view>
 						<!-- 图片模式 -->
 						<view class="imgmode" v-if="x.fileType==1">
@@ -334,18 +334,21 @@
 							<view class="areagood" v-if=" x.likeList.length>0" >
 								<u-icon name="like-o" :size="30" color="#737373"></u-icon>
 								<view class="areagood-r text" :style="{color:mainColor}">
-									<text v-for="(item, iq) in x.likeList" :key="iq">{{item.empName}}{{x.likeList.length!=iq+1?'、':''}}</text>
+									<text @click="goUserinfo(item,2)" v-for="(item, iq) in x.likeList" :key="iq">{{item.empName}}{{x.likeList.length!=iq+1?'、':''}}</text>
 								</view>
 							</view>
 							<view v-if="x.likeList.length>0 && x.commentList.length>0" style="width: 100%;height: 1px;background: rgb(226, 226, 226);"></view>
 							<view class="areagood" v-if=" x.commentList.length>0">
 								<u-icon name="comment-o" :size="30" color="#737373" style='margin-top: 2px;'></u-icon>
 								<view class="areagood-r">
-									<view v-for="(item, iq) in x.commentList" :key="iq" style="width: 100%;margin-bottom: 7px;" @click="huifu(x,i,item,iq)" @longpress='longpress(x,i,item,iq)'>
-										<view class="text comment-list" :style="{color:mainColor}">
-											{{item.empName}}
-											<text style="color: #333333;margin: 0 3px;" v-if="item.byReplayEmpId>0">回复</text>
-											{{item.byReplayEmpId>0?item.byReplayEmpName:''}}
+									<view v-for="(item, iq) in x.commentList" :key="iq" style="width: 100%;margin-bottom: 7px;"  @longpress='longpress(x,i,item,iq)'>
+										<view class="text comment-list" :style="{color:mainColor}" @click="goUserinfo(item,2)">
+											{{item.empName}}
+											<text @click="huifu(x,i,item,iq)">
+												<text style="color: #333333;margin: 0 3px;" v-if="item.byReplayEmpId>0">回复</text>
+												{{item.byReplayEmpId>0?item.byReplayEmpName:''}}
+											</text>
+											
 										</view>
 										<view class="text2">{{item.content}}</view>
 									</view>
@@ -913,9 +916,13 @@
 				})
 				innerAudioContext.stop();
 			},
-			goUserinfo(x){//用户信息
+			goUserinfo(x,type){//用户信息
+				let  UserId  = x.createEmpId
+				if(type==2){
+					UserId = x.empId
+				}
 				uni.navigateTo({
-					url: '/pages/blindDate/persondetails?UserId='+ x.createEmpId
+					url: '/pages/blindDate/persondetails?UserId='+ UserId
 				});
 				innerAudioContext.stop();
 			}