From cbd6bde4847f81db60f0d851783eaa03d28b2cec Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Wed, 19 Oct 2022 17:11:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PortalHeader.vue        | 11 ++++++-----
 src/layout/components/TopNav/Index.vue |  2 +-
 src/views/Index.vue                    |  4 ++--
 src/views/homepage/page.vue            | 10 +++++-----
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index 1cea9e4b..7eff1908 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -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">我的关注
diff --git a/src/layout/components/TopNav/Index.vue b/src/layout/components/TopNav/Index.vue
index c905fc45..38acdcea 100644
--- a/src/layout/components/TopNav/Index.vue
+++ b/src/layout/components/TopNav/Index.vue
@@ -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>
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 0a1b2566..77a87b5d 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -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>
diff --git a/src/views/homepage/page.vue b/src/views/homepage/page.vue
index 72197f20..4832884c 100644
--- a/src/views/homepage/page.vue
+++ b/src/views/homepage/page.vue
@@ -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>

From 4832d9288a06a916402a9cc633eb393e14f96879 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Wed, 19 Oct 2022 17:23:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Portal/authorImg.vue | 9 ++++++++-
 src/views/Index.vue                 | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/Portal/authorImg.vue b/src/components/Portal/authorImg.vue
index 2264c5b2..e0b76834 100644
--- a/src/components/Portal/authorImg.vue
+++ b/src/components/Portal/authorImg.vue
@@ -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:{
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 77a87b5d..05ab05f2 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -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=""> -->