Merge branch 'dev'

update login page Icon

src/page/index/top/top-lang.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dropdown trigger="click"
                @command="handleSetLanguage">
-    <img src="@/../public/img/bg/login_CnEn.png" alt="">
+    <img :src="require(`@/../public/img/bg/login_CnEn-${changeIcon}.png`)" alt="">
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item :disabled="language==='zh'"
                         command="zh">中文
@@ -19,7 +19,9 @@
   export default {
     name: "top-lang",
     data() {
-      return {};
+      return {
+        changeIcon: 1
+      };
     },
     created() {
     },
@@ -31,6 +33,7 @@
     props: [],
     methods: {
       handleSetLanguage(lang) {
+        this.changeIcon = (this.changeIcon === 1 ? 2 : 1)
         this.$i18n.locale = lang;
         this.$store.commit("SET_LANGUAGE", lang);
         let tag = this.tag;

src/page/login/userlogin.vue

@@ -30,14 +30,14 @@
                 auto-complete="off"
                 :placeholder="$t('login.password')">
         <img slot="prefix" src="@/../public/img/bg/login_box_inputIcon3.png" alt="">
-        <img
+<!--        <img
           slot="suffix"
           style="margin-right: 16px"
           src="@/../public/img/bg/login_box_inputIcon5.png"
-          @click="showPassword" alt="">
+          @click="showPassword" alt="">-->
         <img
           slot="suffix"
-          src="@/../public/img/bg/login_box_inputIcon6.png"
+          :src="require(`@/../public/img/bg/login_box_inputIcon6-${pwdIcon}.png`)"
           @click="showPassword" alt="">
       </el-input>
     </el-form-item>
@@ -82,6 +82,7 @@
     name: "userlogin",
     data() {
       return {
+        pwdIcon: 1,
         tenantMode: this.website.tenantMode,
         loginForm: {
           //租户ID
@@ -206,6 +207,7 @@
         }
       },
       showPassword() {
+        this.pwdIcon = (this.pwdIcon === 1 ? 2 : 1)
         this.passwordType === ""
           ? (this.passwordType = "password")
           : (this.passwordType = "");

src/styles/login.scss

@@ -1,7 +1,9 @@
 .login-container {
-  width: 100%;
-  height: 100%;
-  display: block;
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  justify-content: center;
+  align-items: center;
   background: linear-gradient(to right, #06D2FF, #6F2BFF);
 }
 
@@ -9,7 +11,6 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  padding-top: 240px;
   .login-bg {
     position: relative;
     .title-box {