1

pages/blindDate/persondetails.vue

@@ -274,7 +274,7 @@
 				</view>
 			</view>
 			<!-- 个人动态 -->
-			<view class="box-grdt" @click="gogerendongtai()">
+			<view class="box-grdt" @click="dynamicList.length>0?gogerendongtai():''">
 				<view style="display: flex;align-items: center;justify-content: space-between;width: 100%;">
 					<view style="display: flex;">
 						<text style="font-size: 13px;font-weight: bold;">个人动态</text>
@@ -282,7 +282,10 @@
 					</view>
 					<u-icon  name="arrow"></u-icon>
 				</view>
-				<view style="display: flex;align-items: center;margin-top: 10px;">
+				<view v-if="dynamicList.length==0" class="box-grdt-i-c-w" style="justify-content: center;">
+					暂无动态
+				</view>
+				<view style="display: flex;align-items: center;margin-top: 10px;" v-if="dynamicList.length>0">
 					<view v-for="(x,y) in dynamicList" :key='y' class="box-c-item" :style="{width:pjwidth,height:pjwidth,'margin-right':dynamicList.length==(y+1)?'':'10px'}">
 						<view class="ftBox-right-text" style="padding: 6px;overflow: hidden;width: 100%;height: 100%;text-overflow: ellipsis;display: -webkit-box;
 							-webkit-line-clamp: 2;
@@ -313,7 +316,7 @@
 			<view class="box-grdt" style="margin-bottom: 100px;">
 				<view style="display: flex;align-items: center;justify-content: space-between;">
 					<text style="font-size: 13px;font-weight: bold;">关于我</text>
-					<view class="box-jc-t-r" @click="goedit(2)">
+					<view class="box-jc-t-r" @click="goedit(2)" v-if="mall_UserInfo.UserId == dataList.Id">
 						<view :style="{background:mainColor}">编辑</view>
 					</view>
 				</view>
@@ -434,13 +437,13 @@
 			
 		</view>
 		<view class="boxfixed">
-			<view class="xboxfixed">
+			<view class="xboxfixed" :style="{'justify-content':mall_UserInfo.UserId == dataList.Id?'center':'space-between'}">
 				<view class="xboxfixed-item" style="background: #00C6C1;">
 					<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-fx.png" style="width: 54rpx;height: 54rpx;margin-right: 10px;"></image>
 					<text>推给朋友</text>
 					<button   open-type="share" ></button>
 				</view>
-				<view class="xboxfixed-item" style="background: #3183FE;">
+				<view class="xboxfixed-item" style="background: #3183FE;" v-if="mall_UserInfo.UserId != dataList.Id">
 					<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/pd-hi.png" style="width: 54rpx;height: 54rpx;margin-right: 10px;"></image>
 					<text>想认识TA</text>
 					<button   open-type="contact" :send-message-title="dataList.Name" :send-message-path="path" :send-message-img="dataList.Photo" :show-message-card="true"></button>
@@ -550,8 +553,14 @@
 			},
 			getMyDynamicList(){
 				this.request2({
-						url: '/api/AppletEducation/GetMyDynamicList',
-						data: {pageIndex: 1,pageSize: 4,}
+						url: '/api/AppletSchool/GetMiAiDynamicList',
+						data: {pageIndex: 1,
+							pageSize: 4,
+							UserTeacher: 0,
+							CreateBy: this.UserId,
+							UserId:this.mall_UserInfo.UserId,
+							TalkId:0,
+						}
 					},
 					res => {
 						if (res.resultCode == 1) {
@@ -610,9 +619,12 @@
 				})
 			},
 			gosfzrenz(){//身份证认证
+				if(this.mall_UserInfo.UserId == this.UserId){
 					uni.navigateTo({
 						url: '/pages/blindDate/personal/IDidentification' 
 					})
+				}
+				
 			},
 			gogerendongtai(){//跳入动态列表
 				uni.navigateTo({

pages/friendcircle/my-news.vue

@@ -339,10 +339,12 @@
 				this.mall_User = this.u.UserId?this.u.UserId:0;
 				if(options && options.UserId){
 					this.UserId = options.UserId
+					this.init(2);//从详情个人资料跳转过来的时候
 				}else{
 					this.UserId = this.mall_User
-				}
 					this.init();
+				}
+				
 				
 			}
 		},
@@ -350,11 +352,24 @@
 			innerAudioContext.stop();
 		},
 		methods: {
-			init() {
+			init(type=1) {
 				this.loading = true;
+				let url = '/api/AppletEducation/GetMyDynamicList';
+				let data = this.msg
+				if(type==2){
+					url = '/api/AppletSchool/GetMiAiDynamicList';
+					data={
+						pageIndex: 1,
+						pageSize: 15,
+						UserTeacher: 0,
+						CreateBy: this.UserId,
+						UserId:this.mall_User,
+						TalkId:0,
+					}
+				}
 				this.request2({
-						url: '/api/AppletEducation/GetMyDynamicList',
-						data: this.msg
+						url: url,
+						data: data
 					},
 					res => {
 						if (res.resultCode == 1) {