From a5fb8026bf6394d8b592f9faf76d289498096380 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Mon, 11 Oct 2021 12:00:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=AF=E7=94=B1=E7=BC=93=E5=AD=98=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=81=E5=88=9D=E6=AC=A1=E7=99=BB=E5=BD=95=E3=80=81?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=86=85=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layouts/TabLayout.vue     |   2 +-
 src/components/tools/UserMenu.vue        |   2 +-
 src/components/tools/UserPassword.vue    | 238 ++++++++++++-----------
 src/defaultSettings.js                   |   2 +-
 src/store/modules/user.js                |  49 +++--
 src/views/system/AccountCenter.vue       |   2 +-
 src/views/user/Login.vue                 |   6 +-
 src/views/user/alteration/Alteration.vue |  22 ++-
 8 files changed, 191 insertions(+), 132 deletions(-)

diff --git a/src/components/layouts/TabLayout.vue b/src/components/layouts/TabLayout.vue
index e13cd7f..0d67841 100644
--- a/src/components/layouts/TabLayout.vue
+++ b/src/components/layouts/TabLayout.vue
@@ -22,7 +22,7 @@
     <div style=" overflow: auto">
       <!-- update-begin-author:taoyan date:20201221 for:此处删掉transition标签 不知道为什么加上后 页面路由切换的时候即1及菜单切到2及菜单的时候 两个菜单页面会同时出现300-500秒左右 -->
       <div>
-        <keep-alive v-if="multipage">
+        <keep-alive v-if="multipage && $route.meta.keepAlive">
           <router-view v-if="reloadFlag"/>
         </keep-alive>
         <template v-else>
diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue
index 7e4c8ad..ea064e4 100644
--- a/src/components/tools/UserMenu.vue
+++ b/src/components/tools/UserMenu.vue
@@ -143,7 +143,7 @@
         })
       },
       updatePassword(){
-        let username = this.userInfo().username
+        let username = this.userInfo().phone
         this.$refs.userPassword.show(username)
       },
       updateCurrentDepart(){
diff --git a/src/components/tools/UserPassword.vue b/src/components/tools/UserPassword.vue
index 4bb0ea1..0100bd1 100644
--- a/src/components/tools/UserPassword.vue
+++ b/src/components/tools/UserPassword.vue
@@ -11,25 +11,26 @@
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
 
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="旧密码">
-          <a-input type="password" placeholder="请输入旧密码" v-decorator="[ 'oldpassword', validatorRules.oldpassword]" />
-        </a-form-item>
+<!--        <a-form-item-->
+<!--          :labelCol="labelCol"-->
+<!--          :wrapperCol="wrapperCol"-->
+<!--          label="旧密码">-->
+<!--          <a-input type="password" placeholder="请输入旧密码" v-decorator="[ 'oldpassword', validatorRules.oldpassword]"/>-->
+<!--        </a-form-item>-->
 
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="新密码">
-          <a-input type="password" placeholder="请输入新密码" v-decorator="[ 'password', validatorRules.password]" />
+          <a-input type="password" placeholder="请输入新密码" v-decorator="[ 'password', validatorRules.password]"/>
         </a-form-item>
 
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="确认新密码">
-          <a-input type="password" @blur="handleConfirmBlur" placeholder="请确认新密码" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
+          <a-input type="password" @blur="handleConfirmBlur" placeholder="请确认新密码"
+                   v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
         </a-form-item>
 
       </a-form>
@@ -39,116 +40,135 @@
 
 <script>
 
-  import { putAction } from '@/api/manage'
+import { putAction } from '@/api/manage'
+import { getRSAPublicKey } from '@api/login'
+import { JSEncrypt } from 'jsencrypt'
 
-  export default {
-    name: 'UserPassword',
-    data () {
-      return {
-        title:'修改密码',
-        modalWidth:800,
-        visible: false,
-        confirmLoading: false,
-        validatorRules:{
-          oldpassword:{
-            rules: [{
-              required: true, message: '请输入旧密码!',
-            }],
-          },
-          password:{
-            rules: [
-              { required: true, message: '请输入新密码!' },
-              { pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/, message: '密码由8位数字、大小写字母和特殊符号组成!'},
-              { validator: this.validateToNextPassword }
-            ]
-          },
-          confirmpassword:{
-            rules: [
-              { required: true, message: '请确认新密码!' },
-              { pattern:/^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/, message: '密码由8位数字、大小写字母和特殊符号组成!'},
-              { validator: this.validateToNextPassword }
-            ]
-          }
-        },
-        confirmDirty:false,
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
+export default {
+  name: 'UserPassword',
+  data() {
+    return {
+      title: '修改密码',
+      modalWidth: 800,
+      visible: false,
+      confirmLoading: false,
+      validatorRules: {
+        // oldpassword: {
+        //   rules: [{
+        //     required: true, message: '请输入旧密码!'
+        //   }]
+        // },
+        password: {
+          rules: [
+            { required: true, message: '请输入新密码!' },
+            {
+              pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
+              message: '密码由8位数字、大小写字母和特殊符号组成!'
+            },
+            { validator: this.validateToNextPassword }
+          ]
         },
+        confirmpassword: {
+          rules: [
+            { required: true, message: '请确认新密码!' },
+            {
+              pattern: /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,./]).{8,}$/,
+              message: '密码由8位数字、大小写字母和特殊符号组成!'
+            },
+            { validator: this.compareToFirstPassword }
+          ]
+        }
+      },
+      confirmDirty: false,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
 
-        form:this.$form.createForm(this),
-        url: 'sys/user/updatePassword',
-        username:'',
+      form: this.$form.createForm(this),
+      url: '/company/changePassword',
+      username: '',
+      rsaPublicKey: '' // 公钥
+    }
+  },
+  methods: {
+    show(uname) {
+      if (!uname) {
+        this.$message.warning('当前系统无登录用户!')
+        return
+      } else {
+        this.username = uname
+        this.form.resetFields()
+        this.getPublicKey()
+        this.visible = true
       }
     },
-    methods: {
-      show(uname){
-        if(!uname){
-          this.$message.warning('当前系统无登录用户!')
-          return
-        }else{
-          this.username = uname
-          this.form.resetFields()
-          this.visible = true
+    handleCancel() {
+      this.close()
+    },
+    close() {
+      this.$emit('close')
+      this.visible = false
+      this.disableSubmit = false
+      this.selectedRole = []
+    },
+    handleOk() {
+      const that = this
+      // 触发表单验证
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          that.confirmLoading = true
+          let encrypt = new JSEncrypt()
+          encrypt.setPublicKey(this.rsaPublicKey)
+          let params = {}
+          params.rsaPublicKey = this.rsaPublicKey
+          params.newPassword = encrypt.encrypt(values.password)
+          params.verifyPassword = encrypt.encrypt(values.confirmpassword)
+          console.log('修改密码提交数据', params)
+          putAction(this.url, params).then((res) => {
+            if (res.success) {
+              console.log(res)
+              that.$message.success(res.message)
+              that.close()
+            } else {
+              that.$message.warning(res.message)
+            }
+          }).finally(() => {
+            that.confirmLoading = false
+          })
         }
-      },
-      handleCancel () {
-        this.close()
-      },
-      close () {
-        this.$emit('close')
-        this.visible = false
-        this.disableSubmit = false
-        this.selectedRole = []
-      },
-      handleOk () {
-        const that = this
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true
-            let params = Object.assign({username:this.username},values)
-            console.log('修改密码提交数据',params)
-            putAction(this.url,params).then((res)=>{
-              if(res.success){
-                console.log(res)
-                that.$message.success(res.message)
-                that.close()
-              }else{
-                that.$message.warning(res.message)
-              }
-            }).finally(() => {
-              that.confirmLoading = false
-            })
-          }
-        })
-      },
-      validateToNextPassword  (rule, value, callback) {
-        const form = this.form
-        if (value && this.confirmDirty) {
-          form.validateFields(['confirm'], { force: true })
-        }
-        callback()
-      },
-      compareToFirstPassword  (rule, value, callback) {
-        const form = this.form
-        if (value && value !== form.getFieldValue('password')) {
-          callback('两次输入的密码不一样！')
-        } else {
-          callback()
-        }
-      },
-      handleConfirmBlur  (e) {
-        const value = e.target.value
-        this.confirmDirty = this.confirmDirty || !!value
+      })
+    },
+    validateToNextPassword(rule, value, callback) {
+      const form = this.form
+      if (value && this.confirmDirty) {
+        form.validateFields(['confirm'], { force: true })
       }
-
+      callback()
+    },
+    compareToFirstPassword(rule, value, callback) {
+      const form = this.form
+      if (value && value !== form.getFieldValue('password')) {
+        callback('两次输入的密码不一样！')
+      } else {
+        callback()
+      }
+    },
+    handleConfirmBlur(e) {
+      const value = e.target.value
+      this.confirmDirty = this.confirmDirty || !!value
+    },
+    getPublicKey() {
+      getRSAPublicKey().then(res => {
+        this.rsaPublicKey = res.result
+      })
     }
   }
+}
 </script>
 
 <style scoped>
diff --git a/src/defaultSettings.js b/src/defaultSettings.js
index 91046db..c02f658 100644
--- a/src/defaultSettings.js
+++ b/src/defaultSettings.js
@@ -22,7 +22,7 @@ export default {
   fixSiderbar: false, // sticky siderbar
   autoHideHeader: false, //  auto hide header
   colorWeak: false,
-  multipage: false, //默认多页签模式
+  multipage: true, //默认多页签模式
   // vue-ls options
   storageOptions: {
     namespace: 'pro__', // key prefix
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index bc539f1..32840b7 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -103,17 +103,22 @@ const user = {
       return new Promise((resolve, reject) => {
         phoneLogin(userInfo).then(response => {
           if (response.code == '200') {
-            const result = response.result
-            const userInfo = result.userInfo
-            Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
-            Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
-            Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
-            Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000)
-            commit('SET_TOKEN', result.token)
-            commit('SET_INFO', userInfo)
-            commit('SET_NAME', { username: userInfo.username, realname: userInfo.realname, welcome: welcome() })
-            commit('SET_AVATAR', userInfo.avatar)
-            resolve(response)
+            // 初次登录需要跳转至修改密码，不存用户信息
+            if (response.message === 'updatePassword') {
+              resolve(response)
+            } else {
+              const result = response.result
+              const userInfo = result.userInfo
+              Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
+              Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
+              Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
+              Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000)
+              commit('SET_TOKEN', result.token)
+              commit('SET_INFO', userInfo)
+              commit('SET_NAME', { username: userInfo.username, realname: userInfo.realname, welcome: welcome() })
+              commit('SET_AVATAR', userInfo.avatar)
+              resolve(response)
+            }
           } else {
             reject(response)
           }
@@ -122,6 +127,28 @@ const user = {
         })
       })
     },
+    /**
+     * 初次手机号登录，修改密码后再存用户信息
+     * @param commit
+     * @param userInfo
+     * @returns {Promise<unknown>}
+     * @constructor
+     */
+    FirstPhoneLogin({ commit }, loginUserInfo) {
+      return new Promise((resolve, reject) => {
+        const result = loginUserInfo.result
+        const userInfo = result.userInfo
+        Vue.ls.set(ACCESS_TOKEN, result.token, 7 * 24 * 60 * 60 * 1000)
+        Vue.ls.set(USER_NAME, userInfo.username, 7 * 24 * 60 * 60 * 1000)
+        Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
+        Vue.ls.set(UI_CACHE_DB_DICT_DATA, result.sysAllDictItems, 7 * 24 * 60 * 60 * 1000)
+        commit('SET_TOKEN', result.token)
+        commit('SET_INFO', userInfo)
+        commit('SET_NAME', { username: userInfo.username, realname: userInfo.realname, welcome: welcome() })
+        commit('SET_AVATAR', userInfo.avatar)
+        resolve(loginUserInfo)
+      })
+    },
     // 获取用户信息
     GetPermissionList({ commit }) {
       return new Promise((resolve, reject) => {
diff --git a/src/views/system/AccountCenter.vue b/src/views/system/AccountCenter.vue
index 7f935e0..2fb4e25 100644
--- a/src/views/system/AccountCenter.vue
+++ b/src/views/system/AccountCenter.vue
@@ -70,7 +70,7 @@ export default {
             canEdit: true
           }, {
             title: '性别',
-            fieldName: 'gender',
+            fieldName: 'gender_dictText',
             canEdit: true
           }
         ], [
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index fbaa0c9..ac220f5 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -150,10 +150,11 @@ import { mapActions } from 'vuex'
 import { timeFix } from '@/utils/util'
 import Vue from 'vue'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
-import { postAction, getAction } from '@/api/manage'
+import {  getAction } from '@/api/manage'
 import { getRSAPublicKey } from '@/api/login.js'
 import { JSEncrypt } from 'jsencrypt'
 import { phoneReg } from '@/utils/validate'
+import { phoneLogin } from '@/api/login.js'
 
 export default {
   components: {},
@@ -253,7 +254,7 @@ export default {
             httpFunction = that.Login
           }
           httpFunction(loginParams).then((response) => {
-            if (response.message.indexOf('updatePassword') > -1) {
+            if (response.message === 'updatePassword') {
               this.$notification['error']({
                 message: '设置密码',
                 description: '初次登录需要设置密码',
@@ -263,6 +264,7 @@ export default {
                 path: '/user/alteration',
                 query: {
                   isFirstLogin: 'true',
+                  userInfo: JSON.stringify(response)
                 }
               })
             } else {
diff --git a/src/views/user/alteration/Alteration.vue b/src/views/user/alteration/Alteration.vue
index 1f29b6c..b227610 100644
--- a/src/views/user/alteration/Alteration.vue
+++ b/src/views/user/alteration/Alteration.vue
@@ -36,6 +36,7 @@
                 <a-input
                   v-decorator="['captcha', { rules: validatorRules.captcha.rules}]"
                   type="text"
+                  autocomplete="off"
                   placeholder="验证码">
                 </a-input>
                 <a-button
@@ -100,6 +101,8 @@ import { getAction, postAction } from '@/api/manage'
 import { getRSAPublicKey } from '@api/login'
 import { JSEncrypt } from 'jsencrypt'
 import { timeFix } from '@/utils/util'
+import { mapActions } from 'vuex'
+
 
 export default {
   name: 'Alteration',
@@ -144,6 +147,7 @@ export default {
     }
   },
   methods: {
+    ...mapActions(['FirstPhoneLogin']),
     submit() {
       let that = this
       that.loading = true
@@ -162,12 +166,18 @@ export default {
             if (res.success) {
               that.loading = false
               if (this.$route.query.isFirstLogin === 'true') {
-                // 进入首页
-                this.$router.push({ path: '/' }).catch(() => {
-                })
-                this.$notification.success({
-                  message: '欢迎',
-                  description: `${ timeFix() }，欢迎回来`
+                let loginResponse = JSON.parse(that.$route.query.userInfo)
+                that.FirstPhoneLogin(loginResponse).then(res => {
+                  if (res.code === 200) {
+                    that.FirstPhoneLogin(loginResponse)
+                    // 进入首页
+                    this.$router.push({ path: '/' }).catch(() => {
+                    })
+                    this.$notification.success({
+                      message: '欢迎',
+                      description: `${ timeFix() }，欢迎回来`
+                    })
+                  }
                 })
               } else {
                 that.$router.go(-1)