@jx3box/jx3box-common-ui 9.0.32 → 9.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jx3box/jx3box-common-ui",
-    "version": "9.0.32",
+    "version": "9.0.34",
     "description": "JX3BOX UI",
     "main": "index.js",
     "scripts": {

package/service/header.js

@@ -1,6 +1,6 @@
 import axios from "axios";
-import { $helper, $cms, $next } from "@jx3box/jx3box-common/js/https.js";
-import { __dataPath } from "@jx3box/jx3box-common/data/jx3box.json";
+import { $cms, $next } from "@jx3box/jx3box-common/js/https.js";
+import { __dataPath, __ossRoot } from "@jx3box/jx3box-common/data/jx3box.json";
 
 function getLetter() {
     return $next({ mute: true }).get("/api/letter/unread/count");
@@ -32,4 +32,11 @@ function getGames() {
     return axios.get(__dataPath + 'data/product/games.json')
 }
 
-export { getLetter, getNav, getPanel, getBox, getMenu, getGames, getMsg };
+// 获取全局配置
+function getGlobalConfig() {
+    return axios.get(`${__ossRoot}config/global.json`).then((res) => {
+        return res.data;
+    });
+}
+
+export { getLetter, getNav, getPanel, getBox, getMenu, getGames, getMsg, getGlobalConfig };

package/src/Header.vue

@@ -1,10 +1,5 @@
 <template>
-    <header
-        class="c-header"
-        id="c-header"
-        :class="{ isOverlay: overlayEnable && isOverlay }"
-        v-if="!isApp"
-    >
+    <header class="c-header" id="c-header" :class="{ isOverlay: overlayEnable && isOverlay }" v-if="!isApp">
         <div class="c-header-inner">
             <!-- logo -->
             <header-logo />
@@ -24,7 +19,7 @@
             <slot></slot>
 
             <!-- user -->
-            <header-user :client="client" />
+            <header-user ref="user" :client="client" />
         </div>
         <Box class="c-header-jx3box" :overlayEnable="overlayEnable" :client="client" />
     </header>
@@ -32,7 +27,6 @@
 
 <script>
 import _ from "lodash";
-// import JX3BOX from "@jx3box/jx3box-common/data/jx3box.json";
 import { isApp, KW } from "../assets/js/app.js";
 
 import logo from "./header/logo.vue";
@@ -43,7 +37,9 @@ import user from "./header/user.vue";
 import Box from "../src/Box.vue";
 import { isMiniProgram, miniprogramHack } from "@jx3box/jx3box-common/js/utils";
 import miniprogram from "@jx3box/jx3box-common/data/miniprogram.json";
-// import gameSwitch from "./header/gameSwitch.vue";
+import { getGlobalConfig } from "../service/header.js";
+import User from "@jx3box/jx3box-common/js/user.js";
+import { __Root, __OriginRoot } from "@jx3box/jx3box-common/data/jx3box.json";
 
 export default {
     name: "Header",
@@ -58,6 +54,9 @@ export default {
         client: function () {
             return location.hostname.includes("origin") ? "origin" : "std";
         },
+        siteRoot: function () {
+            return location.host.includes("origin") ? __OriginRoot : __Root;
+        },
     },
     methods: {
         // webView检测
@@ -67,7 +66,6 @@ export default {
             }
 
             if (isMiniProgram()) {
-
                 const urlParams = new URLSearchParams(window.location.search);
                 const appid = urlParams.get("appid");
                 const item = miniprogram?.find((item) => item.appid === appid);
@@ -96,6 +94,34 @@ export default {
             const token = this.getUrlParam("__token");
 
             token && localStorage.setItem("__token", token);
+
+            // 获取全局配置
+            getGlobalConfig().then(async (res) => {
+                const global_token_version = res.token_version;
+                const token_version = localStorage.getItem("token_version");
+
+                if (User.isLogin()) {
+                    if (token_version != global_token_version) {
+                        User.destroy().then((res) => {
+                            this.$refs.user?.logout();
+                            // 清除马甲所有马甲信息
+                            let keys = Object.keys(localStorage);
+                            let alternate = keys.filter((key) => key.startsWith("jx3box-alternate-"));
+
+                            alternate.forEach((key) => {
+                                localStorage.removeItem(key);
+                            });
+
+                            if (
+                                location.pathname.startsWith("/dashboard") ||
+                                location.pathname.startsWith("/publish")
+                            ) {
+                                location.href = this.siteRoot;
+                            }
+                        });
+                    }
+                }
+            });
         },
 
         getUrlParam(name) {

package/src/bread/CommunityAdmin.vue

@@ -282,7 +282,6 @@ export default {
 
             promises.push(
                 updateTopicItem(id, {
-                    ...this.post,
                     user_id: Number(this.form.user_id),
                     title: this.form.title,
                     category: this.form.category,

package/src/header/user.vue

@@ -115,7 +115,6 @@ export default {
                             })
                             .catch((err) => {
                                 localStorage.setItem("user_last_login", JSON.stringify(dayjs()));
-                                console.log(dayjs.tz.guess());
                             })
                             .finally(() => {
                                 clearTimeout(signTimer);