Merge branch 'master' into cyl/dev

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)

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">
@@ -1121,6 +1122,6 @@ export default {
 
 .user-box:hover{
 	cursor: pointer;
-	color: #ff4400;
+	color: #ff4400 !important;
 }
 </style>