From 138287b1d4d8072e6805d6178c115c710fc0b056 Mon Sep 17 00:00:00 2001 From: "zhaoxingchang.sd" Date: Mon, 6 May 2024 13:49:43 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E7=94=B5=E5=AD=90=E7=A8=8E=E5=B1=80?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jianshui-ui/src/permission.js | 2 +- .../views/digital/taxBureauLogin/index.vue | 385 ++++++++++-------- .../views/freedom/taxBureauLogin/index.vue | 56 ++- jianshui-ui/vue.config.js | 6 +- 4 files changed, 260 insertions(+), 189 deletions(-) diff --git a/jianshui-ui/src/permission.js b/jianshui-ui/src/permission.js index f1080b2..0aa1796 100644 --- a/jianshui-ui/src/permission.js +++ b/jianshui-ui/src/permission.js @@ -7,7 +7,7 @@ import { getToken } from '@/utils/auth' NProgress.configure({ showSpinner: false }) -const whiteList = ['/login', '/auth-redirect', '/bind', '/taxBureauLogin' +const whiteList = ['/login', '/auth-redirect', '/bind', '/taxBureauLogin','/authNew' , '/register', '/auth', '/XA', '/sdFile/*'] router.beforeEach((to, from, next) => { diff --git a/jianshui-ui/src/views/digital/taxBureauLogin/index.vue b/jianshui-ui/src/views/digital/taxBureauLogin/index.vue index f355e2b..94cf9b6 100644 --- a/jianshui-ui/src/views/digital/taxBureauLogin/index.vue +++ b/jianshui-ui/src/views/digital/taxBureauLogin/index.vue @@ -1,30 +1,30 @@ diff --git a/jianshui-ui/src/views/freedom/taxBureauLogin/index.vue b/jianshui-ui/src/views/freedom/taxBureauLogin/index.vue index 163e9a8..dd19aaa 100644 --- a/jianshui-ui/src/views/freedom/taxBureauLogin/index.vue +++ b/jianshui-ui/src/views/freedom/taxBureauLogin/index.vue @@ -56,7 +56,10 @@
验证码:
-
获取验证码
+
+ 获取验证码 + {{countdown}} s +
@@ -124,7 +127,9 @@ export default { rzid:'', anewLoginBtnLoading:false, getyzmBtnloading:false, - getQrCodeBtnloading:false + getQrCodeBtnloading:false, + countdown:60, + timec: null, // 定时器 }; }, methods: { @@ -164,9 +169,13 @@ export default { message: '登录成功', type: 'success' }); + this.dialogVisible = false; } if(data.hxff === "1"){ - this.postLogin() + this.dxyzm = data.dxyzm + this.ffm = '3' + this.smsFrom.zh = this.form.name.yhm; + this.dialogVisible = true; } if(data.hxff === "2"){ let list = []; @@ -179,22 +188,40 @@ export default { } this.zzrdialogVisible = true; } - if(data.hxff === "3"){ - this.dxyzm = data.dxyzm - this.smsFrom.zh = this.form.name.yhm; - this.dialogVisible = true; - } }).finally(()=>{ - this.anewLoginBtnLoading = false; + this.anewLoginBtnLoading = false; }) }, //重新获取验证码 - getyzmBtn(){ - this.getyzmBtnloading = true; + async getyzmBtn(){ + if (this.getyzmBtnloading) { + return; // 如果正在倒计时,则不执行获取验证码操作 + } + // 在这里执行获取验证码的操作,比如向服务器发送请求 this.ffm = '1' - rpaLoginApi({yhm:this.form.name.yhm,mm:this.form.name.mm,ffm:this.ffm}).finally(()=>{ - this.getyzmBtnloading = false; - }) + await rpaLoginApi({yhm:this.form.name.yhm,mm:this.form.name.mm,ffm:this.ffm}).then(({data})=>{ + if(data.hxff === "3"){ + this.ffm = data.hxff + this.$message({ + message: '验证码发送成功', + type: 'success' + }); + } + }) + // 开始倒计时 + this.getyzmBtnloading = true; + this.timec = setInterval(() => { + if (this.countdown > 0) { + this.countdown--; + } else { + // 倒计时结束,重置状态 + this.getyzmBtnloading = false; + this.countdown = 60; + clearInterval(this.timec); // 清除定时器 + } + }, 1000); + + }, yzmloginBtn(){ if(!this.dxyzm){ @@ -204,7 +231,6 @@ export default { }); }else { this.postLogin() - this.dialogVisible = false; } }, diff --git a/jianshui-ui/vue.config.js b/jianshui-ui/vue.config.js index 4996cda..3555f9c 100644 --- a/jianshui-ui/vue.config.js +++ b/jianshui-ui/vue.config.js @@ -10,8 +10,10 @@ const name = process.env.VUE_APP_TITLE || '简税平台管理系统' // 网页 const port = process.env.port || process.env.npm_config_port || 8088 // 端口 // 'http://dev.goldentaxcloud.com:8081' - -const url = process.env.NODE_ENV === 'development' ? 'http://dev.goldentaxcloud.com:8081' : 'http://dev.goldentaxcloud.com:8081' +// www.goldentaxcloud.com:8080 +// let development = 'http://dev.goldentaxcloud.com:8081' +let development = 'www.goldentaxcloud.com:8080' +const url = process.env.NODE_ENV === 'development' ? development : development // vue.config.js 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions