From 5417b236b539159807467328ebec1714dc3bed7d Mon Sep 17 00:00:00 2001 From: none Date: Tue, 28 Mar 2023 10:24:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=20&&=20=E4=BC=98=E5=8C=96=E8=B7=AF=E7=94=B1=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routes/index.tsx | 30 +++++++++++++++++++++------ src/store/system/systemConfigSlice.ts | 4 ++-- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/routes/index.tsx b/src/routes/index.tsx index f7de126..96a1bb0 100644 --- a/src/routes/index.tsx +++ b/src/routes/index.tsx @@ -1,9 +1,13 @@ import { lazy } from "react"; import { RouteObject } from "react-router-dom"; import { system } from "../api"; +import { SystemConfigStoreInterface } from "../store/system/systemConfigSlice"; import { InitPage } from "../pages/init"; -import { SystemConfigStoreInterface } from "../store/system/systemConfigSlice"; +import CoursePage from "../pages/course"; +import IndexPage from "../pages/index"; +import LatestLearnPage from "../pages/latest-learn"; +import LoginPage from "../pages/login"; let config: SystemConfigStoreInterface = { systemApiUrl: "", @@ -13,7 +17,7 @@ let config: SystemConfigStoreInterface = { systemName: "", pcIndexFooterMsg: "", playerPoster: "", - playerIsEnabledBulletSecret: "", + playerIsEnabledBulletSecret: false, playerBulletSecretText: "", playerBulletSecretColor: "", playerBulletSecretOpacity: "", @@ -22,11 +26,25 @@ let config: SystemConfigStoreInterface = { const Init = lazy(async () => { return new Promise((resolve) => { system.config().then((res: any) => { + //系统配置 config.systemApiUrl = res.data["system-api-url"]; config.systemH5Url = res.data["system-h5-url"]; config.systemLogo = res.data["system-logo"]; config.systemName = res.data["system-name"]; config.systemPcUrl = res.data["system-pc-url"]; + config.pcIndexFooterMsg = res.data["pc-index-footer-msg"]; + + //播放器配置 + config.playerPoster = res.data["player-poster"]; + config.playerIsEnabledBulletSecret = + res.data["player-is-enabled-bullet-secret"] && + res.data["player-is-enabled-bullet-secret"] === "1" + ? true + : false; + config.playerBulletSecretText = res.data["player-bullet-secret-text"]; + config.playerBulletSecretColor = res.data["player-bullet-secret-color"]; + config.playerBulletSecretOpacity = + res.data["player-bullet-secret-opacity"]; resolve({ default: InitPage, @@ -36,10 +54,10 @@ const Init = lazy(async () => { }); // 懒加载 -const LoginPage = lazy(() => import("../pages/login")); -const IndexPage = lazy(() => import("../pages/index")); -const CoursePage = lazy(() => import("../pages/course")); -const LatestLearnPage = lazy(() => import("../pages/latest-learn")); +// const LoginPage = lazy(() => import("../pages/login")); +// const IndexPage = lazy(() => import("../pages/index")); +// const CoursePage = lazy(() => import("../pages/course")); +// const LatestLearnPage = lazy(() => import("../pages/latest-learn")); const routes: RouteObject[] = [ { diff --git a/src/store/system/systemConfigSlice.ts b/src/store/system/systemConfigSlice.ts index f18676b..a166363 100644 --- a/src/store/system/systemConfigSlice.ts +++ b/src/store/system/systemConfigSlice.ts @@ -8,7 +8,7 @@ type SystemConfigStoreInterface = { systemName: string; pcIndexFooterMsg: string; playerPoster: string; - playerIsEnabledBulletSecret: string; + playerIsEnabledBulletSecret: boolean; playerBulletSecretText: string; playerBulletSecretColor: string; playerBulletSecretOpacity: string; @@ -22,7 +22,7 @@ let defaultValue: SystemConfigStoreInterface = { systemName: "", pcIndexFooterMsg: "", playerPoster: "", - playerIsEnabledBulletSecret: "", + playerIsEnabledBulletSecret: false, playerBulletSecretText: "", playerBulletSecretColor: "", playerBulletSecretOpacity: "",