Merge branch 'main' of http://10.10.14.176:3000/huanghai/dsProject

3 months ago · 4ea837da0a
parent 7efe9d1de0 b55f06da01
commit 4ea837da0a
2 changed files with 6 additions and 7 deletions
--- a/dsBase/WebRoot/login.html
+++ b/dsBase/WebRoot/login.html
@ -115,10 +115,13 @@
                        "captcha": captcha
                    },
                    async: false,
-                    success: function (result) {
+                    success: function (res) {                        
-                        if (result.success) {
+                        if (res.success) {
                            window.location.href = '/dsWeb/index.html';
                        }else{
                            alert(res.msg);
                        }
                    }
                });
            }
--- a/nginx/logs/nginx.pid
+++ b/nginx/logs/nginx.pid
@ -1,5 +1 @@
-<<<<<<< HEAD
+31916
 30772
 =======
 32728
 >>>>>>> 34d4ee5cc4e42d310e2f63abecc3a24461cfdcec