diff --git a/.env.dev b/.env.dev index fe5d3bb..1955b6b 100644 --- a/.env.dev +++ b/.env.dev @@ -2,7 +2,7 @@ NODE_ENV=development # app -VITE_TITLE=GuXuan-Admin +VITE_TITLE=HaHa-Admin VITE_PUBLIC_PATH=/ VITE_OUT_DIR=dist VITE_PERMISSION=false @@ -12,7 +12,7 @@ VITE_ROUTER_BASE=/ VITE_ROUTER_HISTORY=hash # api -VITE_API_BASIC= +VITE_API_BASIC='http://10.10.1.6:8040' VITE_API_HTTP=/api/v1/ # storage VITE_STORAGE_NAMESPACE = gin-admin_local_ \ No newline at end of file diff --git a/.env.prod b/.env.prod index ed098e8..7ddd3d8 100644 --- a/.env.prod +++ b/.env.prod @@ -2,9 +2,9 @@ NODE_ENV=production # app -VITE_TITLE=GuXuan-Admin +VITE_TITLE=HaHa-Admin VITE_PUBLIC_PATH=/ -VITE_OUT_DIR=dist +VITE_OUT_DIR=index VITE_PERMISSION=true # router diff --git a/.gitignore b/.gitignore index d57ef41..9628b4b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ lerna-debug.log* node_modules dist +index dist-ssr *.local */.vitepress/cache/**/* diff --git a/README.md b/README.md index 5690d55..cb9fb6d 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# GuXuan-Admin-Template +# HaHa-Admin-Template > GIN-Admin-vue is a frontend project for [gin-admin](https://github.com/LyricTian/gin-admin) base on Ant Design React. -![guxuan-admin-template](./demo.png) +![HaHa-Admin-template](./demo.png) - [Preview](http://101.42.232.163:8040) - Username: admin diff --git a/index.html b/index.html index e25f2b5..df466cc 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ + href="/logo-hahayun.png" /> diff --git a/package-lock.json b/package-lock.json index a3c1264..61400bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "gin-admin", + "name": "HaHa-Admin", "version": "1.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { - "name": "gin-admin", + "name": "HaHa-Admin", "version": "1.0.0", "dependencies": { "@ant-design/colors": "^7.0.0", diff --git a/package.json b/package.json index 3daff3e..c32cfa6 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "guxuan-admin", + "name": "HaHa-Admin", "private": true, "version": "1.0.0", "scripts": { diff --git a/public/logo-hahayun.png b/public/logo-hahayun.png new file mode 100644 index 0000000..bf2bd39 Binary files /dev/null and b/public/logo-hahayun.png differ diff --git a/src/assets/img2.png b/src/assets/img2.png new file mode 100644 index 0000000..ae4ee0b Binary files /dev/null and b/src/assets/img2.png differ diff --git a/src/assets/imgs/jianguan.png b/src/assets/imgs/jianguan.png new file mode 100644 index 0000000..f1876bd Binary files /dev/null and b/src/assets/imgs/jianguan.png differ diff --git a/src/assets/imgs/tel.png b/src/assets/imgs/tel.png new file mode 100644 index 0000000..0771819 Binary files /dev/null and b/src/assets/imgs/tel.png differ diff --git a/src/assets/imgs/yunying.png b/src/assets/imgs/yunying.png new file mode 100644 index 0000000..fe46b56 Binary files /dev/null and b/src/assets/imgs/yunying.png differ diff --git a/src/assets/ylimg.png b/src/assets/ylimg.png new file mode 100644 index 0000000..779a7d1 Binary files /dev/null and b/src/assets/ylimg.png differ diff --git a/src/layouts/UserLayout.vue b/src/layouts/UserLayout.vue index afd1a5b..ce2b307 100644 --- a/src/layouts/UserLayout.vue +++ b/src/layouts/UserLayout.vue @@ -7,8 +7,8 @@
-

{{ $t('pages.layouts.userLayout.title') }}

+ :src="assets('ylimg.png')" /> +
@@ -17,10 +17,9 @@
-
+ -
+
-->
@@ -130,7 +129,7 @@ function handleLang(lang) { &-body { flex: 1; text-align: center; - padding: 48px 0 0; + padding: 60px 0 0; img { width: 80%; @@ -162,7 +161,7 @@ function handleLang(lang) { } &-content { - width: 368px; + // width: 368px; height: 440px; } diff --git a/src/router/config.js b/src/router/config.js index d1edd95..246e880 100644 --- a/src/router/config.js +++ b/src/router/config.js @@ -3,7 +3,7 @@ import * as layouts from '@/layouts' * 白名单 * @type {string[]} */ -export const whiteList = ['login', 'logout', '404', 'users'] +export const whiteList = ['login', 'logout', '404', 'users','plateform'] /** * 未找到页面路由 @@ -41,6 +41,14 @@ export const constantRoutes = [ title: '登录', }, }, + { + path: '/plateform', + name: 'plateform', + component: () => import('@/views/login/platForm.vue'), + meta: { + title: '平台选择', + }, + }, ], }, { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 5626bcb..a458608 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,69 +1,46 @@ @@ -76,6 +53,7 @@ import { config } from '@/config' import { useForm } from '@/hooks' import { useAppStore, useRouterStore, useUserStore } from '@/store' import { timeFix } from '@/utils/util' + import apis from '@/apis' import { md5 } from 'js-md5' import { useI18n } from 'vue-i18n' @@ -92,6 +70,8 @@ const route = useRoute() const loading = ref(false) const captcha_img = ref('') const captcha_id = ref('') +const currentStep = ref(2) // 当前步骤 + const httpApi = import.meta.env.BASE_URL + `api/v1/captcha/image` const redirect = computed(() => decodeURIComponent(route.query?.redirect ?? '')) @@ -188,4 +168,35 @@ function goIndex() { :deep(.ant-tabs-tab) { font-size: 15px; } + +.user-layout-platform { + display: flex; + justify-content: space-around; + align-items: center; + gap: 20px; + width: 100%; + .platform-item { + display: flex; + flex-direction: column; + align-items: center; + width: 200px; + flex-shrink: 0; /* 防止元素被压缩 */ + background: #415172; + border-radius: 8px; + font-size: 20px; + font-weight: 600; + color: #fff; + + img { + width: 80px; + height: 80px; + margin-bottom: 10px; + } + + span { + font-size: 16px; + font-weight: 500; + } + } +} diff --git a/src/views/login/platForm.vue b/src/views/login/platForm.vue new file mode 100644 index 0000000..8f7df3a --- /dev/null +++ b/src/views/login/platForm.vue @@ -0,0 +1,56 @@ + + + \ No newline at end of file