@jx3box/jx3box-common-ui 7.8.8 → 7.9.0

package/assets/css/header.less

@@ -412,6 +412,11 @@ body {
         border-top-right-radius: 4px;
     }
 
+    .u-expire {
+        font-size: 12px;
+        color: #999;
+    }
+
     .u-basic {
         .flex;
         align-items: center;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jx3box/jx3box-common-ui",
-  "version": "7.8.8",
+  "version": "7.9.0",
   "description": "JX3BOX UI",
   "main": "index.js",
   "scripts": {
@@ -31,8 +31,8 @@
   ],
   "dependencies": {
     "@jx3box/jx3box-comment-ui": "^1.7.16",
-    "@jx3box/jx3box-common": "^8.0.2",
-    "@jx3box/jx3box-data": "^3.5.2",
+    "@jx3box/jx3box-common": "^8.0.3",
+    "@jx3box/jx3box-data": "^3.5.3",
     "@jx3box/jx3box-editor": "^1.9.9",
     "@jx3box/reporter": "^0.0.4",
     "axios": "^0.26.1",

package/src/header/nav.vue

@@ -130,6 +130,19 @@
 import default_nav from "../../assets/data/nav.json";
 import { getMenu } from "../../service/header";
 import { trimSlash } from "../../assets/js/utils";
+
+const activeNav = {
+    index: ['index'],
+    macro: ['macro', 'pz'],
+    tool: ['app', 'jx3dat', 'dbm'],
+    bps: ['bps', 'jcl', 'battle'],
+    fb: ['fb','baizhan','team', 'jdt', 'rank'],
+    cj: ['cj', 'item', 'knowledge', 'quest'],
+    pvx: ['face', 'adventure', 'pvg'],
+    bbs: ['bbs','topic','event'],
+    pvp: ['pvp']
+}
+
 export default {
     props: [],
     data: function () {
@@ -170,7 +183,15 @@ export default {
     },
     methods: {
         isFocus: function (type) {
-            return location.pathname.includes(type);
+            let active = '';
+            const pathname = location.pathname?.split('/')?.filter(Boolean)?.[0] || '';
+            for (const key in activeNav) {
+                if (activeNav[key].includes(pathname)) {
+                    active = key;
+                    break;
+                }
+            }
+            return type.includes(active);
         },
         matchedClient: function (client) {
             return client == "all" ? true : client == this.client;

package/src/header/userInfo.vue

@@ -44,6 +44,7 @@
                                 <img :src="super_author_icon" class="u-superauthor-profile" alt="superauthor" title="签约作者" :class="{ off: !isSuperAuthor }" /></a>
                             <a class="u-vip" href="/vip/premium?from=header_usermenu" target="_blank" title="专业版账号">
                                 <i class="i-icon-vip" :class="{ on: isPRO }">{{ vipType }}</i>
+                                <span class="u-expire" v-if="isPRO">（有效期至：{{ pro_expire_date }}）</span>
                             </a>
                         </div>
                         <div class="u-id">
@@ -81,6 +82,7 @@
 import User from "@jx3box/jx3box-common/js/user";
 import { showAvatar } from "@jx3box/jx3box-common/js/utils";
 import { getMyInfo } from "../../service/author";
+import { showDate } from "@jx3box/jx3box-common/js/moment";
 import { __Links, __Root, __imgPath, __OriginRoot } from "@jx3box/jx3box-common/data/jx3box.json";
 import { copyText } from "../../assets/js/utils";
 import { getMenu } from "../../service/header";
@@ -135,6 +137,9 @@ export default {
         isEditor() {
             return User.isEditor();
         },
+        pro_expire_date: function() {
+            return this.asset.pro_expire_date ? showDate(this.asset.pro_expire_date) : '-';
+        },
     },
     mounted() {
         this.loadMyInfo();