diff --git a/src/components/mdp-ui/mdp-dialog/Index.vue b/src/components/mdp-ui/mdp-dialog/Index.vue index fc12a255..ef608384 100644 --- a/src/components/mdp-ui/mdp-dialog/Index.vue +++ b/src/components/mdp-ui/mdp-dialog/Index.vue @@ -1,10 +1,10 @@ @@ -247,7 +256,7 @@ export default { handleLogin() { this.$refs.loginForm.validate(valid => { - if (valid) { + if (valid) { this.loading = true let params={ displayUserid:this.loginForm.displayUserid, @@ -258,46 +267,45 @@ export default { smsCode:this.loginForm.smsCode, branchId:this.userBranchId, } - var loginParams={ } - if(params.authType=='password_display_userid'){ - loginParams.userloginid=params.displayUserid - loginParams.password=params.password - loginParams.grantType="password" - loginParams.authType='password_display_userid' - //loginParams.deptid=params.deptid - loginParams.branchId=params.branchId - }else if(params.authType=='sms'){ - loginParams.userloginid=params.phoneno - loginParams.password=params.smsCode - loginParams.grantType="password" - loginParams.authType="sms" - //loginParams.deptid=params.deptid - loginParams.branchId=params.branchId - } - this.$store.dispatch("LoginByUserloginid",loginParams).then(res => { - - this.loading = false - if(res.data.tips.isOk==true){ - this.loading = true; - this.$store.dispatch('GetUserInfo').then((res2)=>{ - this.loading = false - if(res2.data.tips.isOk==true){ - this.userDeptid=res2.data.userInfo.deptid - this.rolesChecked(); - }else{ - this.$notify.error(res2.data.tips.msg); - } - - }).catch(err=>{ - console.log(err); - this.loading = false - }); - }else{ - this.$notify.error(res.data.tips.msg); - } - }).catch((e) => { - this.loading = false - }) + var loginParams={ } + if(params.authType=='password_display_userid'){ + loginParams.userloginid=params.displayUserid + loginParams.password=params.password + loginParams.grantType="password" + loginParams.authType='password_display_userid' + //loginParams.deptid=params.deptid + loginParams.branchId=params.branchId + }else if(params.authType=='sms'){ + loginParams.userloginid=params.phoneno + loginParams.password=params.smsCode + loginParams.grantType="password" + loginParams.authType="sms" + //loginParams.deptid=params.deptid + loginParams.branchId=params.branchId + } + this.$store.dispatch("LoginByUserloginid",loginParams).then(res => { + this.loading = false + if(res.data.tips.isOk==true){ + this.loading = true; + this.$store.dispatch('GetUserInfo').then((res2)=>{ + this.loading = false + if(res2.data.tips.isOk==true){ + this.userDeptid=res2.data.userInfo.deptid + this.rolesChecked(); + }else{ + this.$notify.error(res2.data.tips.msg); + } + + }).catch(err=>{ + console.log(err); + this.loading = false + }); + }else{ + this.$notify.error(res.data.tips.msg); + } + }).catch((e) => { + this.loading = false + }) } else { return false } @@ -337,7 +345,7 @@ export default { this.addBranchFormVisible=false; this.handleLogin(); }, - weixinLogin(){ + weixinLogin(){ var curlDomain=window.location.protocol+"//"+window.location.host; // var mdpRedirectUri=curlDomain+"/"+process.env.CONTEXT+"/"+process.env.VERSION+"/" var tpaContext=this.$mdp.getTpaContext(); @@ -363,7 +371,10 @@ export default { }) }, - + doLoginByAction(action){ + this.$refs['starDialog'].close(); + action(); + }, afterQRScan() { // const hash = window.location.hash.slice(1) // const hashObj = getQueryObject(hash) @@ -381,38 +392,39 @@ export default { // this.$router.push({ path: '/' }) // }) // } - }, - loginByShowAccount(){ - this.loading = true - var loginParams={ } - loginParams.userloginid="demo-branch-01" - loginParams.password=md5("888888") - loginParams.grantType="password" - loginParams.authType='password_display_userid' - this.$store.dispatch("LoginByUserloginid",loginParams).then(res => { - - this.loading = false - if(res.data.tips.isOk==true){ - this.loading = true; - this.$store.dispatch('GetUserInfo').then((res2)=>{ - this.loading = false - if(res2.data.tips.isOk==true){ - this.userDeptid=res2.data.userInfo.deptid - this.rolesChecked(); - }else{ - this.$notify.error(res2.data.tips.msg); - } - - }).catch(err=>{ - console.log(err); - this.loading = false - }); - }else{ - this.$notify.error(res.data.tips.msg); - } - }).catch((e) => { - this.loading = false - }) + }, + loginByShowAccount(){ + + this.loading = true + var loginParams={ } + loginParams.userloginid="demo-branch-01" + loginParams.password=md5("888888") + loginParams.grantType="password" + loginParams.authType='password_display_userid' + this.$store.dispatch("LoginByUserloginid",loginParams).then(res => { + + this.loading = false + if(res.data.tips.isOk==true){ + this.loading = true; + this.$store.dispatch('GetUserInfo').then((res2)=>{ + this.loading = false + if(res2.data.tips.isOk==true){ + this.userDeptid=res2.data.userInfo.deptid + this.rolesChecked(); + }else{ + this.$notify.error(res2.data.tips.msg); + } + + }).catch(err=>{ + console.log(err); + this.loading = false + }); + }else{ + this.$notify.error(res.data.tips.msg); + } + }).catch((e) => { + this.loading = false + }) } }, created() {