From 9687eb51263b8ed71d8636d766bc27d826b9033d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 十二月 2023 12:14:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/page/login/userlogin.vue | 4 ++--
Source/UBCS-WEB/src/page/index/logo.vue | 13 +++++++------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/page/index/logo.vue b/Source/UBCS-WEB/src/page/index/logo.vue
index c5226c7..059fb32 100644
--- a/Source/UBCS-WEB/src/page/index/logo.vue
+++ b/Source/UBCS-WEB/src/page/index/logo.vue
@@ -3,18 +3,18 @@
<transition name="fade">
<span v-if="keyCollapse"
key="0">
- <img src="favicon.png" class="logimg">
+ <img class="logimg" src="favicon.png">
</span>
</transition>
<transition-group name="fade">
<template v-if="!keyCollapse">
<span>
- <img class="imgSpan" :src=imgurl>
+ <img :src=imgurl class="imgSpan">
</span>
- <span class="avue-logo_title"
- key="1">
+ <span key="1"
+ class="avue-logo_title">
<span>
- <img class="imgSpan" :src=imgurl>
+ <img :src=imgurl class="imgSpan">
</span>
<span style="font-size: 17px;margin-left: 27px">缂栫爜璧勬簮绠＄悊绯荤粺</span>
</span>
@@ -93,7 +93,8 @@
top: 15px;
left: 26px;
}
-.logimg{
+
+.logimg {
position: absolute;
top: 20px;
left: 12px;
diff --git a/Source/UBCS-WEB/src/page/login/userlogin.vue b/Source/UBCS-WEB/src/page/login/userlogin.vue
index e9bc45f..4655672 100644
--- a/Source/UBCS-WEB/src/page/login/userlogin.vue
+++ b/Source/UBCS-WEB/src/page/login/userlogin.vue
@@ -74,7 +74,7 @@
import {mapGetters} from "vuex";
import {info} from "@/api/system/tenant";
import {getTopUrl} from "@/util/util";
-import { updatePassword} from "@/api/system/user.js"
+import {updatePassword} from "@/api/system/user.js"
import {removeToken} from "@/util/auth";
import md5 from "js-md5";
@@ -300,7 +300,7 @@
methods: {
//鍗曠偣鐧诲綍璺宠浆
ChandleLogin() {
- this.$router.push({ path: '/sso' });
+ this.$router.push({path: '/sso'});
},
closehandle() {
removeToken()
--
Gitblit v1.9.3