diff --git a/.env.development b/.env.development index 89fb9a9..fa6edb7 100644 --- a/.env.development +++ b/.env.development @@ -2,13 +2,13 @@ VITE_NODE_ENV='development' # 开发环境 -VITE_APP_BASE_API='/api' +VITE_APP_BASE_API='/sys' # 页面 title 前缀 VITE_APP_TITLE=开发环境 # 网络请求公用地址 -VITE_API_BASE_URL='http://127.0.0.1:8080' +VITE_API_BASE_URL='http://127.0.0.1:80' VITE_TITLE_NAME='五味子云相册' @@ -16,4 +16,5 @@ VITE_TITLE_NAME='五味子云相册' VITE_APP_TOKEN_KEY='Bearer' # the websocket url -VITE_WEB_SOCKET_URL='ws://127.0.0.1:8080/api/ws/gws' +#VITE_WEB_SOCKET_URL='ws://127.0.0.1:80/api/ws/gws' +VITE_WEB_SOCKET_URL='wss://landaiqing.cn/api/ws/gws' diff --git a/.env.production b/.env.production index 6bd4ec8..0528b20 100644 --- a/.env.production +++ b/.env.production @@ -1,13 +1,13 @@ # 生产环境配置 VITE_NODE_ENV='production' # 生产环境 -VITE_APP_BASE_API='/api' +VITE_APP_BASE_API='/sys' # 页面 title 前缀 VITE_APP_TITLE=生产环境 # 网络请求公用地址 -VITE_API_BASE_URL='http://1.95.0.111:5050' +VITE_API_BASE_URL='http://127.0.0.1:80' VITE_TITLE_NAME='五味子云相册' @@ -15,4 +15,5 @@ VITE_TITLE_NAME='五味子云相册' VITE_APP_TOKEN_KEY='Bearer' # the websocket url -VITE_WEB_SOCKET_URL='ws://127.0.0.1:8080/api/ws/gws' +#VITE_WEB_SOCKET_URL='ws://127.0.0.1:80/api/ws/gws' +VITE_WEB_SOCKET_URL='wss://landaiqing.cn/api/ws/gws' diff --git a/components.d.ts b/components.d.ts index 2bb3b5f..4c88db3 100644 --- a/components.d.ts +++ b/components.d.ts @@ -12,7 +12,6 @@ declare module 'vue' { ACard: typeof import('ant-design-vue/es')['Card'] ACheckbox: typeof import('ant-design-vue/es')['Checkbox'] AConfigProvider: typeof import('ant-design-vue/es')['ConfigProvider'] - ADatePicker: typeof import('ant-design-vue/es')['DatePicker'] ADivider: typeof import('ant-design-vue/es')['Divider'] ADropdown: typeof import('ant-design-vue/es')['Dropdown'] AFlex: typeof import('ant-design-vue/es')['Flex'] @@ -23,17 +22,14 @@ declare module 'vue' { AMenu: typeof import('ant-design-vue/es')['Menu'] AMenuItem: typeof import('ant-design-vue/es')['MenuItem'] AQrcode: typeof import('ant-design-vue/es')['QRCode'] - ArrowRightOutlined: typeof import('@ant-design/icons-vue')['ArrowRightOutlined'] ASelect: typeof import('ant-design-vue/es')['Select'] ASelectOption: typeof import('ant-design-vue/es')['SelectOption'] ATabPane: typeof import('ant-design-vue/es')['TabPane'] ATabs: typeof import('ant-design-vue/es')['Tabs'] - ATimePicker: typeof import('ant-design-vue/es')['TimePicker'] ATooltip: typeof import('ant-design-vue/es')['Tooltip'] BoxDog: typeof import('./src/components/BoxDog/BoxDog.vue')['default'] Card3D: typeof import('./src/components/Card3D/Card3D.vue')['default'] Clouds: typeof import('./src/components/Clouds/Clouds.vue')['default'] - DownOutlined: typeof import('@ant-design/icons-vue')['DownOutlined'] DynamicTitle: typeof import('./src/components/DynamicTitle/DynamicTitle.vue')['default'] EffectsCard: typeof import('./src/components/EffectsCard/EffectsCard.vue')['default'] ForgetPage: typeof import('./src/views/Forget/ForgetPage.vue')['default'] @@ -42,6 +38,7 @@ declare module 'vue' { LockOutlined: typeof import('@ant-design/icons-vue')['LockOutlined'] LoginFooter: typeof import('./src/views/Login/LoginFooter.vue')['default'] LoginPage: typeof import('./src/views/Login/LoginPage.vue')['default'] + MainPage: typeof import('./src/views/Main/MainPage.vue')['default'] NotFound: typeof import('./src/views/404/NotFound.vue')['default'] QqOutlined: typeof import('@ant-design/icons-vue')['QqOutlined'] QRLogin: typeof import('./src/views/QRLogin/QRLogin.vue')['default'] @@ -50,7 +47,6 @@ declare module 'vue' { RouterView: typeof import('vue-router')['RouterView'] SafetyOutlined: typeof import('@ant-design/icons-vue')['SafetyOutlined'] TabletOutlined: typeof import('@ant-design/icons-vue')['TabletOutlined'] - TestI18n: typeof import('./src/views/TestI18n.vue')['default'] TestTheme: typeof import('./src/views/TestTheme.vue')['default'] UserOutlined: typeof import('@ant-design/icons-vue')['UserOutlined'] WechatOutlined: typeof import('@ant-design/icons-vue')['WechatOutlined'] diff --git a/src/assets/styles/theme.scss b/src/assets/styles/theme.scss index 2e60f2b..87bd296 100644 --- a/src/assets/styles/theme.scss +++ b/src/assets/styles/theme.scss @@ -6,7 +6,7 @@ $modes: ( infoColor: #000 ), "dark": ( - bgColor: #000, + bgColor: rgba(15, 15, 16, 0.63), infoColor: #fff ) ); diff --git a/src/layout/Landing/Header/Header.vue b/src/layout/Landing/Header/Header.vue index 9bc6a5e..44e4a58 100644 --- a/src/layout/Landing/Header/Header.vue +++ b/src/layout/Landing/Header/Header.vue @@ -16,7 +16,27 @@ +