Compare commits

..

No commits in common. 'nyx_logo_basic' and 'master' have entirely different histories.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 KiB

@ -66,14 +66,14 @@ watch(
]" ]"
to="/" to="/"
> >
<img
class="h-[calc(var(--logo-height)-10px)] w-[calc(var(--logo-height)-10px)]"
src="@/assets/imgs/logo_login.png"
/>
<!-- <img <!-- <img
class="h-[calc(var(--logo-height)-10px)] w-[calc(var(--logo-height)-10px)]" class="h-[calc(var(--logo-height)-10px)] w-[calc(var(--logo-height)-10px)]"
src="@/assets/imgs/maersai_logo.png" src="@/assets/imgs/logo.png"
/> --> /> -->
<img
class="h-[calc(var(--logo-height)-10px)] w-[calc(var(--logo-height)-10px)]"
src="@/assets/imgs/maersai_logo.png"
/>
<div <div
v-if="show" v-if="show"
:class="[ :class="[

@ -20,8 +20,7 @@
tag="div" tag="div"
> >
<!-- <img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg" /> --> <!-- <img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg" /> -->
<!-- <img key="1" alt="" class="w-350px" src="@/assets/imgs/maersai_logo.png" /> --> <img key="1" alt="" class="w-350px" src="@/assets/imgs/maersai_logo.png" />
<img key="1" alt="" class="w-350px" src="@/assets/imgs/logo_login.png" />
<!-- <div key="2" class="text-3xl text-white">{{ t('login.welcome') }}</div> --> <!-- <div key="2" class="text-3xl text-white">{{ 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') }}

@ -184,7 +184,7 @@ const loginData = reactive({
captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE, captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE,
tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE, tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE,
loginForm: { loginForm: {
tenantName: '能翊行云平台', tenantName: '马尔塞云平台',
// username: 'admin', // username: 'admin',
// password: 'admin123', // password: 'admin123',
username: 'maersai', username: 'maersai',

Loading…
Cancel
Save