1

pages/friendcircle/friendcircle.vue

@@ -36,11 +36,12 @@
 		display: flex;flex-direction: row;
 		align-items: center;
 		justify-content: space-between;
-		position: relative;
+		position: relative;
+		margin-top: 3px;
 	}
 	.friendcircle .r-sj-d{
-		width: 24px;
-		height: 17px;
+		width: 26px;
+		height: 19px;
 		background: #F5F5F5;
 		border-radius: 3px;
 		display: flex;flex-direction: row;
@@ -60,7 +61,7 @@
 		align-items: center;
 		justify-content: space-around;
 		position: absolute;
-		right: 26px;
+		right: 29px;
 		bottom: -5px;
 		font-size: 11px;
 		color: #FFFFFF;
@@ -245,7 +246,7 @@
 
 								</view>
 								<view class="dianrow" @click="pinglun(x,i)">
-									<u-icon name="comment-circle-o" :size="30" color="#FFF"></u-icon>
+									<u-icon name="comment-o" :size="30" color="#FFF"></u-icon>
 									<text>
 										评论
 									</text>
@@ -266,7 +267,7 @@
 							<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: 10px;" @click="huifu(x,i,item,iq)">
+									<view v-for="(item, iq) in x.commentList" :key="iq" style="width: 100%;margin-bottom: 7px;" @click="huifu(x,i,item,iq)">
 										<view class="text comment-list">
 											{{item.empName}}
 											<text style="color: #333333;margin: 0 3px;" v-if="item.byReplayEmpId>0">回复</text>
@@ -521,6 +522,16 @@
 				}
 				if(this.msg.UserId == this.user.item.empId){//自己点自己的时候处理
 					this.show=true
+				}else{
+					this.focu = true;
+					this.choiceId = x.id;
+					this.$forceUpdate()
+					this.commentMsg = {
+						ArticleId: x.id,
+						CommentId: item.commentId,
+						Content: '',
+					}
+					this.placeholder = '回复'+item.empName
 				}
 				
 				

pages/friendcircle/release.vue

@@ -158,7 +158,8 @@
 			<textarea placeholder="今天又什么可以给大家分享呢？" style="width: 100%;height: 100px;" maxlength='-1' confirm-type='done' v-model="addMsg.Content">
 
 			</textarea>
-			<text v-if='addMsg.FileType==1 || addMsg.FileType==2' style="font-size: 12px;color: #333333">上传图片或者视频<span style='color: ;#A9A9A9'>(图片无上限）</span> </text>
+			<text v-if='addMsg.FileType==1 ' style="font-size: 12px;color: #333333">上传图片<span style='color: ;#A9A9A9'>(图片无上限）</span> </text>
+			<text v-if=' addMsg.FileType==2' style="font-size: 12px;color: #333333">上传视频 </text>
 			<view style="width: 100%;margin-top: 15px;">
 				<u-upload :action="action" :file-list="fileList" @on-remove="onRemove1"  :custom-btn="true"
 				v-if='addMsg.FileType==1'