'commit'

3 months ago · 1389fcbfac
parent 7edbd62e46 fc86a3a0a1
commit 1389fcbfac
2 changed files with 5 additions and 7 deletions
--- a/dsBase/WebRoot/login.html
+++ b/dsBase/WebRoot/login.html
@ -117,13 +117,7 @@
                    async: false,
                    success: function (result) {
                        if (result.success) {
-                            window.location.href = '/dsBase/index.html';
-                        } else {
-                            alert(result.msg);
-                            if (result.redirect) {
-                                window.location.href = '/dsBase/plogin.html';
-                            }
-                            refreshCaptcha();
+                            window.location.href = '/dsWeb/index.html';
                        }
                    }
                });
--- a/nginx/logs/nginx.pid
+++ b/nginx/logs/nginx.pid
@ -1 +1,5 @@
+<<<<<<< HEAD
+30772
+=======
 32728
+>>>>>>> 34d4ee5cc4e42d310e2f63abecc3a24461cfdcec