@jx3box/jx3box-vue3-ui 1.1.3 → 1.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jx3box/jx3box-vue3-ui",
-    "version": "1.1.3",
+    "version": "1.1.5",
     "description": "JX3BOX Vue3 UI",
     "main": "index.js",
     "scripts": {
@@ -30,7 +30,7 @@
         "@jx3box/jx3box-data": "^3.8.9",
         "@jx3box/jx3box-emotion": "^1.2.14",
         "@jx3box/jx3box-macro": "^1.0.1",
-        "@jx3box/jx3box-talent": "^1.3.9",
+        "@jx3box/jx3box-talent": "^1.3.10",
         "@jx3box/reporter": "^0.0.4",
         "@tinymce/tinymce-vue": "^5.1.1",
         "@vueuse/core": "^9.13.0",

package/service/header.js

@@ -28,4 +28,11 @@ function getGames() {
     return axios.get(JX3BOX.__dataPath + "data/product/games.json");
 }
 
-export { getMsg, getNav, getPanel, getBox, getMenu, getGames };
+// 获取全局配置
+function getGlobalConfig() {
+    return axios.get(`${JX3BOX.__ossRoot}config/global.json`).then((res) => {
+        return res.data;
+    });
+}
+
+export { getMsg, getNav, getPanel, getBox, getMenu, getGames, getGlobalConfig };

package/src/Header.vue

@@ -38,6 +38,8 @@ 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 User from "@jx3box/jx3box-common/js/user";
+import { getGlobalConfig } from "../service/header.js";
 
 export default {
     name: "CommonHeader",
@@ -54,21 +56,29 @@ export default {
         },
     },
     methods: {
+        // webView检测
         // webView检测
         checkIsWebView: function () {
             if (window.navigator.userAgent.includes(KW)) {
                 document.documentElement.classList.add("env-app");
             }
 
+            const urlParams = new URLSearchParams(window.location.search);
+            const from = urlParams.get("from");
+            from && sessionStorage.setItem("from", from);
             if (isMiniProgram()) {
-                const urlParams = new URLSearchParams(window.location.search);
                 const appid = urlParams.get("appid");
                 const item = miniprogram?.find((item) => item.appid === appid);
+                const from = urlParams.get("_from");
 
                 document.documentElement.classList.add("v-miniprogram");
 
+                if (from) {
+                    document.documentElement.classList.add("from-" + from);
+                }
+
                 if (appid && item) {
-                    document.documentElement.classList.add("env-miniprogram" + item.id);
+                    document.documentElement.classList.add("env-miniprogram-" + item.id);
 
                     window.JX3BOX_ENV = item.id?.toUpperCase() + "_MINIPROGRAM";
                 } else {
@@ -80,11 +90,80 @@ export default {
                     miniprogramHack();
                 }
             }
+
+            // 如果来自推栏
+            if (sessionStorage.getItem("from") == 'tl') {
+                document.documentElement.classList.add("v-miniprogram");
+            }
+
         },
 
         // 检查
         init: function () {
             this.checkIsWebView();
+
+            const token = this.getUrlParam("__token");
+
+            token && localStorage.setItem("__token", token);
+
+            if (User.isLogin()) {
+                this.loadAsset();
+            }
+
+            // 获取全局配置
+            getGlobalConfig().then(async (res) => {
+                const global_token_version = res.token_version;
+                const token_version = localStorage.getItem("token_version");
+
+                if (User.isLogin()) {
+                    // 对于没有token_version或者token_version不是最新的用户，都需要登出
+                    if (!token_version || token_version != global_token_version) {
+                        // 先保存最新的token_version
+                        localStorage.setItem("token_version", global_token_version);
+                        // 然后执行登出操作
+                        User.destroy().then(() => {
+                            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;
+                            }
+                        });
+                    }
+                } else {
+                    // 非登录状态也更新token_version，确保用户下次登录时使用新版本
+                    if (global_token_version) {
+                        localStorage.setItem("token_version", global_token_version);
+                    }
+                }
+            });
+        },
+
+        getUrlParam(name) {
+            var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+            var r = window.location.search.substr(1).match(reg);
+            return r ? decodeURIComponent(r[2]) : null;
+        },
+        // 资产
+        loadAsset: function () {
+            User.getAsset().then((data) => {
+                this.asset = data;
+
+                const level = User.getLevel(this.asset?.experience);
+
+                if (level > 2) {
+                    document.documentElement.classList.add("is-comment-show");
+                }
+            });
         },
     },
     created: function () {