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-10-28 17:31:40 +08:00
parent ceaa19ab1b 835c22e9e8
commit 33aa649164
16 changed files with 73 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/styles/portal-index.scss
View File

@@ -116,7 +116,7 @@
.study-num {
font-size: 14px;
color: #6E7B84;
margin-left: 12px;
// margin-left: 12px;
-moz-user-select: none; /*火狐*/
-webkit-user-select: none; /*webkit浏览器*/
-ms-user-select: none; /*IE10*/

5
src/assets/styles/portal.scss
View File

@@ -251,13 +251,16 @@ body {margin: 0px;padding: 0px;}
color: #6E7B84;
flex: 1;
.course-info-studys {
margin-left: 12px;
// margin-left: 12px;
-moz-user-select: none; /*火狐*/
-webkit-user-select: none; /*webkit浏览器*/
-ms-user-select: none; /*IE10*/
-khtml-user-select: none; /*早期浏览器*/
user-select: none;
}
.course-info-author{
margin-right: 12px;
}
}
.course-info-score{
display:flex;

3
src/components/HomePage/answerList.vue
View File

@@ -30,7 +30,8 @@
</ul>
<div v-else class="home-no-list">
<img class="img" :src="`${webBaseUrl}/images/homeWu/no-answer.png`" alt="" srcset="">
<p class="text">还没有回答</p>
<p v-if="isFollow" class="text">暂时没有动态</p>
<p v-else class="text">还没有回答</p>
</div>
</div>
</template>

3
src/components/HomePage/articleList.vue
View File

@@ -33,7 +33,8 @@
</ul>
<div v-else class="home-no-list">
<img class="img" style="width:150px;height:160px" :src="`${webBaseUrl}/images/homeWu/no-article.png`" alt="" srcset="">
<p class="text">还没有文章</p>
<p v-if="isFollow" class="text">暂时没有动态</p>
<p v-else class="text">还没有文章</p>
</div>
</div>
</template>

3
src/components/HomePage/caseList.vue
View File

@@ -57,7 +57,8 @@
</div>
<div v-else class="home-no-list">
<img class="img" :src="`${webBaseUrl}/images/homeWu/no-case.png`" alt="" srcset="">
<p class="text">还没有案例</p>
<p v-if="isFollow" class="text">暂时没有动态</p>
<p v-else class="text">还没有案例</p>
</div>
</div>
</template>

3
src/components/HomePage/courseList.vue
View File

@@ -35,7 +35,8 @@
</ul>
<div v-else class="home-no-list">
<img class="img" :src="`${webBaseUrl}/images/homeWu/no-course.png`" alt="" srcset="">
<p class="text">还没有课程</p>
<p v-if="isFollow" class="text">暂时没有动态</p>
<p v-else class="text">还没有课程</p>
</div>
</div>
</template>

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

@@ -68,10 +68,15 @@
</p>
<p class="portal-summary-text">{{maPage.userFollow.authorInfo.sign}}</p>
</div>
<div>
<div v-if="pageId == userInfo.aid">
<el-button class="btn" icon="el-icon-check" v-if="maPage.has">已关注</el-button>
<el-button type="primary" class="btn" v-else icon="el-icon-plus" @click="toFollow(maPage)">关注他</el-button>
</div>
<div v-else>
<el-button plain class="btn" icon="el-icon-check" v-if="maPage.has" @click="cancel(maPage,2)">取消关注</el-button>
<el-button type="primary" class="btn" v-else icon="el-icon-plus" @click="toFollow(maPage)">关注他</el-button>
</div>
</div>
<!--分页没有加-->
<div style="text-align: center; margin-top:57px;" v-show="page.count > 0">
@@ -166,10 +171,22 @@ import apiUser from "@/api/system/user.js";
this.tagTab(this.active);
},
cancel(item,idx) {
console.log(item,'item');
let $this=this;
apiFollow.remove(item.followId).then(res=>{
let id = '';
if(idx == 2) {
id = item.userFollow.aid;
} else {
id = item.userFollow.followId;
}
apiFollow.remove(id).then(res=>{
if(res.status == 200) {
this.getPage();
if(idx == 2) {
this.getMyPage()
} else {
this.getPage();
}
// $this.follow.list.splice(idx,1);
}
})

3
src/components/HomePage/noteList.vue
View File

@@ -26,7 +26,8 @@
</ul>
<div v-else class="home-no-list">
<img class="img" :src="`${webBaseUrl}/images/homeWu/no-note.png`" alt="" srcset="">
<p class="text">还没有笔记</p>
<p v-if="isFollow" class="text">暂时没有动态</p>
<p v-else class="text">还没有笔记</p>
</div>
</div>
</template>

3
src/components/HomePage/putTo.vue
View File

@@ -25,7 +25,8 @@
</ul>
<div v-else class="home-no-list">
<img class="img" style="width:204px;height:160px" :src="`${webBaseUrl}/images/homeWu/no-put.png`" alt="" srcset="">
<p class="text">还没有提问</p>
<p v-if="isFollow" class="text">暂时没有动态</p>
<p v-else class="text">还没有提问</p>
</div>
</div>
</template>

11
src/views/Index.vue
View File

@@ -136,6 +136,7 @@
<div class="course-author">
<div class="course-author-left">
{{ course.authorInfo.name }}
<span class="study-num" >{{formatNum(course.studys)}}人学习</span>
</div>
<div style="display: flex;">
@@ -222,9 +223,9 @@
<div class="case-inter-left">
<authorInfo :avatar="ca.authorInfo.avatar" :info="ca.authorInfo.orgInfo" :name="ca.authorInfo.name" :sex="ca.authorInfo.sex" :aid="userInfo.aid"></authorInfo>
</div>
<div class="interact-bar-index"
<div v-if="caseList.orderType==2" class="interact-bar-index"
style="font-size: 12px;color: #6E7B84;display: flex;line-height: 30px;">
<interactBar :type="3" :readonly="true" :comments="false" :praises="false" :favorites="false" :data="ca" :shares="false" :views="true"></interactBar>人观看
<interactBar :type="3" :readonly="true" :comments="false" :praises="false" :favorites="false" :data="ca" :shares="false" :views="true"></interactBar>人观看
</div>
</div>
@@ -1118,8 +1119,8 @@
background: #387DF7;
border-radius: 4px;
line-height: 47px;
padding-left: 20px ;
padding-right: 40px;
padding-left: 15px ;
padding-right: 32px;
box-sizing: border-box;
display: flex;
// margin-top: 20px;
@@ -1689,7 +1690,7 @@
.study-num {
font-size: 14px;
color: #6E7B84;
margin-left: 12px;
// margin-left: 12px;
-moz-user-select: none;
/*火狐*/
-webkit-user-select: none;

1
src/views/homepage/page.vue
View File

@@ -487,6 +487,7 @@
this.$refs.followList.getPage();
return
}
this.page.count = 0
if(this.activeName == '8') {
this.page.count = 0;
// console.log(this.$refs.followList,'this.$refs.followList');

5
src/views/portal/article/Detail.vue
View File

@@ -49,11 +49,12 @@
</div>
<div class="xcontent2-minor">
<div>
<div id="articleAnking">
<div class="portal-model-btn pointer" @click="openDialog">
<div class="portal-model-btn pointer" @click="openDialog">
<svg-icon style="margin-right: 10px;font-size: 24px;" icon-class="addArticle"></svg-icon>
写文章
</div>
<div id="articleAnking">
<div class="portal-ranking ranking-bg">
<p class="ranking-title">贡献榜</p>
<ul class="ranking-data">

7
src/views/portal/article/Index.vue
View File

@@ -68,12 +68,13 @@
</div>
<div class="xcontent2-minor">
<div>
<div id="articleAnking">
<div>
<div class="portal-model-btn pointer" @click="openDialog">
<div class="portal-model-btn pointer" @click="openDialog">
<svg-icon style="margin-right: 10px;font-size: 24px;" icon-class="addArticle"></svg-icon>
写文章
</div>
<div id="articleAnking">
<div>
</div>
<div class="portal-ranking ranking-bg">
<p class="ranking-title">贡献榜</p>

13
src/views/portal/follow/index.vue
View File

@@ -52,7 +52,7 @@
</el-tab-pane>
-->
</el-tabs>
<div style="text-align: center; margin-top:57px;" v-show="page.count > 0 && activeName!='7'">
<div style="text-align: center; margin-top:57px;" v-show="page.count > 0">
<el-pagination
background
@size-change="handleSizeChange"
@@ -457,16 +457,7 @@
})
},
handleClick() {
if(this.activeName == '7') {
//单独的分页，所以这里不与当前页面的分页共用
this.$refs.followList.resetActive();
this.$refs.followList.getPage();
return
}
if(this.activeName == '8') {
this.page.count = 0;
return
}
this.page.count = 0;
this.getList();
}
}

6
src/views/portal/qa/Answer.vue
View File

@@ -223,12 +223,12 @@
</div>
</div>
<div class="xcontent2-minor">
<div class="qa-ranking">
<div class="portal-model-btn pointer" @click="$refs.addQuestion.askQuestionDialog = true">
<div class="portal-model-btn pointer" @click="$refs.addQuestion.askQuestionDialog = true">
<svg-icon style="margin-right: 0;font-size: 24px;" icon-class="question-mark"></svg-icon>
提问题
</div>
<div class="qa-ranking">
<div class="portal-ranking ranking-bg">
<p class="ranking-title">贡献榜</p>
<ul class="ranking-data">

20
src/views/portal/qa/Index.vue
View File

@@ -45,7 +45,9 @@
</div>
</div>
<div style="display: flex;justify-content:space-between;">
<div class="qa-info-summary portal-summary-text two-line-ellipsis" @click="jumpDetail(qa)" v-html="$keywordActiveShow(qa.content,queryKeyWord)"></div>
<div class="qa-info-summary portal-summary-text" :class="qa.images==''? 'two-line-ellipsis':'four-line-ellipsis'" @click="jumpDetail(qa)" v-html="$keywordActiveShow(qa.content,queryKeyWord)">
</div>
<div style="cursor: pointer; text-align: right;cursor: pointer;" v-if="qa.images!==''" @click="jumpDetail(qa)">
<img style="width: 156px;height: 105px;border-radius: 4px;margin-left: 18px;" :src="fileBaseUrl + qa.images" alt="">
</div>
@@ -75,11 +77,12 @@
</div>
<div class="xcontent2-minor">
<!-- <div> -->
<div style="padding:0" id="qa-fixd">
<div class="portal-model-btn pointer" @click="$refs.addQuestion.askQuestionDialog = true">
<div class="portal-model-btn pointer" @click="$refs.addQuestion.askQuestionDialog = true">
<svg-icon style="margin-right: 0;font-size: 24px;" icon-class="question-mark"></svg-icon>
提问题
</div>
<div style="padding:0" id="qa-fixd">
<div class="portal-ranking ranking-bg">
<p class="ranking-title">贡献榜</p>
<ul class="ranking-data">
@@ -447,6 +450,17 @@ export default {
</script>
<style scoped lang="scss">
.four-line-ellipsis{
display: -webkit-box;
// white-space:pre-wrap;
overflow: hidden;
line-height: 25px;
text-overflow:ellipsis;
-webkit-box-orient: vertical;
-webkit-line-clamp: 4;
box-sizing: border-box;
}
::v-deep.el-input__inner {
background-color: #fff !important;
}