From d3c44bb9a25c42bba6e2dfd85ac7d04863112dc8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 10:48:38 +0800
Subject: [PATCH] 收货单改入修改 单位带入修改

---
 rsf-admin/src/App.jsx |   40 ++++++++++++++++++++++++++++------------
 1 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/rsf-admin/src/App.jsx b/rsf-admin/src/App.jsx
index 3dd8939..60630eb 100644
--- a/rsf-admin/src/App.jsx
+++ b/rsf-admin/src/App.jsx
@@ -11,6 +11,7 @@
 } from "react-admin";
 import polyglotI18nProvider from "ra-i18n-polyglot";
 import englishMessages from "./i18n/en";
+import zhMessages from "./i18n/zh";
 import { Layout } from "./layout";
 import AuthProvider from "./config/authProvider";
 import DataProvider from "./config/dataProvider";
@@ -27,28 +28,40 @@
   DATA_PROVIDER_SPRING,
 } from "./config/setting";
 import ResourceContent from "./page/ResourceContent";
-import { getSystemInfo, getSystemDicts } from "@/api/auth";
+import { getSystemInfo, getSystemDicts, tenants } from "@/api/auth";
+import chineseMessages from 'ra-language-chinese';
+import { createTheme, ThemeProvider } from '@mui/material/styles';
+import { zhCN } from '@mui/material/locale';
 
 const i18nProvider = polyglotI18nProvider(
   (locale) => {
-    if (locale === "zh") {
-      return import("./i18n/zh").then((messages) => messages.default);
+    if (locale === "en") {
+      return import("./i18n/en").then((messages) => messages.default);
     }
-    // fallback
-    return englishMessages;
+    return { ...chineseMessages, ...zhMessages };
   },
-  // default
-  // 'en',
-  resolveBrowserLocale("en", { fullLocale: true }),
+  "zh",
   [
     { locale: "en", name: "English" },
     { locale: "zh", name: "绠�浣撲腑鏂�" },
+    // { locale: "zh", name: "绠�浣撲腑鏂�" },
+    // { locale: "zh", name: "绠�浣撲腑鏂�" },
+    // { locale: "zh", name: "绠�浣撲腑鏂�" },
   ],
   {
     // msg in console
     allowMissing: true,
   },
 );
+
+
+const theme = createTheme(
+  {
+    palette: { main: '#1976d2' },
+  },
+  zhCN
+)
+
 
 const store = localStorageStore(SPA_VERSION, SPA_NAME);
 
@@ -102,9 +115,12 @@
 };
 
 const AppWrapper = () => (
-  <StoreContextProvider value={store}>
-    <App />
-  </StoreContextProvider>
+  <ThemeProvider theme={theme}>
+    <StoreContextProvider value={store}>
+      <App />
+    </StoreContextProvider>
+  </ThemeProvider>
+
 );
 
-export default AppWrapper;
+export default AppWrapper;
\ No newline at end of file

--
Gitblit v1.9.1