Merge branch 'liuxin' into develop

src/pages/login.vue

@@ -53,8 +53,8 @@ export default {
       this.pwdType = this.pwdType === 'password' ? 'text' : 'password'
       this.openEye =
         this.pwdType === 'password'
-          ? require('@/assets/login/passNoShow.png')
-          : require('@/assets/login/passShow.png')
+          ? require('@/assets/login/pwd.png')
+          : require('@/assets/login/pwd-show.png')
     },
     login: function () {
       let vm = this