调整登录和注册的逻辑

jshERP-web/src/store/modules/user.js

@@ -77,7 +77,9 @@ const user = {
             }
             commit('SET_INFO', userInfo)
             resolve(response)
-          }else{
+          } else if(response.code == 500010 || response.code == 500011){
+            resolve(response)
+          } else{
             reject(response)
           }
         }).catch(error => {

jshERP-web/src/views/user/Login.vue

@@ -122,7 +122,7 @@
         currentUsername:"",
         validate_status:"",
         currdatetime:'',
-        randCode:'',
+        uuid:'',
         randCodeImage:'',
         registerFlag:'',
         requestCodeSuccess:false,
@@ -176,11 +176,10 @@
         this.checked = e.target.checked
       },
       handleChangeCheckCode(){
-        this.currdatetime = new Date().getTime();
+        getAction('/user/randomImage').then(res=>{
-        getAction(`/user/randomImage/${this.currdatetime}`).then(res=>{
           if(res.code == 200){
-            this.randCode = res.data.codeNum;
+            this.uuid = res.data.uuid
-            this.randCodeImage = res.data.base64;
+            this.randCodeImage = res.data.base64
             this.requestCodeSuccess=true
           }else{
             this.$message.error(res.data)
@@ -198,31 +197,24 @@
         if (that.customActiveKey === 'tab1') {
           that.form.validateFields([ 'loginName', 'password', 'inputCode' ], { force: true }, (err, values) => {
             if (!err) {
-              if(values.inputCode === this.randCode) {
+              loginParams.loginName = values.loginName
-                loginParams.loginName = values.loginName
+              loginParams.password = md5(values.password)
-                loginParams.password = md5(values.password)
+              loginParams.code = values.inputCode
-                if(that.checked) {
+              loginParams.uuid = that.uuid
-                  //勾选的时候进行缓存
+              if(that.checked) {
-                  Vue.ls.set('cache_loginName', values.loginName)
+                //勾选的时候进行缓存
-                  Vue.ls.set('cache_password', values.password)
+                Vue.ls.set('cache_loginName', values.loginName)
-                } else {
+                Vue.ls.set('cache_password', values.password)
-                  //没勾选的时候清缓存
-                  Vue.ls.remove('cache_loginName')
-                  Vue.ls.remove('cache_password')
-                }
-                that.Login(loginParams).then((res) => {
-                  this.departConfirm(res, loginParams.loginName)
-                }).catch((err) => {
-                  that.requestFailed(err);
-                });
               } else {
-                this.$notification['error']({
+                //没勾选的时候清缓存
-                  message: "提示",
+                Vue.ls.remove('cache_loginName')
-                  description: "验证码错误",
+                Vue.ls.remove('cache_password')
-                  duration: 2
-                });
-                this.loginBtn = false
               }
+              that.Login(loginParams).then((res) => {
+                this.departConfirm(res, loginParams.loginName)
+              }).catch((err) => {
+                that.requestFailed(err);
+              })
             }else {
               that.loginBtn = false;
             }
@@ -280,10 +272,13 @@
       requestFailed (err) {
         this.$notification[ 'error' ]({
           message: '登录失败',
-          description: ((err.response || {}).data || {}).message || err.message || "请求出现错误，请稍后再试",
+          description: ((err.response || {}).data || {}).message || err.message || err.data.message || "请求出现错误，请稍后再试",
           duration: 4,
         });
         this.loginBtn = false;
+        //验证码刷新
+        this.form.setFieldsValue({'inputCode':''})
+        this.handleChangeCheckCode()
       },
       generateCode(value){
         this.verifiedCode = value.toLowerCase()
@@ -322,7 +317,7 @@
             this.requestFailed(err)
             this.Logout();
           }
-        }else{
+        } else{
           this.requestFailed(res)
           this.Logout();
         }

jshERP-web/src/views/user/Register.vue

@@ -109,7 +109,7 @@
         systemTitle: window.SYS_TITLE,
         systemUrl: window.SYS_URL,
         form: null,
-        randCode:'',
+        uuid:'',
         randCodeImage:'',
         requestCodeSuccess:false,
         state: {
@@ -140,9 +140,9 @@
     methods: {
       handleChangeCheckCode(){
         this.currdatetime = new Date().getTime();
-        getAction(`/user/randomImage/${this.currdatetime}`).then(res=>{
+        getAction('/user/randomImage').then(res=>{
           if(res.code == 200){
-            this.randCode = res.data.codeNum;
+            this.uuid = res.data.uuid;
             this.randCodeImage = res.data.base64;
             this.requestCodeSuccess=true
           }else{
@@ -219,44 +219,40 @@
         that.registerBtn = true;
         this.form.validateFields((err, values) => {
           if (!err) {
-            if(values.inputCode === this.randCode) {
+            let register = {
-              let register = {
+              loginName: values.username,
-                loginName: values.username,
+              password: md5(values.password),
-                password: md5(values.password)
+              code: values.inputCode,
-              };
+              uuid: that.uuid
-              postAction("/user/registerUser", register).then((res) => {
+            };
-                if(res.code === 200){
+            postAction("/user/registerUser", register).then((res) => {
-                  this.$notification.success({
+              if(res.code === 200){
-                    message: '提示',
+                this.$notification.success({
-                    description: "注册成功，请使用该租户登录！",
+                  message: '提示',
-                    duration: 5
+                  description: "注册成功，请使用该租户登录！",
-                  });
+                  duration: 5
-                  let that = this;
+                });
-                  setTimeout(function () {
+                let that = this;
-                    that.$router.push({ name: "login", params:{
+                setTimeout(function () {
-                        loginName: register.loginName
+                  that.$router.push({ name: "login", params:{
-                      }
+                      loginName: register.loginName
-                    })
+                    }
-                  },2000);
+                  })
-                } else {
+                },2000);
-                  this.$notification['error']({
+              } else {
-                    message: "提示",
+                this.$notification['error']({
-                    description: res.data.message || "注册失败",
+                  message: "提示",
-                    duration: 2
+                  description: res.data.message || "注册失败",
-                  });
+                  duration: 2
-                  that.registerBtn = false
+                });
-                }
+                that.registerBtn = false
-              }).catch((err) => {
+                //验证码刷新
-                that.requestFailed(err);
+                this.form.setFieldsValue({'inputCode':''})
-              })
+                this.handleChangeCheckCode()
-            } else {
+              }
-              this.$notification['error']({
+            }).catch((err) => {
-                message: "提示",
+              that.requestFailed(err);
-                description: "验证码错误",
+            })
-                duration: 2
-              });
-              that.registerBtn = false
-            }
           } else {
             that.registerBtn = false
           }