From 3f82e45fcb685c78445e4369aa112010c2a6c1f1 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 18 Oct 2019 14:36:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=20?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=9A=90=E8=97=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue       | 12 ++++++++----
 src/views/login/loginDesign.vue | 14 +++++++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index da96b73f4..c606c0188 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -49,7 +49,8 @@
             @keyup.enter="handleLogin"
           />
           <span class="show-pwd" @click="showPwd">
-            <svg-icon icon-class="eye" />
+            <svg-icon icon-class="eye" v-if="pwdDisplay"/>
+            <svg-icon icon-class="eye-open" v-else/>
           </span>
         </el-form-item>
         <div class="tip-message">{{ tipsMsg }}</div>
@@ -130,7 +131,8 @@ export default {
 			loadingCode: false,
 			checkLogin: null,
 			checkTimeout: null,
-			scanSuccess: false
+      scanSuccess: false,
+      pwdDisplay:true
 		};
 	},
 	computed: {
@@ -207,10 +209,12 @@ export default {
 			}, 3000);
 		},
 		showPwd() {
-			if (this.pwdType === 'password') {
+      if (this.pwdType === 'password') {
+        this.pwdDisplay=false;
 				this.pwdType = '';
 			} else {
-				this.pwdType = 'password';
+        this.pwdType = 'password';
+        this.pwdDisplay=true;
 			}
 		},
 		handleLogin() {
diff --git a/src/views/login/loginDesign.vue b/src/views/login/loginDesign.vue
index d27c21f7c..3a62fd038 100644
--- a/src/views/login/loginDesign.vue
+++ b/src/views/login/loginDesign.vue
@@ -48,7 +48,8 @@
             @keyup.enter="handleLogin"
           />
           <span class="show-pwd" @click="showPwd">
-            <svg-icon icon-class="eye" />
+            <svg-icon icon-class="eye" v-if="pwdDisplay"/>
+            <svg-icon icon-class="eye-open" v-else/>
           </span>
         </el-form-item>
         <div class="tip-message">{{ tipsMsg }}</div>
@@ -125,7 +126,8 @@ export default {
 			loadingCode: false,
 			checkLogin: null,
 			checkTimeout: null,
-			scanSuccess: false
+      scanSuccess: false,
+      pwdDisplay:true
 		};
 	},
 	mounted() {
@@ -167,13 +169,13 @@ export default {
 
 			// 清空已存在的定时器
 			// 设置定时器检测
-			this.clearTimer(this.checkLogin);
+      this.clearTimer(this.checkLogin);
 			this.checkLogin = setTimeout(() => {
 				checkLoginStatus(self.sessionId).then(response => {
 					setDesignToken(response.data.token);
 					// 设置扫码登录
 					self.$store.dispatch('QrLoginSetting', { key: 'SET_TOKENDESIGN', value: response.data.token }).then(() => {
-						// 清除定时器，设置路由
+            // 清除定时器，设置路由
 						self.clearTimer(self.checkLogin);
 						self.$router.push({ path: '/design/login' });
 						self.$nextTick(() => {
@@ -191,9 +193,11 @@ export default {
 		},
 		showPwd() {
 			if (this.pwdType === 'password') {
+        this.pwdDisplay=false;
 				this.pwdType = '';
 			} else {
-				this.pwdType = 'password';
+        this.pwdType = 'password';
+        this.pwdDisplay=true;
 			}
 		},
 		handleLogin() {