fix 电子税局登录功能调整

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) => {

jianshui-ui/src/views/digital/taxBureauLogin/index.vue

@@ -33,7 +33,10 @@
                 <el-option v-for="item in dzsjList" :key="item.id" :label="item.yhm" :value="item"></el-option>
               </el-select>
             </div>
-            <div  class="button"><el-button :loading="getQrCodeBtnloading" @click="getQrCodeBtn()" type="primary">获取认证二维码</el-button></div>
+            <div  class="button"><el-button :disabled="isCountingDown" @click="getQrCodeBtn()" type="primary">
+              <span v-if="isCountingDown">获取认证二维码</span>
+              <span v-else>{{ countdown  }}<span>s</span></span>
+            </el-button></div>
           </div>
           <div class="qrcode" ref="qrCodeUrl"></div>
           <div class="qrcodetext" v-show="qrcodeShow">可将二维码图片发给认证人员进行身份认证，手机端完成认证后自动同步认证结果，开展后续数电业务操作。</div>
@@ -116,6 +119,7 @@ export default {
         yzm:''
       },
       zrrList:[],
+      countdown:0,
       zzrdialogVisible:false,
       dxyzm:'',
       zzrlx:'',
@@ -124,7 +128,7 @@ export default {
       rzid:'',
       anewLoginBtnLoading:false,
       getyzmBtnloading:false,
-      getQrCodeBtnloading:false
+      isCountingDown:false
     };
   },
   methods: {
@@ -166,7 +170,9 @@ export default {
           });
         }
         if(data.hxff === "1"){
-          this.postLogin()
+          this.dxyzm = data.dxyzm
+          this.smsFrom.zh = this.form.name.yhm;
+          this.dialogVisible = true;
         }
         if(data.hxff === "2"){
           let list = [];
@@ -180,9 +186,10 @@ export default {
           this.zzrdialogVisible = true;
         }
         if(data.hxff === "3"){
-          this.dxyzm = data.dxyzm
+          this.$message({
-          this.smsFrom.zh = this.form.name.yhm;
+            message: '验证码发送成功',
-          this.dialogVisible = true;
+            type: 'success'
+          });
         }
       }).finally(()=>{
         this.anewLoginBtnLoading = false;
@@ -222,7 +229,20 @@ export default {
     },
     //获取二维码
     getQrCodeBtn(){
-      this.getQrCodeBtnloading = true;
+      if (this.isCountingDown) {
+        return; // 如果正在倒计时，则不执行获取验证码操作
+      }
+      // 在这里执行获取验证码的操作，比如向服务器发送请求
+      // 开始倒计时
+      this.isCountingDown = true;
+      this.timer = setInterval(() => {
+        if (this.countdown > 0) {
+          this.countdown--;
+        } else {
+          // 倒计时结束，重置状态
+          this.isCountingDown = false;
+          this.countdown = 120;
+          clearInterval(this.timer); // 清除定时器
           getRpaQrCodeApi({yhm: this.formQr.name.yhm}).then(({data})=>{
             this.$refs.qrCodeUrl.innerHTML = '';
             let qrcode = new QRCode(this.$refs.qrCodeUrl, {
@@ -239,13 +259,15 @@ export default {
           }).finally(()=>{
             this.getQrCodeBtnloading = false;
           })
+        }
+      }, 1000);
+
     },
     polling(){
       postRpaAuthStatusApi({rzid:this.rzid,yhm:this.formQr.name.yhm}).then(({data})=>{
         window.clearInterval(this.timer);
         this.timer = null
         if(data.slzt === '1' ){
-
           this.timer =  window.setInterval( ()=>{ this.polling()  },3000)
         }
         if(data.slzt === '2' ) {
@@ -295,11 +317,13 @@ export default {
     //height: 30px;
     width: 100%;
   }
+
   width: 100%;
   height: calc(75vh);
   margin-top: 150px;
   display: flex;
   justify-content: center;
+
   #accountLogin {
     width: 400px;
     height: 400px;
@@ -309,28 +333,34 @@ export default {
       font-size: 20px;
       font-weight: 500;
     }
+
     .form {
       margin: 12% 0;
     }
+
     .button {
       display: flex;
       justify-content: center;
     }
   }
+
   #authentication {
     margin-top: -100px;
     width: 500px;
     height: 400px;
+
     .at_title {
       text-align: center;
 
     }
+
     .qrcode {
       width: 100px;
       height: 100px;
       margin: auto;
       margin-top: 40px;
     }
+
     .qrcodetext {
       padding-top: 70px;
       font-size: 12px;
@@ -338,15 +368,19 @@ export default {
       font-weight: 400;
       color: #666;
     }
+
     .at_input {
       margin-top: 40px;
+
       .at_labe {
         line-height: 30px;
         width: 120px;
       }
+
       display: flex;
       height: 40px;
       justify-items: center;
+
       .select {
         margin: 0 10px;
       }
@@ -355,6 +389,7 @@ export default {
 
 
 }
+
 .dialog {
 
   .dialog_title {
@@ -364,6 +399,7 @@ export default {
     margin: auto;
     background: #fff4e3;
     border: 1px solid #e6a23c;
+
     .dialog_text {
 
       margin-left: 10px;
@@ -371,6 +407,7 @@ export default {
       height: 70px;
     }
   }
+
   .dialog_body {
 
     .dialog_body_zh {
@@ -379,28 +416,34 @@ export default {
       align-items: center;
       margin: 20px 0 0 25px;
       height: 40px;
+
       .label {
         width: 90px;
       }
+
       .zh {
         padding-top: 3px;
       }
     }
+
     .dialog_body_yzm {
       height: 40px;
       margin: 20px 0 0 25px;
       display: flex;
       align-items: center;
       height: 40px;
+
       .label {
         width: 90px;
       }
+
       .input {
         margin-right: 20px;
       }
 
     }
   }
+
   .zzr {
     margin-left: 40px;
   }

jianshui-ui/src/views/freedom/taxBureauLogin/index.vue

@@ -56,7 +56,10 @@
       <div class="dialog_body_yzm">
         <div class="label">验证码:</div>
         <div class="input"><el-input v-model="dxyzm" placeholder="请输入验证码"></el-input></div>
-        <div><el-button :loading="getyzmBtnloading"  @click="getyzmBtn()" type="primary">获取验证码</el-button></div>
+        <div><el-button :disabled="getyzmBtnloading"  @click="getyzmBtn()" type="primary">
+          <span v-if="!getyzmBtnloading">获取验证码</span>
+          <span v-else>{{countdown}} <span> s</span></span>
+        </el-button></div>
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -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;
       })
     },
     //重新获取验证码
-    getyzmBtn(){
+   async getyzmBtn(){
-      this.getyzmBtnloading = true;
+      if (this.getyzmBtnloading) {
+        return; // 如果正在倒计时，则不执行获取验证码操作
+      }
+      // 在这里执行获取验证码的操作，比如向服务器发送请求
       this.ffm = '1'
-      rpaLoginApi({yhm:this.form.name.yhm,mm:this.form.name.mm,ffm:this.ffm}).finally(()=>{
+     await rpaLoginApi({yhm:this.form.name.yhm,mm:this.form.name.mm,ffm:this.ffm}).then(({data})=>{
-        this.getyzmBtnloading = false;
+       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;
       }
 
     },

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'
-
+// www.goldentaxcloud.com:8080
-const url = process.env.NODE_ENV === 'development' ? 'http://dev.goldentaxcloud.com:8081' : 'http://dev.goldentaxcloud.com:8081'
+// 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