From d319454cb402d28ebf681b60040e77b56a976870 Mon Sep 17 00:00:00 2001
From: Wangwei <870653736@qq.com>
Date: Tue, 27 Jun 2023 10:49:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E9=93=BE=E6=8E=A5=E3=80=81?=
 =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84=E5=86=85=E5=AE=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                    |   8 +-
 src/components/Footer.vue            |  35 ++++-
 src/components/Header.vue            | 195 ++++++++++++++++-----------
 src/main.js                          |  26 ++--
 src/views/studypath/fineDataLink.vue |  63 +++++++--
 5 files changed, 216 insertions(+), 111 deletions(-)

diff --git a/public/index.html b/public/index.html
index 9e092a8..63072ea 100644
--- a/public/index.html
+++ b/public/index.html
@@ -265,7 +265,7 @@
       </li>
     </ul>
 
-    <!-- <script>
+    <script>
       var _hmt = _hmt || [];
       (function() {
         var hm = document.createElement("script");
@@ -273,9 +273,9 @@
         var s = document.getElementsByTagName("script")[0];
         s.parentNode.insertBefore(hm, s);
       })();
-    </script> -->
+    </script>
 
-    <script>
+    <!-- <script>
       var _hmt = _hmt || [];
       (function(c, l, a, r, i, t, y) {
         c[a] =
@@ -289,6 +289,6 @@
         y = l.getElementsByTagName(r)[0];
         y.parentNode.insertBefore(t, y);
       })(window, document, "clarity", "script", "h6euw7u8lp");
-    </script>
+    </script> -->
   </body>
 </html>
diff --git a/src/components/Footer.vue b/src/components/Footer.vue
index 64e2791..4c831c1 100644
--- a/src/components/Footer.vue
+++ b/src/components/Footer.vue
@@ -52,7 +52,7 @@
     <el-popover placement="left" trigger="hover" width="392px" popper-class="new-popper">
       <div class="tel_txt_box dr-feedback-popover-wrapper">
         <div class="dr-feedback-popover">
-          <div class="dr-feedback-popover-item-click dr-feedback-popover-item">
+          <div class="dr-feedback-popover-item-click dr-feedback-popover-item" onclick="window.open('https://service.fanruan.com/support')">
             <div class="dr-feedback-popover-item-logo">
               <img src="https://fanruanbbs.obs.cn-east-2.myhuaweicloud.com/ui/digit-fe/feedback/support.png" />
             </div>
@@ -63,7 +63,7 @@
                 </div>
                 <div class="ant-space-item">
                   <span role="img" aria-label="arrow-right" class="anticon anticon-arrow-right icon">
-                    <svg viewBox="64 64 896 896" focusable="false" data-icon="arrow-right" width="1em" height="1em" fill="currentColor" aria-hidden="true">
+                    <svg viewBox="64 64 896 896" focusable="false" data-icon="arrow-right" width="12" height="12" fill="currentColor" aria-hidden="true">
                       <path d="M869 487.8L491.2 159.9c-2.9-2.5-6.6-3.9-10.5-3.9h-88.5c-7.4 0-10.8 9.2-5.2 14l350.2 304H152c-4.4 0-8 3.6-8 8v60c0 4.4 3.6 8 8 8h585.1L386.9 854c-5.6 4.9-2.2 14 5.2 14h91.5c1.9 0 3.8-.7 5.2-2L869 536.2a32.07 32.07 0 000-48.4z"></path>
                     </svg>
                   </span>
@@ -101,10 +101,10 @@
                 <img alt="feedback" src="https://hwobs.fanruan.com/ui/digit-fe/feedback/feedback.png" />
               </div>
               <div>
-                <div class="dr-feedback-popover-item-title-wrapper">
+                <div class="dr-feedback-popover-item-title-wrapper" style="gap: 8px;">
                   <span class="title">页面反馈</span>
-                  <span role="img" aria-label="arrow-right" class="anticon anticon-arrow-right icon">
-                    <svg viewBox="64 64 896 896" focusable="false" data-icon="arrow-right" width="1em" height="1em" fill="currentColor" aria-hidden="true">
+                  <span class="anticon anticon-arrow-right icon">
+                    <svg viewBox="64 64 896 896" focusable="false" data-icon="arrow-right" width="12" height="12" fill="currentColor" aria-hidden="true">
                       <path d="M869 487.8L491.2 159.9c-2.9-2.5-6.6-3.9-10.5-3.9h-88.5c-7.4 0-10.8 9.2-5.2 14l350.2 304H152c-4.4 0-8 3.6-8 8v60c0 4.4 3.6 8 8 8h585.1L386.9 854c-5.6 4.9-2.2 14 5.2 14h91.5c1.9 0 3.8-.7 5.2-2L869 536.2a32.07 32.07 0 000-48.4z"></path>
                     </svg>
                   </span>
@@ -239,7 +239,7 @@ export default {
         state.showFeedback = true;
         setTimeout(function() {
           const iframe = document.createElement("iframe");
-          iframe.src = `https://pe9qbh7c.shuzhiniao.com/web/#/ticket/a2555f84970f418a98960adb4029aed1/form?embedded=true&hiddenFields=${encodeURIComponent("页面URL,反馈人UID,处理人回复")}&ticketToken=${state.ticketToken}`;
+          iframe.src = `https://pe9qbh7c.shuzhiniao.com/web/#/ticket/a2555f84970f418a98960adb4029aed1/form?embedded=true&hiddenFields=${encodeURIComponent("类型,页面URL,反馈人UID,处理人回复")}&ticketToken=${state.ticketToken}`;
           iframe.style = "width: 100%; height: 100%; border:none;";
           iframe.id = "iframe_shuzhiniao";
           let makediv = document.getElementById("feedbackIframe");
@@ -294,6 +294,7 @@ export default {
   top: 50%;
   transform: translateY(-50%);
   right: 10px;
+  z-index: 5;
 }
 
 .dr-feedback {
@@ -370,7 +371,26 @@ export default {
 .dr-feedback-popover-item-title-wrapper {
   display: inline-flex;
   align-items: center;
+  .anticon-arrow-right {
+    color: #1f1f1f;
+  }
+  .title {
+    color: #1f1f1f;
+  }
 }
+
+.dr-feedback-popover-item-click {
+  cursor: pointer;
+  &:hover .dr-feedback-popover-item-title-wrapper {
+    .anticon-arrow-right {
+      color: #0082fc;
+    }
+    .title {
+      color: #0082fc;
+    }
+  }
+}
+
 .dr-feedback-popover-wrapper .dr-feedback-popover-item-title-wrapper .title {
   font-family: PingFangSC, PingFangSC-Semibold;
   font-size: 14px;
@@ -407,6 +427,9 @@ export default {
   .el-dialog__body {
     padding: 0 !important;
   }
+  .el-dialog__header {
+    text-align: left !important;
+  }
 }
 
 .footer {
diff --git a/src/components/Header.vue b/src/components/Header.vue
index 3f407a6..6ae8171 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -2,41 +2,57 @@
   <header class="header" id="myheader">
     <div class="wrapper">
       <!-- left -->
+
       <div class="nav-lf flex-1">
-        <div class="nav-logo">
-          <a href="https://home.fanruan.com/"><img src="@/assets/fine_logo_dynamic.gif" class="logo-img"/></a>
+        <div class="navlf_item">
+          <div class="nav-logo">
+            <a href="https://home.fanruan.com/"><img src="@/assets/fine_logo_dynamic.gif" class="logo-img"/></a>
+          </div>
+          <div class="nav-line"></div>
+          <a href="https://home.fanruan.com/" class="nav-title">帆软社区</a>
+        </div>
+
+        <div class="navlf_item navlf-item-box">
+          <a href="https://home.fanruan.com/" class="nav-item">首页</a>
+          <a href="https://service.fanuan.com" class="nav-item">服务平台</a>
+          <a href="https://help.fanruan.com/" class="nav-item">文档</a>
+          <a href="https://edu.fanruan.com/" class="nav-item active">学院</a>
+          <a href="https://bbs.fanruan.com/wenda" class="nav-item">问答</a>
+          <a href="https://bbs.fanruan.com/topic" class="nav-item">论坛</a>
+          <a href="https://cert.fanruan.com/" class="nav-item">认证</a>
+          <a href="https://bbs.fanruan.com/jobs" class="nav-item">招聘</a>
+          <a href="https://bbs.fanruan.com/task" class="nav-item">任务</a>
+          <a href="https://market.fanruan.com/" class="nav-item">市场</a>
         </div>
-        <div class="nav-line"></div>
-        <router-link to="/" class="nav-title">帆软学院</router-link>
       </div>
 
-      <!-- rigt -->
-      <div class="nav-rt">
-        <!-- search -->
-        <div class="search-box  flex-1">
-          <form class="searchform" method="get" autocomplete="off" action="https://search.fanruan.com/?q=" target="_blank" v-if="is_search">
-            <div class="el-input el-input--small el-input--suffix topsearch  flex-1">
-              <input class="el-input__inner" name="q" type="text" autocomplete="off" tabindex="" aria-label="" placeholder="请输入关键词" @focus="isfocus('focus')" @blur="isfocus('blur')" v-on:input="isinput" />
-              <button class="el-input__suffix search_sub" type="submit" :class="{ active_btn: kwbtn }">
-                <span class="el-input__suffix-inner search_btn">
-                  <i class="iconfont icon-icon_icon-53 icon-ss" :class="{ active: kwfocus }"></i>
-                </span>
-              </button>
-            </div>
-          </form>
-
-          <div class="searchform" v-else>
-            <div class="el-input el-input--small el-input--suffix topsearch  flex-1">
-              <div class="el-input__inner" style="color: #B5C1D0; line-height: 30px;">登录后方可搜索</div>
-              <button class="el-input__suffix search_sub" type="submit" :class="{ active_btn: kwbtn }">
-                <span class="el-input__suffix-inner search_btn">
-                  <i class="iconfont icon-icon_icon-53 icon-ss" :class="{ active: kwfocus }"></i>
-                </span>
-              </button>
-            </div>
+      <!-- search -->
+      <div class="search-box  flex-1">
+        <form class="searchform" method="get" autocomplete="off" action="https://search.fanruan.com/?q=" target="_blank" v-if="is_search">
+          <div class="el-input el-input--small el-input--suffix topsearch  flex-1">
+            <input class="el-input__inner" name="q" type="text" autocomplete="off" tabindex="" aria-label="" placeholder="请输入关键词" @focus="isfocus('focus')" @blur="isfocus('blur')" v-on:input="isinput" />
+            <button class="el-input__suffix search_sub" type="submit" :class="{ active_btn: kwbtn }">
+              <span class="el-input__suffix-inner search_btn">
+                <i class="iconfont icon-icon_icon-53 icon-ss" :class="{ active: kwfocus }"></i>
+              </span>
+            </button>
+          </div>
+        </form>
+
+        <div class="searchform" v-else>
+          <div class="el-input el-input--small el-input--suffix topsearch  flex-1">
+            <div class="el-input__inner" style="color: #B5C1D0; line-height: 30px;">登录后方可搜索</div>
+            <button class="el-input__suffix search_sub" type="submit" :class="{ active_btn: kwbtn }">
+              <span class="el-input__suffix-inner search_btn">
+                <i class="iconfont icon-icon_icon-53 icon-ss" :class="{ active: kwfocus }"></i>
+              </span>
+            </button>
           </div>
         </div>
+      </div>
 
+      <!-- rigt -->
+      <div class="nav-rt">
         <nav class="infomation">
           <el-dropdown v-if="com_user_token" class="personal" placement="bottom-end" popper-class="new-dropdown" :show-timeout="0">
             <span class="el-dropdown-link">
@@ -90,7 +106,7 @@
     <div class="mainbox">
       <div class="edu-head">
         <div class="edu-nav">
-          <router-link class="item" to="/">首页</router-link>
+          <router-link class="item" to="/">学院首页</router-link>
           <router-link class="item" to="/studypath/finereport" :class="$route.meta.active == 'studypath' ? 'active' : ''">学习路径 </router-link>
           <router-link class="item" to="/video" :class="$route.meta.active == 'video' ? 'active' : ''">视频课</router-link>
           <router-link class="item" to="/class" :class="$route.meta.active == 'class' ? 'active' : ''">学习班</router-link>
@@ -368,9 +384,9 @@ export default defineComponent({
   z-index: 201;
 
   .wrapper {
-    width: 1200px;
+    width: 100%;
     background: #fff;
-    margin: 0 auto;
+    padding: 0 20px;
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -380,7 +396,7 @@ export default defineComponent({
         width: 1px;
         height: 24px;
         background-color: #dbe3ea;
-        margin: 0 20px;
+        margin: 0 8px;
       }
       .nav-logo {
         width: 128px;
@@ -398,65 +414,88 @@ export default defineComponent({
         text-decoration: none !important;
         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
       }
-    }
-    .nav-rt {
-      display: inline-flex;
-      align-items: center;
-      .search-box {
-        height: 48px;
-        margin: 0 auto;
-        width: 460px;
-        transition: all 0.2s;
 
-        .searchform {
-          width: 100%;
+      .navlf_item {
+        display: flex;
+        align-items: center;
+      }
+      .navlf-item-box {
+        margin-left: 32px;
+        .nav-item {
+          &:hover {
+            color: #0082fc;
+          }
+          margin-right: 20px;
+          font-size: 16px;
+          color: #17243e;
+          transition: all 0.3s;
         }
-
-        .search_sub {
-          border-radius: 0px 20px 20px 0px;
-          height: 32px;
-          cursor: pointer;
-          background: none;
-          border: none;
-          right: 0;
+        .active {
+          color: #0082fc;
         }
+      }
+    }
 
-        .search_btn {
-          display: inline-block;
-          color: #617288;
-          width: 48px;
+    .search-box {
+      height: 48px;
+      flex: 1 1;
+      max-width: 500px;
+      margin: 0 0 0 4px;
+      transition: all 0.2s;
 
-          .active {
-            color: #0082fc;
-          }
-        }
+      .searchform {
+        width: 100%;
+      }
 
-        .active_btn {
-          background-color: #0082fc;
+      .search_sub {
+        border-radius: 0px 20px 20px 0px;
+        height: 32px;
+        cursor: pointer;
+        background: none;
+        border: none;
+        right: 0;
+      }
 
-          .icon-ss {
-            color: #fff;
-          }
-        }
+      .search_btn {
+        display: inline-block;
+        color: #617288;
+        width: 48px;
 
-        .el-input__inner {
-          border: none;
-          border: 1px solid #eef3fa;
-          background-color: #eef3fa;
-          border-radius: 100px;
-          font-size: 14px;
+        .active {
+          color: #0082fc;
         }
+      }
 
-        .el-input__inner:focus {
-          border: 1px solid #0082fc;
-          background-color: #fff;
-        }
+      .active_btn {
+        background-color: #0082fc;
 
-        ::placeholder {
-          color: #8496ab !important;
+        .icon-ss {
+          color: #fff;
         }
       }
 
+      .el-input__inner {
+        border: none;
+        border: 1px solid #eef3fa;
+        background-color: #eef3fa;
+        border-radius: 100px;
+        font-size: 14px;
+      }
+
+      .el-input__inner:focus {
+        border: 1px solid #0082fc;
+        background-color: #fff;
+      }
+
+      ::placeholder {
+        color: #8496ab !important;
+      }
+    }
+
+    .nav-rt {
+      display: inline-flex;
+      align-items: center;
+
       .infomation {
         position: relative;
         height: 100%;
@@ -581,7 +620,7 @@ export default defineComponent({
 }
 
 .avatar_down {
-  width: 340px;
+  width: 300px;
   padding: 0 20px;
   background-color: #ffffff;
   background-clip: padding-box;
diff --git a/src/main.js b/src/main.js
index c0608d9..4c278de 100644
--- a/src/main.js
+++ b/src/main.js
@@ -33,17 +33,17 @@ app.use(VueWechatTitle)
 app.use(jsSeamlessScroll)
 app.mount('#app')
 router.afterEach(() => {
-    // setTimeout(() => {
-    //     //百度统计
-    //     var _hmt = _hmt || [];
-    //     (function () {
-    //         //每次执行前，先移除上次插入的代码
-    //         document.getElementById('baidu_tj') && document.getElementById('baidu_tj').remove();
-    //         var hm = document.createElement("script");
-    //         hm.src = "https://hm.baidu.com/hm.js?f4d7d83c565e698bd7cedfe9c6297055";
-    //         hm.id = "baidu_tj"
-    //         var s = document.getElementsByTagName("script")[0];
-    //         s.parentNode.insertBefore(hm, s);
-    //     })();
-    // }, 0);
+    setTimeout(() => {
+        //百度统计
+        var _hmt = _hmt || [];
+        (function () {
+            //每次执行前，先移除上次插入的代码
+            document.getElementById('baidu_tj') && document.getElementById('baidu_tj').remove();
+            var hm = document.createElement("script");
+            hm.src = "https://hm.baidu.com/hm.js?f4d7d83c565e698bd7cedfe9c6297055";
+            hm.id = "baidu_tj"
+            var s = document.getElementsByTagName("script")[0];
+            s.parentNode.insertBefore(hm, s);
+        })();
+    }, 0);
 });
diff --git a/src/views/studypath/fineDataLink.vue b/src/views/studypath/fineDataLink.vue
index ad749e9..61202d2 100644
--- a/src/views/studypath/fineDataLink.vue
+++ b/src/views/studypath/fineDataLink.vue
@@ -18,7 +18,7 @@
   <div class="w1200 pdb50">
     <div class="boxtil flex-1">
       <div class="yinhao"></div>
-      <div class="txt">学习路线图</div>
+      <div class="txt">知识结构</div>
     </div>
 
     <div class="subbox1" style="display: flex;" id="knowledgeStructure">
@@ -114,15 +114,19 @@
               </a>
 
               <div class="f14" style="padding: 20px 0 10px; line-height: 22px;">
-                完成快速入门学习即可抽取
+                完成快速入门学习即可抽取：
               </div>
-              <div class="flex-6" style="line-height: 24px;">
-                <div class="flex-1">
-                  <span class="f14 flex-1">
-                    <i class="iconfont icon-book colb3c f20"></i>
-                    <span class="col333" style="margin-left: 10px;">全套学习资料</span>
-                  </span>
-                  <span class="f12 col7e8" style="padding-left: 10px">价值200元</span>
+
+              <div class="coupon_bg flex-1">
+                <i class="iconfont icon-youhuiquan colb3c f20 lf_c"></i>
+                <div class="lineBox">
+                  <i class="arrow el-icon-caret-bottom line_bottom"></i>
+                  <div class="line_l"></div>
+                  <i class="arrow el-icon-caret-top line_top"></i>
+                </div>
+                <div>
+                  <a href="https://www.jiandaoyun.com/l/645608ecf1bf6800081e9a5c/d/64560942257222000873d3fe" target="_blank" class="col008" style="margin:0 10px;">学习资料下载</a>
+                  <span class="f12 col7e8">价值200元</span>
                 </div>
               </div>
             </div>
@@ -260,6 +264,45 @@
 </template>
 
 <style lang="scss" scoped>
+.coupon_bg {
+  background-color: #fef7f2;
+  border-radius: 6px;
+  height: 42px;
+
+  .lf_c {
+    margin: 0 14px;
+  }
+
+  .lineBox {
+    position: relative;
+    width: 15px;
+    height: 100%;
+
+    .line_bottom,
+    .line_top {
+      left: 0;
+      position: absolute;
+      font-size: 18px;
+      color: #fff;
+    }
+
+    .line_bottom {
+      top: -7px;
+    }
+
+    .line_top {
+      bottom: -7px;
+    }
+
+    .line_l {
+      position: absolute;
+      width: 1px;
+      height: 100%;
+      border: 1px #fff dashed;
+      left: 50%;
+    }
+  }
+}
 .subbox4 {
   width: 590px;
 }
@@ -375,7 +418,7 @@
 
   .itembox {
     width: 356px;
-    height: 725px;
+    height: 735px;
     position: relative;
     background-color: #fff;
     border-radius: 6px;