mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-11 03:46:44 +08:00
Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat
This commit is contained in:
@@ -34,6 +34,10 @@
|
||||
type:String,
|
||||
default:''
|
||||
},
|
||||
noJump:{
|
||||
type:Number,
|
||||
default: true
|
||||
}
|
||||
},
|
||||
data(){
|
||||
return {
|
||||
@@ -60,7 +64,10 @@
|
||||
methods:{
|
||||
toHome() {
|
||||
// ,query:{id:item.objId || item.id}
|
||||
this.$router.push({path:this.$xpage.getHomePath(this.aid)})
|
||||
if(this.noJump) {
|
||||
this.$router.push({path:this.$xpage.getHomePath(this.aid)})
|
||||
}
|
||||
|
||||
}
|
||||
},
|
||||
watch:{
|
||||
|
||||
@@ -17,6 +17,11 @@
|
||||
<div :class="current == 'course' ? 'nav-bottbor' : ''"></div>
|
||||
</router-link>
|
||||
</div>
|
||||
<div class="top-nav" :style="{color:textColor}" :class="current == 'case' ? activeNav : ''">
|
||||
<router-link to="/case">案例
|
||||
<div :class="current == 'case' ? 'nav-bottbor' : ''"></div>
|
||||
</router-link>
|
||||
</div>
|
||||
<div class="top-nav" :style="{color:textColor}" :class="current == 'article' ? activeNav : ''">
|
||||
<router-link to="/article">文章
|
||||
<div :class="current == 'article' ? 'nav-bottbor' : ''"></div>
|
||||
@@ -39,11 +44,7 @@
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</div>
|
||||
<div class="top-nav" :style="{color:textColor}" :class="current == 'case' ? activeNav : ''">
|
||||
<router-link to="/case">推荐案例
|
||||
<div :class="current == 'case' ? 'nav-bottbor' : ''"></div>
|
||||
</router-link>
|
||||
</div>
|
||||
|
||||
<!--
|
||||
<div class="top-nav" :style="{color:textColor}" :class="current == 'follow' ? activeNav : ''">
|
||||
<router-link to="/follow">我的关注
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
<div class="xtop-nav">
|
||||
<div class="xtop-nav-item"><a :href="`${webBaseUrl}/index`">首页</a></div>
|
||||
<div class="xtop-nav-item"><a :href="`${webBaseUrl}/course`">课程</a></div>
|
||||
<div class="xtop-nav-item"><a :href="`${webBaseUrl}/case`">案例</a></div>
|
||||
<div class="xtop-nav-item"><a :href="`${webBaseUrl}/article`">文章</a></div>
|
||||
<div class="xtop-nav-item"><a :href="`${webBaseUrl}/qa`">问答</a></div>
|
||||
<div class="xtop-nav-item">
|
||||
@@ -23,7 +24,6 @@
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</div>
|
||||
<div class="xtop-nav-item"><a :href="`${webBaseUrl}/case`">推荐案例</a></div>
|
||||
<!-- <div class="xtop-nav-item"><a :href="`${webBaseUrl}/follow`">我的关注</a></div> -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
</div>
|
||||
<div class="personal-panel">
|
||||
<div class="personal-img">
|
||||
<author-img v-if="userInfo.avatar" :avatar="userInfo.avatar" :aid="userInfo.aid" :sex="userInfo.sex"></author-img>
|
||||
<author-img v-if="userInfo.avatar" :avatar="userInfo.avatar" :aid="userInfo.aid" :noJump="false" :sex="userInfo.sex"></author-img>
|
||||
<!-- {{ userInfo.avatar }} -->
|
||||
</div>
|
||||
<!-- <img style="width:68px;height:68px" src="/images/Avatarman.png" alt=""> -->
|
||||
@@ -34,7 +34,7 @@
|
||||
</a>
|
||||
<ul class="personal-ul">
|
||||
<li>
|
||||
<span class="label">累计学习</span>
|
||||
<span class="label"><router-link to="/user/ranking">累计学习</router-link></span>
|
||||
<p><span>{{userData.totalStudyHour}}</span>h</p>
|
||||
</li>
|
||||
<!-- <li>
|
||||
@@ -42,7 +42,7 @@
|
||||
<p><span>{{userData.level}}</span></p>
|
||||
</li> -->
|
||||
<li>
|
||||
<span class="label">我的U币</span>
|
||||
<span class="label"><router-link to="/user/ucurrency">我的U币</router-link></span>
|
||||
<p><span>{{userData.uvalue}}</span>个</p>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@@ -20,15 +20,15 @@
|
||||
</el-tab-pane>
|
||||
<el-tab-pane name="1">
|
||||
<span slot="label"><svg-icon icon-class="home-course" style="font-size: 30px;"></svg-icon><span class="tabs-info">课程</span></span>
|
||||
<course-list :list="cousrePageList" :isDynamic="false" :personal="personal"></course-list>
|
||||
<course-list :list="cousrePageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></course-list>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane name="3">
|
||||
<span slot="label"><svg-icon icon-class="home-case" style="font-size: 30px;"></svg-icon><span class="tabs-info">案例</span></span>
|
||||
<case-list :list="casePageList" :isDynamic="false" :personal="personal"></case-list>
|
||||
<case-list :list="casePageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></case-list>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane name="6">
|
||||
<span slot="label"><svg-icon icon-class="home-note" style="font-size: 30px;"></svg-icon><span class="tabs-info">笔记</span></span>
|
||||
<note-list :list="notePageList" :isDynamic="false" :personal="personal"></note-list>
|
||||
<note-list :list="notePageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></note-list>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane name="4">
|
||||
<span slot="label"><svg-icon icon-class="home-qa" style="font-size: 30px;"></svg-icon><span class="tabs-info">提问</span></span>
|
||||
@@ -36,11 +36,11 @@
|
||||
</el-tab-pane>
|
||||
<el-tab-pane name="5">
|
||||
<span slot="label"><svg-icon icon-class="home-answer" style="font-size: 30px;"></svg-icon><span class="tabs-info">回答</span></span>
|
||||
<answer-list :list="answerPageList" :isDynamic="false" :personal="personal"></answer-list>
|
||||
<answer-list :list="answerPageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></answer-list>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane name="2">
|
||||
<span slot="label"><svg-icon icon-class="home-article" style="font-size: 30px;"></svg-icon><span class="tabs-info">文章</span></span>
|
||||
<article-list :list="articlePageList" :isDynamic="false" :personal="personal"></article-list>
|
||||
<article-list :list="articlePageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></article-list>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane name="7">
|
||||
<span slot="label"><svg-icon icon-class="home-follow" style="font-size: 30px;"></svg-icon><span class="tabs-info">关注</span></span>
|
||||
|
||||
Reference in New Issue
Block a user