hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-10 03:16:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat

Browse Source
This commit is contained in:
daihh
2022-11-22 19:38:05 +08:00
parent 8d41b35f65 f5711edd84
commit 101bc2ac00
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/HomePage/followList.vue
View File

@@ -5,7 +5,7 @@
<li class="follow-home-title tabs-index" @click="tagTab(2)">{{userInfo.aid == pageId ?'关注我的人':'关注TA的人'}}<span v-if="active == 2" class="line"></span></li>
</ul>
<div v-show="active ==1">
<div class="follow-list" v-for="(item,index) in follow.list" :key="index">
<div class="follow-list" v-for="(item,index) in follow.list" :key="item.userFollow.id">
<div style="width:60px;height:60" @click="toHome(item.userFollow.authorInfo)">
<el-avatar shape="circle" style="width:60px;height:60px" size="small" :src="baseUrl+item.userFollow.authorInfo.avatar" v-if="item.userFollow.authorInfo.avatar"></el-avatar>
<div v-else class="uavatar">
@@ -167,7 +167,7 @@ import apiUser from "@/api/system/user.js";
// console.log(aid,delIdx,'参数值');
// //先从我关注的人中员列表中移除
// //this.$nextTick(()=>{
this.follow.list.splice(delIdx,1);
// this.follow.list.splice(delIdx,1);
// //})
// // this.follow.list.forEach(one=>{

8
src/components/Portal/noteComment.vue
View File

@@ -23,7 +23,7 @@
<div class="comment-content" @click="cancelReply()">
<span class="play-time" v-if="com.playTime>0"><img :src="`${webBaseUrl}/images/coteplay.png`" alt=""> {{ getHMS(com.playTime) }}</span>
<span class="portal-summary-text" style="color: #666666;" v-html="displayAll(com)"></span>
<span v-if="com.content.length>170" @click="changeIsAll(com)">
<span v-if="com.content.length>170 || com.content.split('\n').length>3" @click="changeIsAll(com)">
{{com.isAll?'收起':'全文'}}
</span>
</div>
@@ -59,7 +59,7 @@
<div class="comment-info" >
<div class="comment-content" @click="cancelReply()">
<span class="portal-summary-text" style="color: #666666;" v-html="displayAll(reply)"></span>
<span v-if="reply.content.length>170" @click="changeIsAll(reply)">
<span v-if="reply.content.length>170 || com.content.split('\n').length>3" @click="changeIsAll(reply)">
{{reply.isAll?'收起':'全文'}}
</span>
</div>
@@ -371,7 +371,7 @@
objType:6,
objId:item.id
}
//console.log(item,'item'); 去读取回复
//console.log(item,'item'); 去读取回复
//2022-11-2日与产品（润博）确认，笔记回复只显示一级，不显示二级: "value",
//直接修改后台，查询全部
apiComment.listQuery(query).then(res2=>{
@@ -474,6 +474,8 @@
let content = '';
content = item.content.replace(/(\n){2,}/,'<br>');
item.content = content;
var hlength = item.content.split("\n").length;
if(!item.isAll && hlength > 3 ) {return item.content.slice(0, 5) + "...";}
if(!item.isAll && item.content && item.content.length > 150) {
return item.content.slice(0, 150) + "...";
}