From fac7d516a2756aa58bfa690a09c4c08f9cf03da6 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Fri, 14 Oct 2022 13:01:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PortalHeader.vue |  2 +-
 src/icons/svg/message.svg       |  2 +-
 src/router/index.js             |  2 +-
 src/views/homepage/page.vue     | 50 +++++++++++++++++++--------------
 4 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index d55997c1..0bf26334 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -74,7 +74,7 @@
               <el-badge class="person-action-index"  :value="userMsg" :hidden="userMsg == 0">
                 <el-tooltip   content="消息" placement="bottom" effect="light" :visible-arrow="false" popper-class="text-tooltip">
                    <el-link  type="primary" :href="`${webBaseUrl}/message/center/index`" :underline="false">
-                    <svg-icon :style="{color:textColor}" style="margin-right: 0;font-size:26px;" icon-class="message"></svg-icon>
+                    <svg-icon :style="{color:textColor}" style="margin-right: 0;font-size:26px;" icon-class="messfff"></svg-icon>
                    </el-link>
                 </el-tooltip>
               </el-badge>
diff --git a/src/icons/svg/message.svg b/src/icons/svg/message.svg
index b76a681f..1f659248 100644
--- a/src/icons/svg/message.svg
+++ b/src/icons/svg/message.svg
@@ -1 +1 @@
-<svg viewBox="0 0 26 26" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><image xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAACdUlEQVRIib2WMWvbQBiGTyedFcVxaJxg09IpEKhDhtKpYyFDpmoztL+gWdup/6X9AQUPBQ+BDBn6JwwaUjqEBDu2XFvY1ukkXXldu9iqpBPB7QdC0t37fY/udLpXGlHE8XGzVKuJ7d3d2BTCYLquU2REURQzForxmPJej007nVaQVykT1Gw2S67L90zT2FI9DILz0K9WzWGrlQ5MBZ2dNau6HlWKAJIRRbp3edlyk+164p7atl0jRCs/BDIvQKXZaBxtOY4zI4TIVBAgYVhsqvIijqnRaByZjuNM/gJhuoqMZDr19oQILMZMXwU7PDzRr687s/lIyeLFF3knnM/Knud+w4FrlR41UfsPCKtLlTQauY9Ho8EHQsgujvF48B5tqrxlbR3fycGBlgty3e4rzqdfCJEvl21SyhdCBG+CgHcsa+dHVq5hUIOxkxnFx5gHGQ7vnwnhf9I0spPsQxv6oMmrAQbFF58nCkP/HSGE5UjYQpMZYFBsK3kiKeXzvP4iGjDocu/KLkIsNShfA0YuZJNBsQv/awgYFFu9Qqe0EpUGDAo/yRL0ejcfCZF1NUfWf2vTAwwK00rr7ffvXksZnashC5SMzpGT/sBsOh/y6aldTxoc51yP42ht6QfB7EkYiqe4Ngx2UypZt6v9lOrCNM1ovU7oX121uwZu4IyTSbS2by0SEkmTfSH4Z9iMpmlvLWv7u2qkqE1WX2JRV/W8n/s4VyqPBirtqtuurRbbtuubMD4y30xDv91ud5f3aw4L+4UzwrQ2ALnPtHJ0wH7hjPD+h0AwXRcXX/urEETqFoR5LZf1O6yYogBokZP2B4T4Pz+QhJBfuUFLfPju9UgAAAAASUVORK5CYII=" height="26" width="26" data-name="图层 1"/></svg>
\ No newline at end of file
+<svg t="1665723331570" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="850" width="200" height="200"><path d="M512 515.657143m-475.428571 0a475.428571 475.428571 0 1 0 950.857142 0 475.428571 475.428571 0 1 0-950.857142 0Z" fill="#4B4C51" opacity=".55" p-id="851"></path><path d="M720.457143 640c3.657143 0 10.971429 0 14.628571 3.657143-18.285714-10.971429-29.257143-29.257143-29.257143-51.2v-120.685714c0-91.428571-65.828571-164.571429-149.942857-182.857143v-7.314286c0-21.942857-18.285714-40.228571-40.228571-40.228571S475.428571 259.657143 475.428571 281.6v3.657143c-87.771429 18.285714-149.942857 91.428571-149.942857 182.857143v120.685714c0 21.942857-10.971429 40.228571-29.257143 51.2 3.657143-3.657143 10.971429-3.657143 14.628572-3.657143-14.628571 0-29.257143 10.971429-29.257143 29.257143s7.314286 29.257143 25.6 29.257143h413.257143c14.628571 0 29.257143-10.971429 29.257143-29.257143-3.657143-10.971429-14.628571-25.6-29.257143-25.6zM512 793.6c36.571429 0 69.485714-29.257143 69.485714-69.485714h-138.971428c0 36.571429 32.914286 69.485714 69.485714 69.485714z" fill="#333333" p-id="852"></path></svg>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 48f678c2..442caea7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -76,7 +76,7 @@ export const constantRoutes = [{
     meta: { title: '课程预览', icon: 'dashboard', noCache: true, affix: false },
 },
 //
-// 外来链接 
+// 外来链接
 {
     path: '/course/boeframe',
     hidden: true,
diff --git a/src/views/homepage/page.vue b/src/views/homepage/page.vue
index 127e8d37..975ed233 100644
--- a/src/views/homepage/page.vue
+++ b/src/views/homepage/page.vue
@@ -16,7 +16,7 @@
                     <answer-list v-if="item.contentType == 5" :list="[item]" :isDynamic="true" :personal="personal"></answer-list>
                     <article-list v-if="item.contentType == 2" :list="[item]" :isDynamic="true" :personal="personal"></article-list>
                 </template>
-                
+
             </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>
@@ -66,7 +66,7 @@
         <div style="height:200px"></div>
     </div>
   </template>
-  
+
   <script>
     import top from '../../layout/components/TopNav/Index.vue'
     import UcHeader from '@/components/HomePage/homePage.vue'
@@ -118,16 +118,27 @@
                 Profess:[]
             }
         },
+        // watch:{
+        //   '$route' (to, from) { //监听路由是否变化
+        //   		  if(to.query.id != from.query.id && from.path == "/home/index"){
+        //   			  this.id = to.query.id;
+        //   			  this.init();//重新加载数据
+        //   		  }
+        //    }
+        // },
         mounted() {
-            this.pageId = this.$route.query.id;
-            this.getList();
-            if(this.pageId == this.userInfo.aid) {
-              this.personal = true;
-            }
-            this.loadMajorType();
-            this.loadOrgDomain();
-          },
+            this.init();
+        },
         methods:{
+            init(){
+              this.pageId = this.$route.query.id;
+              this.getList();
+              if(this.pageId == this.userInfo.aid) {
+                this.personal = true;
+              }
+              this.loadMajorType();
+              this.loadOrgDomain();
+            },
             dynamicHide(id){
                 apiStat.dynamicHide(id).then(res=>{
                     if(res.status == 200){
@@ -316,13 +327,13 @@
                 apiNote.ids(ids).then(res=>{
                   if(res.status == 200) {
                     list.forEach((item, index) => {
-                        
+
                         let score = item.contentInfo.substr(item.contentInfo.length -1,1);
                             console.log(Number(score),'Number(score)');
                             if(Number(score) > 0) {
                                item.score = score;
                             }
-                            
+
                             res.result.some(con => {
                             if (con.id == item.contentId) {
                                 item.info = con;
@@ -350,7 +361,7 @@
                             }
                             });
                         });
-                        this.getCaseUserData(list);  
+                        this.getCaseUserData(list);
                    }
                 })
             },
@@ -397,7 +408,7 @@
                                 }
                                 });
                             });
-                        this.getArticleUserData(list);  
+                        this.getArticleUserData(list);
                    }
                 })
             },
@@ -440,7 +451,7 @@
                                 }
                                 });
                             });
-                        // this.getArticleUserData(list);  
+                        // this.getArticleUserData(list);
                    }
                 })
             },
@@ -458,12 +469,10 @@
                 }
                 this.getList();
             }
-        },
-        watch:{
-        },
+        }
       }
   </script>
-  
+
   <style lang="scss" scoped>
      .home-page{
        ::v-deep .el-tabs__active-bar{
@@ -547,7 +556,7 @@
                         color: #666666;
                        }
                     }
-                    
+
                 }
                 .ach-title{
                     font-size: 18px;
@@ -597,4 +606,3 @@
         }
      }
   </style>
-  
\ No newline at end of file