From fd2156549960bd20ef574cf4a76debf23725a116 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Thu, 17 Nov 2022 18:14:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Detail.vue | 8 ++------
 src/views/study/Courses.vue      | 8 ++++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue
index e2bf1578..06f9974f 100644
--- a/src/views/portal/case/Detail.vue
+++ b/src/views/portal/case/Detail.vue
@@ -104,8 +104,7 @@
             <div class="portal-ranking ranking-bg">
               <p class="ranking-title">好评榜</p>
               <ul class="ranking-data">
-                  <li  v-for="(item, index) in Positive" :key="index" class="title-line-ellipsis" style="cursor: pointer;margin-top:30px;line-height: 22px;">
-                         <router-link :to="'case/detail?id='+item.id">
+                  <li  v-for="(item, index) in Positive" :key="index" class="title-line-ellipsis" style="cursor: pointer;margin-top:30px;line-height: 22px;" @click="jumpRouter(item)">
                           <span class="portal-right-text blue-one" v-if="index==0">
                             <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
                           </span>
@@ -122,15 +121,13 @@
                                <img :src="`${webBaseUrl}/images/list05.png`" alt="">
                           </span>
                           <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
-                          </router-link>
                   </li>
               </ul>
             </div>
             <div style="margin-top:26px" class="portal-ranking ranking-bg1">
               <p class="ranking-title">人气榜</p>
               <ul class="ranking-data">
-                <li v-for="(item, index) in Popularity" :key="index" class="title-line-ellipsis" style="cursor: pointer;margin-top:30px;line-height: 22px;">
-                       <router-link :to="'case/detail?id='+item.id">
+                <li v-for="(item, index) in Popularity" :key="index" class="title-line-ellipsis" style="cursor: pointer;margin-top:30px;line-height: 22px;" @click="jumpRouter(item)">
                         <span class="portal-right-text orange-one" v-if="index==0">
                           <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
                         </span>
@@ -147,7 +144,6 @@
                              <img :src="`${webBaseUrl}/images/list05.png`" alt="">
                         </span>
                         <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
-                        </router-link>
                    </li>
               </ul>
             </div>
diff --git a/src/views/study/Courses.vue b/src/views/study/Courses.vue
index 2d1963b1..00d46855 100644
--- a/src/views/study/Courses.vue
+++ b/src/views/study/Courses.vue
@@ -316,11 +316,11 @@ computed: {
         //     this.$router.push({path:'/course/micro',query:{id:item.courseId}})
         // }
         // if(item.courseType==20){
-          if(item.progress>0 && item.progress<100) {
+          // if(item.progress>0 && item.progress<100) {
             this.$router.push({path:'/course/studyindex',query:{id:item.courseId}})
-          } else {
-            this.$router.push({path:'/course/detail',query:{id:item.courseId}})
-          }
+          // } else {
+          //   this.$router.push({path:'/course/detail',query:{id:item.courseId}})
+          // }
         // }
       }
 

From adc74352a948af9fd3a62341a8c9e15fc29798bf Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Thu, 17 Nov 2022 18:35:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Index.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index 81b3f74c..d156e4de 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -78,9 +78,11 @@
                           </div>
                       </div>
                     </div>
+                    </router-link>
                       <div style="height:58px;padding-top:14px ">
-                        <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo" :sex="item.authorInfo.sex"></author>
+                        <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo"  :sex="item.authorInfo.sex" :aid="item.authorInfo.aid"></author>
                       </div>
+                       <router-link :to="'/case/detail?id='+item.id">
                       <div class="keyword-text clearfix">
                         <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain">{{ orgDomainTranslate(item.orgDomain) }}</div>
                         <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain == '' && item.orgDomainParent">{{ orgDomainTranslate(item.orgDomainParent) }}</div>
@@ -91,7 +93,7 @@
                         <div v-if="item.keyword4">{{ item.keyword4 }}</div>
                         <div v-if="item.keyword5">{{ item.keyword5 }}</div>
                       </div>
-                   </router-link>
+                    </router-link>
                       <div class="case-info-summary two-line-ellipsis" @click="jumcasedet(item)">
                         {{ item.summary }}
                         <!-- <router-link :to="'/case/detail?id='+item.id"> -->
@@ -112,11 +114,11 @@
               <div class="pagination-div">
                 <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
                 <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
-                <span class="notcoures" v-else-if="moreState == 3 && !isSeach && caseList.count>0">
-                   <img :src="`${webBaseUrl}/images/nocase.png`" alt="">
+                  <span class="notcoures" v-else-if="caseList.list.length == 0">
+                      <img :src="`${webBaseUrl}/images/nocase.png`" alt="">
                   <h5>暂无案例，请优先学习其它案例吧～</h5>
                   </span>
-                <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span>
+                <!-- <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span> -->
               </div>
               <div v-if="isSeach" style="height:382px">
               </div>

From 176ba23b2618b306927bddb10b7e4dacb5d27c95 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Thu, 17 Nov 2022 18:48:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/portal-index.scss   | 4 ++--
 src/components/Portal/interactBar.vue | 2 +-
 src/views/Index.vue                   | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/assets/styles/portal-index.scss b/src/assets/styles/portal-index.scss
index 0c15192c..9249734d 100644
--- a/src/assets/styles/portal-index.scss
+++ b/src/assets/styles/portal-index.scss
@@ -451,7 +451,7 @@
     width: 260px;
   }
   .case-inter-orgin{
-    width: 56%;
+    // width: 56%;
   }
   .btn-user{
     width: 70px;
@@ -714,7 +714,7 @@
 }
 @media screen and (max-width: 1680px) and (min-width:1367px){
   .case-inter-orgin{
-    width: 47%;
+    // width: 47%;
   }
   .portal-index-title{
     font-size: 16px;
diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue
index e0db020e..0ffa22c6 100644
--- a/src/components/Portal/interactBar.vue
+++ b/src/components/Portal/interactBar.vue
@@ -50,7 +50,7 @@
       </div>
       <div v-if="views" style="cursor: default;" :style="`min-width: ${nodeWidth};margin-left:${data.views>1000? '40px':'20px'}`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="浏览量" placement="top" :visible-arrow="false" popper-class="text-tooltip">
-          <svg-icon style="margin-right: 0;font-size:22px;" icon-class="eyes"></svg-icon>
+          <svg-icon style="margin-right: 0; font-size:22px;" icon-class="eyes"></svg-icon>
         </el-tooltip>
         <span class="interact-bar-value"> {{ formatNum(data.views)}}</span>
       </div>
diff --git a/src/views/Index.vue b/src/views/Index.vue
index c927e315..09af0469 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -1167,7 +1167,7 @@
 
 .case-inter-orgin{
   // width: 45%;
-  float: left;
+  // float: left;
   margin-left: 5px;
   line-height: 30px;
   font-size: 14px;
@@ -1583,7 +1583,7 @@
          width: 100%;
         .case-inter-box{
           display: flex;
-        margin-right: 35px;
+          margin-right: 46px;
 
       .case-inter-left{
           flex: 1;
@@ -1591,6 +1591,9 @@
         }
         .interact-bar-index{
           margin-left: auto;
+          ::v-deep .svg-icon{
+             padding-top: 6px;
+          }
         }
         }