1

pages/blindDate/persondetails.vue

@@ -232,7 +232,7 @@
 							<text>{{dataList.ConoldBaseInfostellation}}</text>
 						</view>
 						<view class="box-jc-c-t-i">
-							<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-rw.png" ></image>
+							<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-rw.png"  style="width: 12rpx;height: 26rpx;"></image>
 							<text>{{dataList.Height}}cm</text>
 							<text style="margin: 0 5px;">·</text>
 							<text>{{dataList.Weight}}kg</text>
@@ -245,6 +245,22 @@
 							<text style="margin: 0 5px;">·</text>
 							<text>{{dataList.DWCName}}{{dataList.DWDName}}</text>
 						</view>
+						<view class="box-jc-c-item-i" v-if="dataList.Job">
+							<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-gz.png" ></image>
+							<text>{{dataList.Job}}</text>
+						</view>
+						<view class="box-jc-c-item-i" v-if="dataList.MarriageStr">
+							<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-gz.png" ></image>
+							<text>{{dataList.MarriageStr}}</text>
+						</view>
+						<view class="box-jc-c-item-i">
+							<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-book.png" ></image>
+							<text>{{dataList.HouseInfoStr}}</text>
+							<text style="margin: 0 5px;" v-if="dataList.CarInfoStr">·</text>
+							<text v-if="dataList.CarInfoStr">{{dataList.CarInfoStr}}</text>
+							<text style="margin: 0 5px;" >·</text>
+							<text v-if="dataList.YearMoney">年收入{{dataList.YearMoney}}万元</text>
+						</view>
 						<view class="box-jc-c-item-i">
 							<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-book.png" ></image>
 							<text>{{dataList.EducationTypeStr}}</text>
@@ -254,10 +270,7 @@
 						
 					</view>
 					<view  class="box-jc-c-item">
-						<view class="box-jc-c-item-i" v-if="dataList.Job">
-							<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-gz.png" ></image>
-							<text>{{dataList.Job}}</text>
-						</view>
+						
 					</view>
 				</view>
 			</view>

pages/friendcircle/my-news.vue

@@ -313,18 +313,7 @@
 			this.isAttestation = basedata.user_info.isAttestation?basedata.user_info.isAttestation:0;
 		},
 		mounted() {
-			let currentPages = getCurrentPages();
-			let u = "/" + currentPages[currentPages.length - 1].route;
-			let pages = wx.getStorageSync("basedata") ?
-				wx.getStorageSync("basedata").bar_title : [];
-			pages.forEach((x) => {
-				if (x.value == u) {
-					this.pageTitle = x.new_name ? x.new_name : x.name;
-				}
-			});
-			uni.setNavigationBarTitle({
-				title: this.pageTitle,
-			});
+			
 
 		},
 		onLoad(options) {
@@ -340,7 +329,28 @@
 				if(options && options.UserId){
 					this.UserId = options.UserId
 					this.init(2);//从详情个人资料跳转过来的时候
+					if(this.UserId == this.mall_User){
+						this.pageTitle = '我的动态'
 					}else{
+						this.pageTitle = 'TA的动态'
+					}
+					uni.setNavigationBarTitle({
+						title: this.pageTitle,
+					});
+				}else{
+					
+					let currentPages = getCurrentPages();
+					let u = "/" + currentPages[currentPages.length - 1].route;
+					let pages = wx.getStorageSync("basedata") ?
+						wx.getStorageSync("basedata").bar_title : [];
+					pages.forEach((x) => {
+						if (x.value == u) {
+							this.pageTitle = x.new_name ? x.new_name : x.name;
+						}
+					});
+					uni.setNavigationBarTitle({
+						title: this.pageTitle,
+					});
 					this.UserId = this.mall_User
 					this.init();
 				}