diff --git a/.env b/.env index 4b0f5bf6a..1a93f8cd0 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ # 标题 -VITE_APP_TITLE=芋道管理系统 +VITE_APP_TITLE=云匣 # 项目本地运行端口号 VITE_PORT=80 @@ -8,13 +8,13 @@ VITE_PORT=80 VITE_OPEN=true # 租户开关 -VITE_APP_TENANT_ENABLE=true +VITE_APP_TENANT_ENABLE=false # 验证码的开关 -VITE_APP_CAPTCHA_ENABLE=true +VITE_APP_CAPTCHA_ENABLE=false # 文档地址的开关 -VITE_APP_DOCALERT_ENABLE=true +VITE_APP_DOCALERT_ENABLE=false # 百度统计 VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc diff --git a/public/favicon.ico b/public/favicon.ico index 5a7de0826..922e1eefd 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/logo.gif b/public/logo.gif index fdbd32c67..573f2d498 100644 Binary files a/public/logo.gif and b/public/logo.gif differ diff --git a/src/assets/imgs/home/monkey.png b/src/assets/imgs/home/monkey.png new file mode 100644 index 000000000..388d13c18 Binary files /dev/null and b/src/assets/imgs/home/monkey.png differ diff --git a/src/assets/imgs/logo.png b/src/assets/imgs/logo.png index 7e1043f21..e988b457f 100644 Binary files a/src/assets/imgs/logo.png and b/src/assets/imgs/logo.png differ diff --git a/src/assets/svgs/login-box-bg.svg b/src/assets/svgs/login-box-bg.svg index ab1004030..28a3fee85 100644 --- a/src/assets/svgs/login-box-bg.svg +++ b/src/assets/svgs/login-box-bg.svg @@ -1 +1,2 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/src/layout/components/Message/src/Message.vue b/src/layout/components/Message/src/Message.vue index d769d88c8..fa5ee879a 100644 --- a/src/layout/components/Message/src/Message.vue +++ b/src/layout/components/Message/src/Message.vue @@ -57,29 +57,6 @@ onMounted(() => { - - - - - - - - -
- -
diff --git a/src/layout/components/ToolHeader.vue b/src/layout/components/ToolHeader.vue index 4ab949720..33897f22e 100644 --- a/src/layout/components/ToolHeader.vue +++ b/src/layout/components/ToolHeader.vue @@ -68,22 +68,6 @@ export default defineComponent({ ) : undefined}
{hasTenantVisitPermission.value ? : undefined} - {screenfull.value ? ( - - ) : undefined} - {search.value ? : undefined} - {size.value ? ( - - ) : undefined} - {locale.value ? ( - - ) : undefined} - {message.value ? ( - - ) : undefined}
diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue index 355aabc86..dbffb6029 100644 --- a/src/layout/components/UserInfo/src/UserInfo.vue +++ b/src/layout/components/UserInfo/src/UserInfo.vue @@ -57,7 +57,6 @@ const toDocument = () => { @@ -165,13 +98,12 @@ import { LoginStateEnum, useFormValid, useLoginState } from './useLogin' defineOptions({ name: 'LoginForm' }) const { t } = useI18n() -const message = useMessage() const iconHouse = useIcon({ icon: 'ep:house' }) const iconAvatar = useIcon({ icon: 'ep:avatar' }) const iconLock = useIcon({ icon: 'ep:lock' }) const formLogin = ref() const { validForm } = useFormValid(formLogin) -const { setLoginState, getLoginState } = useLoginState() +const { getLoginState } = useLoginState() const { currentRoute, push } = useRouter() const permissionStore = usePermissionStore() const redirect = ref('') @@ -199,13 +131,6 @@ const loginData = reactive({ } }) -const socialList = [ - { icon: 'ant-design:wechat-filled', type: 30 }, - { icon: 'ant-design:dingtalk-circle-filled', type: 20 }, - { icon: 'ant-design:github-filled', type: 0 }, - { icon: 'ant-design:alipay-circle-filled', type: 0 } -] - // 获取验证码 const getCode = async () => { // 情况一,未开启:则直接登录 @@ -288,41 +213,6 @@ const handleLogin = async (params: any) => { } } -// 社交登录 -const doSocialLogin = async (type: number) => { - if (type === 0) { - message.error('此方式未配置') - } else { - loginLoading.value = true - if (loginData.tenantEnable === 'true') { - // 尝试先通过 tenantName 获取租户 - await getTenantId() - // 如果获取不到,则需要弹出提示,进行处理 - if (!authUtil.getTenantId()) { - try { - const data = await message.prompt('请输入租户名称', t('common.reminder')) - if (data?.action !== 'confirm') throw 'cancel' - const res = await LoginApi.getTenantIdByName(data.value) - authUtil.setTenantId(res) - } catch (error) { - if (error === 'cancel') return - } finally { - loginLoading.value = false - } - } - } - // 计算 redirectUri - // 注意: type、redirect 需要先 encode 一次,否则钉钉回调会丢失。 - // 配合 social-login.vue#getUrlValue() 使用 - const redirectUri = - location.origin + - '/social-login?' + - encodeURIComponent(`type=${type}&redirect=${redirect.value || '/'}`) - - // 进行跳转 - window.location.href = await LoginApi.socialAuthRedirect(type, encodeURIComponent(redirectUri)) - } -} watch( () => currentRoute.value, (route: RouteLocationNormalizedLoaded) => { diff --git a/src/views/Profile/Index.vue b/src/views/Profile/Index.vue index 6b29cc5e4..bbef16ebb 100644 --- a/src/views/Profile/Index.vue +++ b/src/views/Profile/Index.vue @@ -18,9 +18,6 @@ - - -