@jx3box/jx3box-ui 2.3.16 → 2.3.17

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jx3box/jx3box-ui",
-    "version": "2.3.16",
+    "version": "2.3.17",
     "description": "JX3BOX Vue3 UI",
     "main": "index.js",
     "scripts": {

package/service/header.js

@@ -6,6 +6,7 @@ const GLOBAL_CONFIG_STORAGE_KEY = "jx3box:global-config";
 const GLOBAL_CONFIG_TTL = 6 * 60 * 60 * 1000;
 let globalConfigCache = null;
 let globalConfigPending = null;
+let globalConfigRefreshPending = null;
 
 function getGlobalConfigUrl() {
     const root = JX3BOX.__ossRoot || "https://cdn.jx3box.com/";
@@ -74,7 +75,23 @@ function getGames() {
 }
 
 // 获取全局配置
-function getGlobalConfig() {
+function getGlobalConfig({ force = false } = {}) {
+    if (force) {
+        if (!globalConfigRefreshPending) {
+            globalConfigRefreshPending = axios
+                .get(getGlobalConfigUrl())
+                .then((res) => {
+                    globalConfigCache = res.data || {};
+                    writeGlobalConfigStorage(globalConfigCache);
+                    return globalConfigCache;
+                })
+                .finally(() => {
+                    globalConfigRefreshPending = null;
+                });
+        }
+        return globalConfigRefreshPending;
+    }
+
     if (globalConfigCache) return Promise.resolve(globalConfigCache);
 
     const storageConfig = readGlobalConfigStorage();

package/src/footer/resource.vue

@@ -165,10 +165,17 @@
 import { ArrowDown, ArrowUp, Download } from "@element-plus/icons-vue";
 import { copyText } from "../../utils";
 import i18nMixin from "../../i18n/mixin";
-import { getConfig } from "../../service/cms";
+import { getGlobalConfig } from "../../service/header";
 
 const APP_LOGO_FALLBACK = "https://cdn.jx3box.com/design/app/logo/jx3box-icon-512.png";
-const APP_CONFIG_KEYS = ["android_apk", "android_versions", "app_logo", "app_version_desc", "apple_url", "harmony_url"];
+const APP_CONFIG_KEYS = [
+    "android_apk",
+    "android_versions",
+    "app_logo",
+    "app_version_desc",
+    "apple_url",
+    "harmony_url",
+];
 
 export default {
     name: "FooterResource",
@@ -305,20 +312,11 @@ export default {
             window.open(this.activeDownloadUrl, "_blank", "noopener,noreferrer");
         },
         loadAppConfig() {
-            const storeConfig = this.getStoreAppConfig();
-            if (storeConfig) {
-                this.appConfig = {
-                    ...this.appConfig,
-                    ...storeConfig,
-                };
-                this.appConfigLoaded = true;
-                return Promise.resolve();
-            }
             if (this.appConfigLoading || this.appConfigLoaded) return Promise.resolve();
             this.appConfigLoading = true;
-            return getConfig({ subtype: "app" })
-                .then((items) => {
-                    this.appConfig = this.getAppConfigFromItems(items);
+            return getGlobalConfig({ force: true })
+                .then((config) => {
+                    this.appConfig = this.getAppConfig(config);
                     this.appConfigLoaded = true;
                 })
                 .catch(() => {
@@ -328,22 +326,13 @@ export default {
                     this.appConfigLoading = false;
                 });
         },
-        getStoreAppConfig() {
-            const config = this.$store?.state?.config || {};
+        getAppConfig(config) {
+            if (!config || typeof config !== "object") return {};
             const appConfig = APP_CONFIG_KEYS.reduce((result, key) => {
                 if (config[key]) result[key] = config[key];
                 return result;
             }, {});
-            return Object.keys(appConfig).length ? appConfig : null;
-        },
-        getAppConfigFromItems(items) {
-            if (!Array.isArray(items)) return {};
-            return items.reduce((config, item) => {
-                if (!item?.key || !APP_CONFIG_KEYS.includes(item.key)) return config;
-                if (item.subtype && item.subtype !== "app") return config;
-                config[item.key] = item.val;
-                return config;
-            }, {});
+            return appConfig;
         },
         getDescLines(description) {
             return String(description || "")
@@ -372,7 +361,9 @@ export default {
             window.open("/qqbot", "_blank");
         },
     },
-    created: function () {},
+    created: function () {
+        this.loadAppConfig();
+    },
     mounted: function () {},
 };
 </script>

package/src/header/shop.vue

@@ -23,8 +23,7 @@
 </template>
 
 <script>
-import { getConfig, getUserMeta } from "../../service/cms";
-import User from "@jx3box/jx3box-common/js/user";
+import { getConfig } from "../../service/cms";
 import i18nMixin from "../../i18n/mixin";
 // import shopIcon from "@/assets/img/components/common/header/gift.svg";
 export default {
@@ -72,25 +71,18 @@ export default {
             /**
              * 只在点击入口后记录本地版本；仅看到气泡不算已处理。
              */
-            let meta = null;
-            if (User.isLogin()) {
-                meta = await getUserMeta({ key: "mall_pop" });
-            }
             let config = this.config || (this.configManaged ? null : await getConfig({ key: "mall" }));
             if (!config) return;
             this.initialized = true;
             this.popValue = config.val;
 
-            this.pop = this.shouldShowPop(meta, config.val);
+            this.pop = this.shouldShowPop(config.val);
         },
-        shouldShowPop(meta, value) {
+        shouldShowPop(value) {
             if (!~~value) return false;
 
             const local = localStorage.getItem("mall_pop");
-            if (String(local) === String(value)) return false;
-
-            if (meta == null || meta == 1) return true;
-            return ~~value > ~~local;
+            return String(local) !== String(value);
         },
         markPopRead() {
             if (!this.pop || this.popValue == null) return;

package/src/header/vip.vue

@@ -23,8 +23,7 @@
 </template>
 
 <script>
-import { getConfig, getUserMeta } from "../../service/cms";
-import User from "@jx3box/jx3box-common/js/user";
+import { getConfig } from "../../service/cms";
 import i18nMixin from "../../i18n/mixin";
 // import vipIcon from "@/assets/img/components/common/header/vip.svg";
 export default {
@@ -72,25 +71,18 @@ export default {
             /**
              * 只在点击入口后记录本地版本；仅看到气泡不算已处理。
              */
-            let meta = null;
-            if (User.isLogin()) {
-                meta = await getUserMeta({ key: "vip_pop" });
-            }
             let config = this.config || (this.configManaged ? null : await getConfig({ key: "vip" }));
             if (!config) return;
             this.initialized = true;
             this.popValue = config.val;
 
-            this.pop = this.shouldShowPop(meta, config.val);
+            this.pop = this.shouldShowPop(config.val);
         },
-        shouldShowPop(meta, value) {
+        shouldShowPop(value) {
             if (!~~value) return false;
 
             const local = localStorage.getItem("vip_pop");
-            if (String(local) === String(value)) return false;
-
-            if (meta == null || meta == 1) return true;
-            return ~~value > ~~local;
+            return String(local) !== String(value);
         },
         markPopRead() {
             if (!this.pop || this.popValue == null) return;