diff --git a/.gitignore b/.gitignore
index c352f48..677e814 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ _roadhog-api-doc
# production
/dist
+/shihezi
/qingdao
# misc
diff --git a/README.md b/README.md
index 8b43dff..e69de29 100644
--- a/README.md
+++ b/README.md
@@ -1,138 +0,0 @@
-<<<<<<< HEAD
-Language : 🇺🇸 | [🇨🇳](./README.zh-CN.md) | [🇷🇺](./README.ru-RU.md) | [🇹🇷](./README.tr-TR.md) | [🇯🇵](./README.ja-JP.md) | [🇫🇷](./README.fr-FR.md) | [🇵🇹](./README.pt-BR.md) | [🇸🇦](./README.ar-DZ.md)
-
-Ant Design Pro
-
-
-
-An out-of-box UI solution for enterprise applications as a React boilerplate.
-
-[](https://dev.azure.com/ant-design/ant-design-pro/_build/latest?definitionId=1?branchName=master)  
-
-[](https://gitter.im/ant-design/pro-english?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [](https://gitter.im/ant-design/ant-design-pro?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [](http://umijs.org/) 
-
-
-
-
-
-- Preview: http://preview.pro.ant.design
-- Home Page: http://pro.ant.design
-- Documentation: http://pro.ant.design/docs/getting-started
-- ChangeLog: http://pro.ant.design/docs/changelog
-- FAQ: http://pro.ant.design/docs/faq
-- Mirror Site in China: http://ant-design-pro.gitee.io
-
-## 5.0 is out! 🎉🎉🎉
-
-[Ant Design Pro 5.0.0](https://github.com/ant-design/ant-design-pro/issues/8656)
-
-## Translation Recruitment :loudspeaker:
-
-We need your help: https://github.com/ant-design/ant-design-pro/issues/120
-
-## Features
-
-- :bulb: **TypeScript**: A language for application-scale JavaScript
-- :scroll: **Blocks**: Build page with block template
-- :gem: **Neat Design**: Follow [Ant Design specification](http://ant.design/)
-- :triangular_ruler: **Common Templates**: Typical templates for enterprise applications
-- :rocket: **State of The Art Development**: Newest development stack of React/umi/dva/antd
-- :iphone: **Responsive**: Designed for variable screen sizes
-- :art: **Theming**: Customizable theme with simple config
-- :globe_with_meridians: **International**: Built-in i18n solution
-- :gear: **Best Practices**: Solid workflow to make your code healthy
-- :1234: **Mock development**: Easy to use mock development solution
-- :white_check_mark: **UI Test**: Fly safely with unit and e2e tests
-
-## Templates
-
-```
-- Dashboard
- - Analytic
- - Monitor
- - Workspace
-- Form
- - Basic Form
- - Step Form
- - Advanced From
-- List
- - Standard Table
- - Standard List
- - Card List
- - Search List (Project/Applications/Article)
-- Profile
- - Simple Profile
- - Advanced Profile
-- Account
- - Account Center
- - Account Settings
-- Result
- - Success
- - Failed
-- Exception
- - 403
- - 404
- - 500
-- User
- - Login
- - Register
- - Register Result
-```
-
-## Usage
-
-### Use bash
-
-We provide pro-cli to quickly initialize scaffolding.
-
-```bash
-# use npm
-npm i @ant-design/pro-cli -g
-pro create myapp
-```
-
-select umi version
-
-```shell
-🐂 Use umi@4 or umi@3 ? (Use arrow keys)
-❯ umi@4
- umi@3
-```
-
-> If the umi@4 version is selected, full blocks are not yet supported.
-
-If you choose umi@3, you can also choose the pro template. Pro is the basic template, which only provides the basic content of the framework operation. Complete contains all blocks, which is not suitable for secondary development as a basic template.
-
-```shell
-? 🚀 Full or a simple scaffold? (Use arrow keys)
-❯ simple
- complete
-```
-
-Install dependencies:
-
-```shell
-$ cd myapp && tyarn
-// or
-$ cd myapp && npm install
-```
-
-## Browsers support
-
-Modern browsers.
-
-| [
](http://godban.github.io/browsers-support-badges/)Edge | [
](http://godban.github.io/browsers-support-badges/)Firefox | [
](http://godban.github.io/browsers-support-badges/)Chrome | [
](http://godban.github.io/browsers-support-badges/)Safari | [
](http://godban.github.io/browsers-support-badges/)Opera |
-| --- | --- | --- | --- | --- |
-| Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
-
-## Contributing
-
-Any type of contribution is welcome, here are some examples of how you may contribute to this project:
-
-- Use Ant Design Pro in your daily work.
-- Submit [issues](http://github.com/ant-design/ant-design-pro/issues) to report bugs or ask questions.
-- Propose [pull requests](http://github.com/ant-design/ant-design-pro/pulls) to improve our code.
-=======
-# qingdao-admin
-
->>>>>>> 997802589330c49d3abc4f122ed00ce04a3c9601
diff --git a/config/config.ts b/config/config.ts
index 6416cc7..7758b19 100644
--- a/config/config.ts
+++ b/config/config.ts
@@ -125,7 +125,7 @@ export default defineConfig({
*/
headScripts: [
// 解决首次加载时白屏的问题
- { src: '/qingdao/scripts/loading.js', async: true },
+ { src: '/shihezi/scripts/loading.js', async: true },
],
//================ pro 插件配置 =================
presets: ['umi-presets-pro'],
@@ -151,9 +151,9 @@ export default defineConfig({
mfsu: {
strategy: 'normal',
},
- outputPath: 'qingdao',
- base: '/qingdao/',
- publicPath: '/qingdao/',
+ outputPath: 'shihezi',
+ base: '/shihezi/',
+ publicPath: '/shihezi/',
esbuildMinifyIIFE: true,
requestRecord: {},
});
diff --git a/src/app.tsx b/src/app.tsx
index 04903e1..cd36886 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -29,11 +29,11 @@ const loginOut = async () => {
const redirect = urlParams.get('redirect');
// Note: There may be security issues, please note
console.log('redirect', window.location.pathname, redirect);
- if (window.location.pathname !== '/qingdao/user/login' && !redirect) {
+ if (window.location.pathname !== '/shihezi/user/login' && !redirect) {
history.replace({
pathname: '/user/login',
search: stringify({
- redirect: pathname.replace('/qingdao', '') + search,
+ redirect: pathname.replace('/shihezi', '') + search,
}),
});
}
diff --git a/src/components/Footer/index.tsx b/src/components/Footer/index.tsx
index 28969f1..e02fc1f 100644
--- a/src/components/Footer/index.tsx
+++ b/src/components/Footer/index.tsx
@@ -1,7 +1,7 @@
import { GithubOutlined } from '@ant-design/icons';
import { DefaultFooter } from '@ant-design/pro-components';
import React from 'react';
-import {getYear} from '@/utils/tools'
+import { getYear } from '@/utils/tools';
const Footer: React.FC = () => {
return (
{
{
key: '青岛政务网',
title: '青岛政务网',
- href: 'http://www.qingdao.gov.cn/',
+ href: 'http://www.shihezi.gov.cn/',
blankTarget: true,
- },{
+ },
+ {
key: '青岛市人力资源和社会保障局',
title: '青岛市人力资源和社会保障局',
- href: 'https://hrss.qingdao.gov.cn/',
+ href: 'https://hrss.shihezi.gov.cn/',
blankTarget: true,
},
]}
diff --git a/src/components/RightContent/AvatarDropdown.tsx b/src/components/RightContent/AvatarDropdown.tsx
index 9376cc0..421ac56 100644
--- a/src/components/RightContent/AvatarDropdown.tsx
+++ b/src/components/RightContent/AvatarDropdown.tsx
@@ -53,12 +53,12 @@ export const AvatarDropdown: React.FC = ({ menu, childre
/** 此方法会跳转到 redirect 参数所在的位置 */
const redirect = urlParams.get('redirect');
// Note: There may be security issues, please note
- console.log('redirect', window.location.pathname, redirect)
- if (window.location.pathname !== '/qingdao/user/login' && !redirect) {
+ console.log('redirect', window.location.pathname, redirect);
+ if (window.location.pathname !== '/shihezi/user/login' && !redirect) {
history.replace({
pathname: '/user/login',
search: stringify({
- redirect: pathname.replace('/qingdao', '') + search,
+ redirect: pathname.replace('/shihezi', '') + search,
}),
});
}