1

pages/friendcircle/friendcircle.vue

@@ -37,7 +37,7 @@
 		align-items: center;
 		justify-content: space-between;
 		position: relative;
-		margin-top: 3px;
+		margin-top: 5px;
 	}
 	.friendcircle .r-sj-d{
 		width: 26px;

pages/friendcircle/medynamic.vue

@@ -5,6 +5,7 @@
 		background: #FFF;
 
 	}
+
 	.mynews .ftBox {
 		width: 100%;
 		padding: 0 15px;
@@ -15,21 +16,25 @@
 		justify-content: space-between;
 
 	}
-	.mynews .ftBox-left{
+
+	.mynews .ftBox-left {
 		margin-right: 15px;
 	}
-	.mynews .ftBox-center{
+
+	.mynews .ftBox-center {
 		width: 1;
 		flex: 1;
 		margin-right: 5px;
 	}
-	.mynews .ftBox-right{
+
+	.mynews .ftBox-right {
 		width: 80px;
 		height: 80px;
 		border-radius: 5px;
 		overflow: hidden;
 	}
-	.mynews .ftBox-right-text{
+
+	.mynews .ftBox-right-text {
 		width: 100%;
 		height: 100%;
 		border-radius: 5px;
@@ -39,11 +44,11 @@
 
 
 	}
-	.mynews .text{
+
+	.mynews .text {
 		font-size: 14px;
 		color: #A68237;
 	}
-
 </style>
 <template>
 	<div class='mynews'>
@@ -65,7 +70,11 @@
 						</view>
 						<view v-if="x.realtionType==1">
 							<view>{{x.replyName==''?'回复了':'评论了'}} <text class="text" style="margin-left: 3px;">{{x.replyName}}</text></view>
-							<view>
+							<view style="overflow: hidden;
+									text-overflow: ellipsis;
+									display: -webkit-box;
+									-webkit-line-clamp: 4;
+									-webkit-box-orient: vertical;">
 								{{x.commentContent}}
 							</view>
 						</view>
@@ -74,7 +83,7 @@
 						</view>
 						<view style="font-size: 11px;color: #B0B0B0;">{{x.createTime}}</view>
 					</view>
-					<view class="ftBox-right" >
+					<view class="ftBox-right">
 						<view class="ftBox-right-text" style="padding: 6px;" v-if="x.fileType==0">
 							{{x.content}}
 						</view>
@@ -85,8 +94,7 @@
 
 							<video id="myVideo" :src="x.coverPhoto" style="width: 100%;height: 100%;border-radius: 5px;" :controls='false'
 							 :show-center-play-btn='false'></video>
-							<view style="width: 100%;height: 100%;position: absolute;left: 0;top: 0;display: flex;align-items: center;justify-content: center;"
-							 >
+							<view style="width: 100%;height: 100%;position: absolute;left: 0;top: 0;display: flex;align-items: center;justify-content: center;">
 								<u-icon name="play-circle-o" :size="50" color="#FFF"></u-icon>
 							</view>
 						</view>
@@ -197,10 +205,19 @@
 					this.status = "nomore";
 				}
 			},
-			godetails(x){
+			godetails(x) {
 				uni.navigateTo({
-					url: '/pages/friendcircle/mydetails?ID=' + x.id
+					url: '/pages/friendcircle/mydetails?ID=' + x.id + '&index=-1'
+				})
+			},
+			getsplice(id) {
+				let data = []
+				this.g.forEach((x, i) => {
+					if (id != x.id) {
+						data.push(x)
+					}
 				})
+				this.g = data
 			}
 
 		}

pages/friendcircle/my-news.vue

@@ -142,7 +142,7 @@
 		<u-empty v-if="g.length == 0" text="暂无动态" mode="list"></u-empty>
 		<view v-if="g.length > 0" :style="{'width':'100vw','overflow':'hidden','margin-top':Messagecount>0?'60px':'0','height':Messagecount>0?calc('100vh-60px'):'100vh'}">
 			<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" @scrolltolower="lower" :style="{ height: '100%' }">
-				<view class="ftBox" v-for="(x, i) in g" :key="i" @click="godetails(x)">
+				<view class="ftBox" v-for="(x, i) in g" :key="i" @click="godetails(x,i)">
 					<view class="jiazu" v-if="x.YearTime!=''">{{x.YearTime}}年</view>
 					<view class="interDList">
 						<view class="interDList-left">
@@ -458,6 +458,9 @@
 				this.g = [];
 				this.init();
 			},
+			getsplice(i){
+				this.g.splice(i,1)
+			},
 			lower(e) {
 				
 				if (this.msg.pageIndex < this.page_count) {
@@ -477,9 +480,9 @@
 			gbAuth() {
 				uni.navigateBack()
 			},
-			godetails(x){//跳入详情
+			godetails(x,i){//跳入详情
 				uni.navigateTo({
-					url: '/pages/friendcircle/mydetails?ID=' + x.id
+					url: '/pages/friendcircle/mydetails?ID=' + x.id+'&index='+i
 				})
 				innerAudioContext.stop();
 			},

pages/friendcircle/mydetails.vue

@@ -41,7 +41,7 @@
 		align-items: center;
 		justify-content: space-between;
 		position: relative;
-		margin-top: 3px;
+		margin-top: 5px;
 	}
 	.mydetails .r-sj-d{
 		width: 26px;
@@ -240,7 +240,11 @@
 						{{detial.address}}
 					</view>
 					<view class="r-sj">
-						<text>{{detial.createTime}}</text>
+						<view style="display: flex;flex-direction: row;align-items: center;">
+							<text style="margin-right: 5px;">{{detial.createTime}}</text>
+							<text v-if='isdelete == true' :style="{'color': mainColor}" @click="showdelete=true">删除</text>
+						</view>
+						
 						<view class="r-sj-d" @click.stop="getdian(detial)">
 							<view class="dian"></view>
 							<view class="dian"></view>
@@ -312,6 +316,7 @@
 				
 			</view>
 		</u-popup>
+		<u-modal v-model="showdelete" content="删除该朋友圈？" :show-cancel-button='true'	 @cancel='showdelete=false' @confirm='deletepyq()'></u-modal>
 	</view>
 </template>
 
@@ -340,6 +345,9 @@
 				user:'',//点击用户保存的数据
 				UserId:0,
 				controls:false,//显示默认控件
+				isdelete:false,//是否出现删除键
+				showdelete:false,//提示删除的弹框
+				index:0,//上个页面的索引
 			}
 		},
 		onLoad(options) {
@@ -348,6 +356,9 @@
 				this.commentMsg.ArticleId = options.ID
 				this.init(1)
 			}
+			if(options && options.index){
+				this.index = options.index;
+			}
 			uni.setNavigationBarTitle({
 				title: '详情',
 			});
@@ -375,6 +386,9 @@
 						if (res.resultCode == 1) {
 							this.detial = res.data;
 							this.detial.dianshow = false;
+							if(this.detial.createEmpId==this.UserId){//是当前账户 可以进行删除
+								this.isdelete = true
+							}
 						}
 					}
 				);
@@ -516,6 +530,39 @@
 				  data: this.user.item.content,
 				});
 			},
+			deletepyq(){//删除朋友圈
+				this.request2({
+						url: '/api/AppletEducation/DeleteDynamic',
+						data: {articleId:this.articleId}
+					},
+					res => {
+						if (res.resultCode == 1) {
+							
+							uni.showToast({
+								title: res.message,
+								icon: 'none',
+								duration: 2000
+							});
+							let that = this
+							let pages = getCurrentPages(); // 当前页面
+							let beforePage = pages[pages.length - 2]; // 前一个页面
+							setTimeout(() => {
+								uni.navigateBack({
+									success: function() {
+										if(that.index==-1){
+											beforePage.$vm.getsplice(that.articleId); // 执行前一个页面的created方法
+										}else{
+											beforePage.$vm.getsplice(that.index); // 执行前一个页面的created方法
+										}
+										
+									}
+								});
+							}, 500)
+							
+						}
+					}
+				);
+			},
 			enlarge(file) {
 				// 全屏
 				innerAudioContext.stop();

pages/friendcircle/release.vue

@@ -175,7 +175,7 @@
 				
 				<view style="width: 150px; height: 200px;position: relative;margin-right: 20px;">
 					<video id="myVideo" :src="addMsg.FileList[0]"
-						controls='controls'
+						:controls='controls'
 						:show-center-play-btn='false'
 						:show-fullscreen-btn='false' 
 						@fullscreenchange='videoControl' ></video>