From 85b5e78af73c5f2c7b7e736f7adffeda00b50837 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Tue, 28 Nov 2023 17:45:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Login/updatepsw.vue | 1 +
 src/views/main.vue                 | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/Login/updatepsw.vue b/src/components/Login/updatepsw.vue
index 40e6996..4cc180e 100644
--- a/src/components/Login/updatepsw.vue
+++ b/src/components/Login/updatepsw.vue
@@ -166,6 +166,7 @@ export default {
             console.log(data)
             if (data.status == 200) {
               this.$message.success('密码修改成功')
+              this.$emit('update:loginShow', false)
               this.$router.push('/login')
             } else {
               this.$message.warning(data.msg)
diff --git a/src/views/main.vue b/src/views/main.vue
index 0b22c27..03afead 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -54,10 +54,11 @@
           <span v-if="isLogin" class="logined fsa">
             <div class v-if="loginValue.agencyName == '郑州一才工作' && (loginValue.agencyRole == 2 || loginValue.agencyRole == 1 )">
               <a-dropdown overlayClassName="logindropdown" placement="bottomRight">
-                <div class="mr20">
-                  <svg class="svg_icon f16" aria-hidden="true">
+                <div class="mr20 user-box">
+                  <i class="iconfont icon-xiaoxi"></i>
+                  <!-- <svg class="svg_icon f16 user-box" aria-hidden="true">
                     <use xlink:href="#icon-xiaoxi" />
-                  </svg>
+                  </svg> -->
                 </div>
                 <div class="loginbox" slot="overlay">
                   <router-link to="/systemMsg">
@@ -1120,6 +1121,6 @@ export default {
 
 .user-box:hover{
 	cursor: pointer;
-	color: #ff4400;
+	color: #ff4400 !important;
 }
 </style>