fix login page

liutao_branch
chenyuan 1 year ago
parent 81749d9ac2
commit 5101874ef2

@ -20,6 +20,6 @@ VITE_APP_DOCALERT_ENABLE=true
VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc
# 默认账户密码 # 默认账户密码
VITE_APP_DEFAULT_LOGIN_TENANT = 芋道源码 VITE_APP_DEFAULT_LOGIN_TENANT = 内蒙必硕
VITE_APP_DEFAULT_LOGIN_USERNAME = admin VITE_APP_DEFAULT_LOGIN_USERNAME = admin
VITE_APP_DEFAULT_LOGIN_PASSWORD = admin123 VITE_APP_DEFAULT_LOGIN_PASSWORD = admin123

@ -9,7 +9,7 @@
> >
<!-- 左上角的 logo + 系统标题 --> <!-- 左上角的 logo + 系统标题 -->
<div class="relative flex items-center text-white"> <div class="relative flex items-center text-white">
<img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/logo.png" /> <img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/logo.png" width="32"/>
<span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span> <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
</div> </div>
<!-- 左边的背景图 + 欢迎语 --> <!-- 左边的背景图 + 欢迎语 -->
@ -19,8 +19,8 @@
enter-active-class="animate__animated animate__bounceInLeft" enter-active-class="animate__animated animate__bounceInLeft"
tag="div" tag="div"
> >
<img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg" /> <div class="flex items-center justify-center"><img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg"/></div>
<div key="2" class="text-3xl text-white">{{ t('login.welcome') }}</div> <div key="2" class="text-3xl text-white flex items-center justify-center">{{ t('login.welcome') }}</div>
<div key="3" class="mt-5 text-14px font-normal text-white"> <div key="3" class="mt-5 text-14px font-normal text-white">
{{ t('login.message') }} {{ t('login.message') }}
</div> </div>
@ -51,14 +51,14 @@
> >
<!-- 账号登录 --> <!-- 账号登录 -->
<LoginForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" /> <LoginForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
<!-- 手机登录 --> <!-- &lt;!&ndash; 手机登录 &ndash;&gt;-->
<MobileForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" /> <!-- <MobileForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />-->
<!-- 二维码登录 --> <!-- &lt;!&ndash; 二维码登录 &ndash;&gt;-->
<QrCodeForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" /> <!-- <QrCodeForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />-->
<!-- 注册 --> <!-- &lt;!&ndash; 注册 &ndash;&gt;-->
<RegisterForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" /> <!-- <RegisterForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />-->
<!-- 三方登录 --> <!-- &lt;!&ndash; 三方登录 &ndash;&gt;-->
<SSOLoginVue class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" /> <!-- <SSOLoginVue class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />-->
</div> </div>
</Transition> </Transition>
</div> </div>

@ -198,7 +198,7 @@ const loginData = reactive({
captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE !== 'false', captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE !== 'false',
tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false', tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE !== 'false',
loginForm: { loginForm: {
tenantName: '芋道源码', tenantName: '内蒙必硕',
username: 'admin', username: 'admin',
password: 'admin123', password: 'admin123',
captchaVerification: '', captchaVerification: '',

@ -18,6 +18,7 @@
<el-col :span="24" style="padding-right: 10px; padding-left: 10px"> <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName"> <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
<el-input <el-input
disabled
v-model="loginData.loginForm.tenantName" v-model="loginData.loginForm.tenantName"
:placeholder="t('login.tenantNamePlaceholder')" :placeholder="t('login.tenantNamePlaceholder')"
:prefix-icon="iconHouse" :prefix-icon="iconHouse"
@ -82,64 +83,50 @@
mode="pop" mode="pop"
@success="handleLogin" @success="handleLogin"
/> />
<el-col :span="24" style="padding-right: 10px; padding-left: 10px"> <!-- <el-col :span="24" style="padding-right: 10px; padding-left: 10px">-->
<el-form-item> <!-- <el-form-item>-->
<el-row :gutter="5" justify="space-between" style="width: 100%"> <!-- <el-row :gutter="5" justify="space-between" style="width: 100%">-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<XButton <!-- <XButton-->
:title="t('login.btnMobile')" <!-- :title="t('login.btnMobile')"-->
class="w-[100%]" <!-- class="w-[100%]"-->
@click="setLoginState(LoginStateEnum.MOBILE)" <!-- @click="setLoginState(LoginStateEnum.MOBILE)"-->
/> <!-- />-->
</el-col> <!-- </el-col>-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<XButton <!-- <XButton-->
:title="t('login.btnQRCode')" <!-- :title="t('login.btnQRCode')"-->
class="w-[100%]" <!-- class="w-[100%]"-->
@click="setLoginState(LoginStateEnum.QR_CODE)" <!-- @click="setLoginState(LoginStateEnum.QR_CODE)"-->
/> <!-- />-->
</el-col> <!-- </el-col>-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<XButton <!-- <XButton-->
:title="t('login.btnRegister')" <!-- :title="t('login.btnRegister')"-->
class="w-[100%]" <!-- class="w-[100%]"-->
@click="setLoginState(LoginStateEnum.REGISTER)" <!-- @click="setLoginState(LoginStateEnum.REGISTER)"-->
/> <!-- />-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-divider content-position="center">{{ t('login.otherLogin') }}</el-divider> <!-- <el-divider content-position="center">{{ t('login.otherLogin') }}</el-divider>-->
<el-col :span="24" style="padding-right: 10px; padding-left: 10px"> <!-- <el-col :span="24" style="padding-right: 10px; padding-left: 10px">-->
<el-form-item> <!-- <el-form-item>-->
<div class="w-[100%] flex justify-between"> <!-- <div class="w-[100%] flex justify-between">-->
<Icon <!-- <Icon-->
v-for="(item, key) in socialList" <!-- v-for="(item, key) in socialList"-->
:key="key" <!-- :key="key"-->
:icon="item.icon" <!-- :icon="item.icon"-->
:size="30" <!-- :size="30"-->
class="anticon cursor-pointer" <!-- class="anticon cursor-pointer"-->
color="#999" <!-- color="#999"-->
@click="doSocialLogin(item.type)" <!-- @click="doSocialLogin(item.type)"-->
/> <!-- />-->
</div> <!-- </div>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-divider content-position="center">萌新必读</el-divider>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item>
<div class="w-[100%] flex justify-between">
<el-link href="https://doc.iocoder.cn/" target="_blank">📚开发指南</el-link>
<el-link href="https://doc.iocoder.cn/video/" target="_blank">🔥视频教程</el-link>
<el-link href="https://www.iocoder.cn/Interview/good-collection/" target="_blank">
面试手册
</el-link>
<el-link href="http://static.yudao.iocoder.cn/mp/Aix9975.jpeg" target="_blank">
🤝外包咨询
</el-link>
</div>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
</template> </template>

@ -133,7 +133,7 @@ const loginData = reactive({
}, },
loginForm: { loginForm: {
uuid: '', uuid: '',
tenantName: '芋道源码', tenantName: '内蒙必硕',
mobileNumber: '', mobileNumber: '',
code: '' code: ''
} }

Loading…
Cancel
Save