From 7d8d0a9638dd4980937d9f5cdb7df877732d81ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Fri, 27 Aug 2021 15:06:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AD=97=E6=AE=B5=E6=8C=89?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E7=9A=84=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue      |  2 +-
 pages/my/memberDetails.vue | 59 +++++++++++++++++++-------------------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index fda2cce..c66bb06 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -23,7 +23,7 @@
 						<lf-image class="add-icon" src="../../static/images/add_icon.png"></lf-image>
 						<view class="lf-m-t-12 lf-color-555 lf-font-24 lf-line-1">我要上墙</view>
 					</view> -->
-					<view class="user-item" v-for="(item, index) in members_wall" :key="item.id" @click="$url('/pages/my/memberDetails?id'+ item.number)">
+					<view class="user-item" v-for="(item, index) in members_wall" :key="item.id" @click="$url('/pages/my/memberDetails?id='+ item.number)">
 						<image class="avatar" :src="item.user.avatar"></image>
 						<view class="lf-m-t-12 lf-color-555 lf-font-24 lf-line-1">编号{{ item.number }}</view>
 					</view>
diff --git a/pages/my/memberDetails.vue b/pages/my/memberDetails.vue
index 282b1dd..a9f3a65 100644
--- a/pages/my/memberDetails.vue
+++ b/pages/my/memberDetails.vue
@@ -3,18 +3,18 @@
 		<view class="content lf-bg-white lf-m-b-30" v-if="$isRight(member)">
 			<swiper class="swiper">
 				<swiper-item>
-					<lf-image :src="member.avatar"></lf-image>
+					<lf-image :src="member.user.avatar"></lf-image>
 				</swiper-item>
 			</swiper>
 			<view class="list lf-p-l-32 lf-p-r-32">
 				<!-- <lf-image class="avatar" src="@/static/logo.png"></lf-image> -->
 				<view class="info">
 					<view class="lf-flex-1">
-						<text>{{ member.member.number_nickname }}</text>
-						<text class="lf-iconfont icon-nv lf-m-l-10 lf-color-primary" v-if="member.member.gender == '女'"></text>
+						<text>{{ member.number_nickname }}</text>
+						<text class="lf-iconfont icon-nv lf-m-l-10 lf-color-primary" v-if="member.gender == '女'"></text>
 						<text class="lf-iconfont icon-nan lf-m-l-10 color-nan" v-else></text>
 					</view>
-					<view class="lf-flex-1 lf-m-t-16">{{ member.member.age }}岁·{{ member.member.zodiac }}·{{ member.member.height }}cm·{{ member.member.education_id }}·{{ member.member.marital_status }}</view>
+					<view class="lf-flex-1 lf-m-t-16">{{ member.age }}岁·{{ member.zodiac }}·{{ member.height }}cm·{{ member.education_id }}·{{ member.marital_status }}</view>
 					<view class="lf-flex-1 lf-m-t-16">自有公司·金融/证券/保险·50万以上</view>
 				</view>
 				<!-- <view class="star">
@@ -25,7 +25,7 @@
 		</view>
 		<view class="info-content" v-if="$isRight(member)">
 			<view class="lf-color-222 lf-font-32 authen-title lf-p-l-20">信息资料</view>
-			<view class="lf-row-between lf-m-t-30" v-for="(item, index) of list" :key="index">
+			<view class="lf-row-between lf-m-t-30" v-for="(item, index) in list" :key="index">
 				<view class="lf-color-333 lf-font-28">{{item.title}}</view>
 				<view class="lf-color-333 lf-font-28">{{item.content}}</view>
 			</view>
@@ -111,41 +111,42 @@
 					this.member = member;
 					
 					for(let i in member){
-						if(member[i].number_nickname){
-							list.push({title: '编号', content: member[i].number_nickname});
+						console.log("i", i, member[i])
+						if(i == 'number_nickname' && member[i]){
+							list.push({title: '编号', content: member[i]});
 						}
-						if(member[i].gender){
-							list.push({title: '性别', content: member[i].gender});
+						if(i == 'gender' && member[i]){
+							list.push({title: '性别', content: member[i]});
 						}
-						if(member[i].marital_status){
-							list.push({title: '婚史', content: member[i].marital_status});
+						if(i == 'marital_status' && member[i]){
+							list.push({title: '婚史', content: member[i]});
 						}
-						if(member[i].age){
-							list.push({title: '年龄', content: member[i].age +'岁'});
+						if(i == 'age' && member[i]){
+							list.push({title: '年龄', content: member[i] +'岁'});
 						}
-						if(member[i].height){
-							list.push({title: '身高', content: member[i].height});
+						if(i == 'height' && member[i]){
+							list.push({title: '身高', content: member[i]});
 						}
-						if(member[i].weight){
-							list.push({title: '体重', content: member[i].weight});
+						if(i == 'weight' && member[i]){
+							list.push({title: '体重', content: member[i]});
 						}
-						if(member[i].zodiac){
-							list.push({title: '属相', content: member[i].zodiac});
+						if(i == 'zodiac' && member[i]){
+							list.push({title: '属相', content: member[i]});
 						}
-						if(member[i].constellation){
-							list.push({title: '星座', content: member[i].constellation});
+						if(i == 'constellation' && member[i]){
+							list.push({title: '星座', content: member[i]});
 						}
-						if(this.$isRight(member[i].education)){
-							list.push({title: '学历', content: member[i].education.name});
+						if(i == 'education' && this.$isRight(member[i])){
+							list.push({title: '学历', content: member[i].name});
 						}
-						if(this.$isRight(member[i].enterprise)){
-							list.push({title: '单位性质', content: member[i].enterprise.name});
+						if(i == 'enterprise' && this.$isRight(member[i])){
+							list.push({title: '单位性质', content: member[i].name});
 						}
-						if(this.$isRight(member[i].salary)){
-							list.push({title: '年薪', content: member[i].salary.name});
+						if(i == 'salary' && this.$isRight(member[i])){
+							list.push({title: '年薪', content: member[i].name});
 						}
-						if(this.$isRight(member[i].area)){
-							list.push({title: '居住地区', content: member[i].area.name});
+						if(i == 'area' && this.$isRight(member[i])){
+							list.push({title: '居住地区', content: member[i].name});
 						}
 						// TODO 缺少户籍和所属行业
 					}