From 6575a5ea672d89fd2929fa90ca5c987049345b45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=B2=81=E8=AA=89=E7=A8=8B?= <2659568239@qq.com>
Date: Wed, 6 Dec 2023 17:19:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .umirc.ts                |  9 ++++++++-
 config/proxy.ts          | 11 +++++++++++
 package.json             |  1 +
 src/layouts/index.tsx    |  6 ++++--
 src/styles/antd.less     |  2 +-
 src/styles/antd.theme.ts |  5 -----
 src/utils/env/dev.ts     |  7 +++++++
 yarn.lock                |  7 ++++++-
 8 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 config/proxy.ts
 create mode 100644 src/utils/env/dev.ts

diff --git a/.umirc.ts b/.umirc.ts
index d9c0aa9..fda81e5 100644
--- a/.umirc.ts
+++ b/.umirc.ts
@@ -1,7 +1,14 @@
 import { defineConfig } from "umi";
-import routes from './config/routes/index'
+import routes from './config/routes/index';
+import proxy from './config/proxy';
 
 export default defineConfig({
+  proxy,
+  // locale: {
+  //   default: 'zh-CN',
+  //   baseSeparator: '-',
+  //   baseNavigator: false
+  // },
   hash: true,
   routes,
   npmClient: 'yarn',
diff --git a/config/proxy.ts b/config/proxy.ts
new file mode 100644
index 0000000..670191e
--- /dev/null
+++ b/config/proxy.ts
@@ -0,0 +1,11 @@
+import GlobalConfig from '../src/utils/env/dev';
+const proxy = {
+  '/api': {
+    target: GlobalConfig['PROXY_SERVER'],
+    changeOrigin: true,
+    withCredentials: true,
+    secure: false,
+    cookieDomainRewrite: 'localhost',
+  }
+};
+export default proxy;
diff --git a/package.json b/package.json
index 22da52b..2767439 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "antd": "^5.11.2",
+    "dayjs": "^1.11.10",
     "moment": "^2.29.4",
     "umi": "^4.0.88"
   },
diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx
index 073d4ff..33a77bb 100644
--- a/src/layouts/index.tsx
+++ b/src/layouts/index.tsx
@@ -10,11 +10,13 @@ import BottomConfigInfo from '@/layouts/BottomConfigInfo';
 
 import zhCN from 'antd/es/locale/zh_CN';
 import dayjs from 'dayjs';
-import theme from '@/styles/antd.theme';
 import 'dayjs/locale/zh-cn';
-
+import theme from '@/styles/antd.theme';
 dayjs.locale('zh-cn');
 
+import moment from 'moment'
+moment.locale('ZH-cn')
+
 
 const options2 = [
   { value: 1, label: 'GLQ管理' },
diff --git a/src/styles/antd.less b/src/styles/antd.less
index ea74228..d850835 100644
--- a/src/styles/antd.less
+++ b/src/styles/antd.less
@@ -36,10 +36,10 @@
   align-items: center;
   background: linear-gradient(180deg, #6DCFEA 0%, #3BA1CF 100%);
   box-shadow: inset 0px 1px 3px 0px rgba(255, 255, 255, 0.5);
-  border-radius: 6px 6px 0 0 !important;
   font-weight: 600;
   color: #FFFFFF !important;
   padding: 0 20px;
+  border-radius: 4px 4px 0 0 !important;
 }
 
 .ant-modal-close {
diff --git a/src/styles/antd.theme.ts b/src/styles/antd.theme.ts
index 3a3c689..819b5f9 100644
--- a/src/styles/antd.theme.ts
+++ b/src/styles/antd.theme.ts
@@ -13,11 +13,6 @@ export const theme =
       radioSize: 16,
       dotSize: 6,
     },
-    Modal: {
-      titleFontSize: 16,
-      titleLineHeight: 1,
-      titleColor: "#000"
-    },
     Table: {
       headerBg: 'linear-gradient(180deg, #FFFFFF 0%, #DEE7EB 100%)',
       headerBorderRadius: 0,
diff --git a/src/utils/env/dev.ts b/src/utils/env/dev.ts
new file mode 100644
index 0000000..129dedc
--- /dev/null
+++ b/src/utils/env/dev.ts
@@ -0,0 +1,7 @@
+export const DEV = {
+  PROXY_SERVER: 'http://47.111.130.18:58763',
+  API_SERVER: '',
+  IMG_SERVER: '',
+};
+
+export default DEV; 
diff --git a/yarn.lock b/yarn.lock
index 480ca77..26eb71a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2514,7 +2514,7 @@ data-uri-to-buffer@^4.0.0:
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e"
   integrity sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==
 
-dayjs@^1.11.1:
+dayjs@^1.11.1, dayjs@^1.11.10:
   version "1.11.10"
   resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
   integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
@@ -4303,6 +4303,11 @@ minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
+moment@^2.29.4:
+  version "2.29.4"
+  resolved "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
+  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
+
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"