Merge branch 'dev/v1.0.1_cyl' of jianyu/jybxseo into feature/v1.0.1

resource/staticres/css/header.css

@@ -399,3 +399,25 @@
 .work-link:hover{
   color: #fff;
 }
+
+.menu-vip-button {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 2px 8px;
+  height: 26px;
+  color: #6F3D03;
+  font-size: 14px;
+  line-height: 22px;
+  border-radius: 4px;
+  background: linear-gradient(270deg, #EECB86 0%, #FBE1BA 100%);
+}
+.menu-vip-button .j-icon {
+  width: 18px;
+  height: 18px;
+  margin-right: 2px;
+}
+a.menu-vip-button,
+a.menu-vip-button:hover {
+  color: #6F3D03;
+}

resource/staticres/css/icons.css

@@ -88,6 +88,14 @@
   background-size: contain;
 }
 
+.icon-img-nav-home {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAALSSURBVHgB7ZdNdtJQFMfvDa1VB5olpBOlQQmMPR4JOLddgXQF4gqkKwBXUFxBceRECK4ggOWjTow7YNQee0qu9wGBR0oJSXoc8Tunp8n7/Oe+/7vvAbBlSzwQYnLwvfMBFSgB0GjsYu3irfEZYhBZkHZmq4+fYAUQi3I5EVSvFPfEMbMjiEAkQclvtoZ7eIaAmVX1BOQAPcgNCvofCIkCIUk1zw0WY3li+ItGLkKRUCwbjKZlqAFet55xWwhJqAjN/FKVihzcTRz2Xr/oiJekZWsKKRY/al6DMQu9MDf31cYROmh0KstiqE17uzlPjGBoZh0XXVPUeWUJ9lSy0fm04TTBERLmffR04pfcXApCdWAaH9f1S1mdChu8NO8D1GJfFYN8tVbQzLzWxBMLMaXBhkugWxwZgrIkKtDsdwp63uy+SwDV+FGdNRwhukfnZrYFIXjZ7L4ZT8fRZkVsfCz28+mvsKkgXaw5Lr6McYRfBq/Cb2PBKrO7HLlhwTiBdYJWJjuk+iXQcdRE55GxbPXaxVMe+9ArW5VElwQdNNu2nOw4v5SH5u2viMMqX10hZT1Rc0E6e4ar63JDJGjJg/ULmWOIgN5ony4VTKOkLl6h2DONL+J5xytMsNnGch9AzrZQ9I0dSZD/vPNDhPMlmyfGn/n0D66pw38GEVvyjtuRK3lJjnTLzihSOF1SRLg1/0DiTHPppsxRVP11Y9gp/covMrjESOHU4b3c8O4V2X1JIASgNzu/PUH9vDFpL3bMX0JbTpj+iS/R3feMymPQrNzhMfbXTBf+tBeMKWGsESNQH7JuiEAkQUsg1UTkJtHDSUaORXxB98xWUBBbQUEECuKt43jPSb7bQEjkPoR8QQucLwD/6QzTXxbiT/O9C1RYZHl/u6VDNLIgQarZtfj0z0EMxJnVM9NmYDvYEL60v+d/JYLbZ9f6CdARF/z+Pd+rtmy5i3+CGB3ZyKqRDAAAAABJRU5ErkJggg==);
+}
+/* vip的v */
+.icon-img-vip-v-deep {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAANCSURBVHgB7VbBThRBEK2a3VngpH8Af0C8epKQeDFGjPEiB5cEYiIxgpoYL8KcvAkkGi5qPMnFIESjN9BEP4AvAP8Ab7izU21VV/Xsys6wA3iTymS6p6e761XVq+oGOJP/XTB0fjwZcL7jnLaIKH1pRC4++x312+zbo8EFQFqQbXUbbsG36GRAHlWZjD9vJdKpdyEJisHm8hgCkbMfR8v2w/h25mgRSFCDwfYw0L9lT7bGkft6eTlNwrocQLDw++MG6UT7IWuDG0pk6wGMZg6WdRYbQB6/vvhN4k4n3oDdervWBEihB0CQjKBrKWoPXakTvszBSJviDdZ9LvhNfCbBU/h+D7Fnv5FFY+MvD352r+8BQE5XoV/kfOtK9H+Yg/PoGtvcHSaNtaxnzT7kORj/RDh1WHkxAPMAGSX1szgCgxRv8U9Wbp6yqbLYGYk1/C65+iLdLNqjBADKRmyO8q/I/s/34iUmywV0ue6QQN5y2UdgM5aVa6vtBEqkIASedWAcVCvgbxJ+mm08ZQVzgR6WWoZW++S/cef6amsejpACEqI6jzRrfT2gDgk278b3+WtRDXZAYGQL2eLUEfzsDdSjCegjPQBEcWaWoyeRulTk4x0YZbcvEQSWIXb87pX7BOIt9ofi+qUrBaTrC4BCwYLgRs2ItSaMpBBveJMxZ6fLU06Yh5bAtWiqivJiAOTj73VYOXUCqtGIt/l7WEaVH2hJjma3hoq/kpuvWptQUUo9QGaZ0sEX82EXFGudg47JGiqet3LrTTnjKwFoG6u8ZbxvRp1SSM6yQRoKFR6taMHO5Nv2PBxTeklo54aSwAoK5VXNChuaJ3QJK98bqtcmumv8iQEQhcqrSkJBCeX4UNERTv6qx7WxG6+rka4CAFXuQir4jFNi2umqeCAPR3PyhMoLAUghUvvCkW4FznWVZR8GP5JMvUsrM74SALJ4G8Et5p2ThowBfP6vzKwdj/GVAOTupnwk3A5yNITRzsxaemzGVwKQ2RWsqxCFQm8nJO5G7bRvjT8VAOO9DoRDhkOTAfKtpjY2vZ6emHR9AZBdAPU6Fm6m2okgak6vH/wz5YUAwjFsxUYPAiVlMvu+dSrGn8mZFMkfPrhB1HMkfDIAAAAASUVORK5CYII=);
+}
+
 /******** img背景图 **********/
 .j-img {
   display: inline-block;

resource/staticres/js/login.js

@@ -18,9 +18,11 @@ window.seoLoginModule = {
     },
     // Hooks 登录相关回调绑定
     bindHooks () {
-        window.jyCoreSDK.$on('user-login-success', this.handleLoginSuccess.bind(this))
-        window.jyCoreSDK.$on('user-sign-out', this.handleSignOut.bind(this))
-        window.jyCoreSDK.$on('user-info-update', this.handleInfoUpdate.bind(this))
+        if (window.jyCoreSDK) {
+            window.jyCoreSDK.$on('user-login-success', this.handleLoginSuccess.bind(this))
+            window.jyCoreSDK.$on('user-sign-out', this.handleSignOut.bind(this))
+            window.jyCoreSDK.$on('user-info-update', this.handleInfoUpdate.bind(this))
+        }
     },
     // 统一回调事件
     handleLoginSuccess () {

resource/template/pc/common/header.html

@@ -28,10 +28,12 @@
     <nav class="header-right">
       <ul>
         <li class="header-right-list">
-          <a class="jynav-list-title" href="javascript:void(0);" data-toggle="modal"
-            data-target="#downloadApp">APP下载</a>
+          <a class="menu-vip-button" href="{{GetJyWebDomain}}/product/index?serviceType=0" target="_blank"><i class="j-icon base-icon icon-img-vip-v-deep"></i>服务列表</a>
         </li>
         <li class="header-right-list">
+          <a class="jynav-list-title" href="{{GetJyWebDomain}}/front/appDownload" target="_blank">APP下载</a>
+        </li>
+        <li class="header-right-list" style="display: none;">
           <a class="jynav-list-title" href="{{GetJyWebDomain}}/jySchool/index" target="_blank" data-cl-id="2477815344"
             style="color: rgb(29, 29, 29);">剑鱼学堂</a>
           <div class="jynav-list jy-rember" style="display: none;">
@@ -47,9 +49,10 @@
           </div>
         </li>
         <li class="header-right-list">
-          <a class="jynav-list-title" notag="" href="{{GetJyWebDomain}}/helpCenter/index" target="_blank" data-cl-id="3751082804"
-            style="color: rgb(29, 29, 29);">帮助中心</a>
-
+          <a class="jynav-list-title" notag="" href="{{GetJyWebDomain}}/helpCenter/index" target="_blank">帮助中心</a>
+        </li>
+        <li class="header-right-list">
+          <a class="jynav-list-title" href="{{GetJyWebDomain}}/brand/index" target="_blank">关于剑鱼</a>
         </li>
       </ul>
       <div class='useronline' id="login" style="float:left;">
@@ -65,19 +68,10 @@
           <div id="signout" class="out-button">退出登录</div>
         </div>
       </div>
-      <a href="{{GetJyWebDomain}}/page_workDesktop/" class="work-link" style="float:left;display: none;">立即使用</a>
+      <a href="{{GetJyWebDomain}}/page_workDesktop/" class="work-link" style="float:left;display: none;">进入工作台</a>
     </nav>
   </div>
 </header>
-<!-- Modal -->
-<div class="modal fade" id="downloadApp" tabindex="-1" aria-labelledby="downloadApp" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="download-scan-group">
-      <img src='{{Cdn}}/jybx/images/download-app.png?v={{Msg "version"}}' alt="下载APP">
-      <div class="close-icon"></div>
-    </div>
-  </div>
-</div>
 <script src='/common-module/login-js/jy-login.umd.js?v={{Msg "version"}}'></script>
 <script src='{{Cdn}}/jybx/js/login.js?v={{Msg "version"}}'></script>
 <script src='{{Cdn}}/jybx/js/pc-header.js?v={{Msg "version"}}'></script>