Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/lang/zh.js

@@ -3,6 +3,7 @@ export default {
   tip: '提示',
   title: 'WinSea企业级开发平台',
   logoutTip: '退出系统, 是否继续?',
+  logoutTip1: '账号密码修改之后，需要重新登录，是否跳转到登录页?',
   submitText: '确定',
   cancelText: '取消',
   search: '请输入搜索内容',

src/layout/index/top/index.vue

@@ -761,9 +761,23 @@
             }
             changePasswordByPwd(data)
               .toPromise()
-              .then(() => {
+              .then(async() => {
                 EventBus.$emit('success', this.$t('message.updateMessage'))
                 this.passwordFlag = false
+
+                  localStorage.removeItem('ws-pf_roleName')
+                  localStorage.removeItem('ws-pf_roleId')
+                  localStorage.removeItem('ws-pf_staffName')
+                  localStorage.removeItem('ws-pf_deptId')
+                  localStorage.removeItem('ws-pf_deptName')
+                  localStorage.removeItem('ws-pf_organMonetaryKey')
+                  localStorage.removeItem('ws-pf_organMonetaryValue')
+                  localStorage.removeItem('ws-pf_vessels')
+                  localStorage.removeItem('ws-pf_isLandBasedFlag')
+                  await this.$store.dispatch('user/logout')
+                  this.$router.push(
+                    process.env.VUE_APP_PACKAGE_ENV === 'ship' ? '/ship_login' : '/login'
+                  ) 
               })
           } else {
             EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
@@ -907,7 +921,7 @@
   }
 
   .input-Style {
-    opacity: 1;
+    opacity: 0;
     margin-right: 20px;
     // visibility: hidden;
   }

src/views/login/index.vue

@@ -333,13 +333,13 @@
       topColor,
     },
     data() {
-      const validPasswordRule = (rule, value, callback) => {
-        if (!validPassword(value)) {
-          callback(new Error(this.$t('login.verification01')))
-        } else {
-          callback()
-        }
-      }
+      // const validPasswordRule = (rule, value, callback) => {
+      //   if (!validPassword(value)) {
+      //     callback(new Error(this.$t('login.verification01')))
+      //   } else {
+      //     callback()
+      //   }
+      // }
       const validPasswordRule2 = (rule, value, callback) => {
         if (value === '') {
           callback(new Error(this.$t('login.verification02')))
@@ -403,18 +403,18 @@
             trigger: 'blur',
             validator: validUserCellPhoneRule.bind(this),
           }, ],
-          password: [{
-            required: true,
-            trigger: 'blur',
-            validator: validPasswordRule,
-            // validator: validPasswordRule4.bind(this)
-          }, ],
-          confirmPassword: [{
-            required: true,
-            trigger: 'blur',
-            validator: validPasswordRule,
-            // validator: validPasswordRule3.bind(this)
-          }, ],
+          // password: [{
+          //   required: true,
+          //   trigger: 'blur',
+          //   validator: validPasswordRule,
+          //   // validator: validPasswordRule4.bind(this)
+          // }, ],
+          // confirmPassword: [{
+          //   required: true,
+          //   trigger: 'blur',
+          //   validator: validPasswordRule,
+          //   // validator: validPasswordRule3.bind(this)
+          // }, ],
           veriCode: [{
             required: true,
             trigger: 'blur',
@@ -485,11 +485,11 @@
             trigger: 'blur',
             validator: validUserVeriCodeRule,
           }, ],
-          password: [{
-            required: true,
-            trigger: 'blur',
-            validator: validPasswordRule,
-          }, ],
+          // password: [{
+          //   required: true,
+          //   trigger: 'blur',
+          //   validator: validPasswordRule,
+          // }, ],
           againPassword: [{
             required: true,
             trigger: 'blur',
@@ -502,12 +502,12 @@
             message: this.$t('login.verification06'),
             trigger: 'change',
           }, ],
-          password: [{
-            required: true,
-            trigger: 'change',
-            validator: validPasswordRule,
-            // validator: validPasswordRule4.bind(this)
-          }, ],
+          // password: [{
+          //   required: true,
+          //   trigger: 'change',
+          //   validator: validPasswordRule,
+          //   // validator: validPasswordRule4.bind(this)
+          // }, ],
           companyName: {
             required: true,
             message: this.$t('login.verification08'),
@@ -819,6 +819,7 @@
       },
       handleLogin() {
         this.$refs.loginForm.validate(async (valid) => {
+          console.log(valid)
           if (valid) {
             const res = await this.login(this.loginForm)
             localStorage.setItem('ws_login_type', 2)