From 546f9efec9864dd6887ca47afb1c5634ce5fc070 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 九月 2023 16:28:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/page/login/index.vue | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/page/login/index.vue b/Source/UBCS-WEB/src/page/login/index.vue
index 6a732cd..1ec9a95 100644
--- a/Source/UBCS-WEB/src/page/login/index.vue
+++ b/Source/UBCS-WEB/src/page/login/index.vue
@@ -12,10 +12,6 @@
<div style="font-size: 15px">
<el-image src="/img/pageLogo.jpeg" style="width: 360px; height: 280px"></el-image>
</div>
-<!-- <div style="font-size: 15px" class="image-container">-->
-<!-- <el-image class="background-image" src="/img/pageLogo.jpeg" ></el-image>-->
-<!-- </div>-->
- <!--<img class="img" src="/img/logo.png" alt="">-->
</div>
<div class="login-border">
<div class="login-main">
@@ -25,12 +21,12 @@
</h4>
<userLogin v-if="activeName==='user'"></userLogin>
<thirdLogin v-else-if="activeName==='third'"></thirdLogin>
- <div class="login-menu">
- <a href="#" @click.stop="activeName='user'">{{ $t('login.userLogin') }}</a>
- <!--<a href="#" @click.stop="activeName='code'">{{ $t('login.phoneLogin') }}</a>-->
- <a href="#" @click.stop="activeName='third'">{{ $t('login.thirdLogin') }}</a>
- <a :href="website.ssoUrl + website.redirectUri">{{ $t('login.ssoLogin') }}</a>
- </div>
+<!-- <div class="login-menu">-->
+<!-- <a href="#" @click.stop="activeName='user'">{{ $t('login.userLogin') }}</a>-->
+<!-- <a href="#" @click.stop="activeName='code'">{{ $t('login.phoneLogin') }}</a>-->
+<!-- <a href="#" @click.stop="activeName='third'">{{ $t('login.thirdLogin') }}</a>-->
+<!-- <a :href="website.ssoUrl + website.redirectUri">{{ $t('login.ssoLogin') }}</a>-->
+<!-- </div>-->
</div>
</div>
--
Gitblit v1.9.3