From e5b651ff5b89a3332421c6fc8d85c6cda27b0aa9 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 15 Aug 2023 10:16:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jianshui-ui/src/api/freedom/login.js    |  3 ++-
 jianshui-ui/src/views/freedom/login.vue | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/jianshui-ui/src/api/freedom/login.js b/jianshui-ui/src/api/freedom/login.js
index 6555d06..080847a 100644
--- a/jianshui-ui/src/api/freedom/login.js
+++ b/jianshui-ui/src/api/freedom/login.js
@@ -5,7 +5,8 @@ export function login(data) {
   return request({
     url: '/api/invoice_all/v1/qdLogin',
     method: 'post',
-    data: data
+    data: data,
+    timeout : 60000
   })
 }
 
diff --git a/jianshui-ui/src/views/freedom/login.vue b/jianshui-ui/src/views/freedom/login.vue
index 4ff5e3a..c7e62f1 100644
--- a/jianshui-ui/src/views/freedom/login.vue
+++ b/jianshui-ui/src/views/freedom/login.vue
@@ -96,9 +96,9 @@
 </template>
 
 <script>
-  import {freedomLogin,submitNote} from "@/api/freedom/login";
+  import {login,submitNote} from "@/api/freedom/login";
   export default {
-    name: "login",
+    name: "Login",
     data() {
       let checkedFn = (rule, value, callback) => {
         if (!value) {
@@ -149,8 +149,8 @@
             { required: true, message: '请输入个人密码', trigger: 'blur' }
           ],
           checked: [
-            // { validator: checkedFn, trigger: "change" }
-            {  type: 'array', required: true, message: '请勾选同意协议', trigger: 'change' }
+            { validator: checkedFn, trigger: "change" }
+            // {  type: 'array', required: true, message: '请勾选同意协议', trigger: 'change' }
           ]
         }
       };
@@ -159,11 +159,11 @@
       submitForm(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
-            alert('submit!');
-            this.ruleForm.dlsfmm = this.ruleForm.gsnsmm;
-            this.ruleForm.bsryxz = this.ruleForm.zjh;
-            this.ruleForm.gsnsyhm = this.ruleForm.zjh;
-            freedomLogin(this.ruleForm).then(res=>{
+            // alert('submit!');
+            this.ruleForm.nsrInfo.dlsfmm = this.ruleForm.nsrInfo.gsnsmm;
+            this.ruleForm.nsrInfo.bsryxz = this.ruleForm.nsrInfo.zjh;
+            this.ruleForm.nsrInfo.gsnsyhm = this.ruleForm.nsrInfo.zjh;
+            login(this.ruleForm).then(res=>{
               if (res.code == 200){
                 this.ruleForm.traceno = res.msg;
                 this.ruleForm.show = false;