diff --git a/.env b/.env index 424b022..771da49 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ # 标题 -VITE_APP_TITLE=芋道管理系统 +VITE_APP_TITLE=自贸区管理系统 # 项目本地运行端口号 VITE_PORT=80 @@ -8,7 +8,7 @@ VITE_PORT=80 VITE_OPEN=true # 租户开关 -VITE_APP_TENANT_ENABLE=true +VITE_APP_TENANT_ENABLE=false # 验证码的开关 VITE_APP_CAPTCHA_ENABLE=true diff --git a/src/assets/imgs/logo.png b/src/assets/imgs/logo.png index 7e1043f..750496f 100644 Binary files a/src/assets/imgs/logo.png and b/src/assets/imgs/logo.png differ diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 0721651..dfdf13d 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -114,7 +114,7 @@ export default { }, login: { welcome: '欢迎使用本系统', - message: '开箱即用的中后台管理系统', + message: '江苏新元素数字科技有限公司', tenantname: '租户名称', username: '用户名', password: '密码', diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue index e61ccbe..b8c5e57 100644 --- a/src/views/Login/components/LoginForm.vue +++ b/src/views/Login/components/LoginForm.vue @@ -58,9 +58,6 @@ {{ t('login.remember') }} - - {{ t('login.forgetPassword') }} - @@ -82,64 +79,6 @@ mode="pop" @success="handleLogin" /> - - - - - - - - - - - - - - - - {{ t('login.otherLogin') }} - - - - - - - - 萌新必读 - - - - 📚开发指南 - 🔥视频教程 - - ⚡面试手册 - - - 🤝外包咨询 - - - - @@ -158,13 +97,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('') @@ -192,13 +130,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 () => { // 情况一,未开启:则直接登录 @@ -280,42 +211,6 @@ const handleLogin = async (params) => { } } -// 社交登录 -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 - // tricky: type、redirect需要先encode一次,否则钉钉回调会丢失。 - // 配合 Login/SocialLogin.vue#getUrlValue() 使用 - const redirectUri = - location.origin + - '/social-login?' + - encodeURIComponent(`type=${type}&redirect=${redirect.value || '/'}`) - - // 进行跳转 - const res = await LoginApi.socialAuthRedirect(type, encodeURIComponent(redirectUri)) - window.location.href = res - } -} watch( () => currentRoute.value, (route: RouteLocationNormalizedLoaded) => { diff --git a/src/views/Profile/Index.vue b/src/views/Profile/Index.vue index 8e1695b..c92b305 100644 --- a/src/views/Profile/Index.vue +++ b/src/views/Profile/Index.vue @@ -22,9 +22,6 @@ - - - diff --git a/src/views/bpm/category/index.vue b/src/views/bpm/category/index.vue index 46fa6cf..0e11e81 100644 --- a/src/views/bpm/category/index.vue +++ b/src/views/bpm/category/index.vue @@ -1,6 +1,4 @@ - - - - diff --git a/src/views/bpm/form/index.vue b/src/views/bpm/form/index.vue index 3d542c8..0cdf045 100644 --- a/src/views/bpm/form/index.vue +++ b/src/views/bpm/form/index.vue @@ -1,6 +1,4 @@ - - - - - - - - - - + - - - - - - diff --git a/src/views/bpm/processInstance/index.vue b/src/views/bpm/processInstance/index.vue index 7ca07f9..d1af9e8 100644 --- a/src/views/bpm/processInstance/index.vue +++ b/src/views/bpm/processInstance/index.vue @@ -1,6 +1,4 @@ - - - - - -