From 5d5472db5d093c4e9e06b1a846e5ef998dcb7ab1 Mon Sep 17 00:00:00 2001
From: LawyZHENG <lawyzheng1106@gmail.com>
Date: Fri, 19 Mar 2021 16:40:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AC=AC=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A4=B1=E8=B4=A5=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/AccountController.go |  2 +-
 views/account/login.tpl          | 63 +++++++++++++++++---------------
 2 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/controllers/AccountController.go b/controllers/AccountController.go
index 4cfb1e77..57c611b0 100644
--- a/controllers/AccountController.go
+++ b/controllers/AccountController.go
@@ -144,7 +144,7 @@ func (c *AccountController) DingTalkLogin() {
 
 	code := c.GetString("code")
 	if code == "" {
-		c.Redirect(conf.URLFor("AccountController.Login"), 302)
+		c.JsonResult(500, "获取身份信息失败", nil)
 	}
 
 	appKey := beego.AppConfig.String("dingtalk_app_key")
diff --git a/views/account/login.tpl b/views/account/login.tpl
index 7436f2e8..854bef0f 100644
--- a/views/account/login.tpl
+++ b/views/account/login.tpl
@@ -88,40 +88,43 @@
 <script src="{{cdnjs "/static/layer/layer.js"}}" type="text/javascript"></script>
 <script src="{{cdnjs "/static/js/dingtalk-jsapi.js"}}" type="text/javascript"></script>
 <script type="text/javascript">
-    if (dd.env.platform !== "notInDingTalk"){
-        dd.ready(function() {
-            dd.runtime.permission.requestAuthCode({
-                corpId: {{ .corpID }} , // 企业id
-                onSuccess: function (info) {
-                    var index = layer.load(1, {
-                        shade: [0.1, '#fff'] // 0.1 透明度的白色背景
-                    })
+    $(function () {
+        if (dd.env.platform !== "notInDingTalk"){
+            dd.ready(function() {
+                dd.runtime.permission.requestAuthCode({
+                    corpId: {{ .corpID }} , // 企业id
+                    onSuccess: function (info) {
+                        var index = layer.load(1, {
+                            shade: [0.1, '#fff'] // 0.1 透明度的白色背景
+                        })
 
-                    var formData = $("form").serializeArray()
-                    formData.push({"name": "code", "value": info.code})
+                        var formData = $("form").serializeArray()
+                        formData.push({"name": "code", "value": info.code})
 
-                    $.ajax({
-                        url: "{{urlfor "AccountController.DingTalkLogin"}} ",
-                        data: formData,
-                        dataType: "json",
-                        type: "POST",
-                        complete: function(){
-                            layer.close(index)
-                        },
-                        success: function (res) {
-                            if (res.errcode !== 0) {
-                                layer.msg(res.message)
-                            } else {
-                                window.location = "/"
+                        $.ajax({
+                            url: "{{urlfor "AccountController.DingTalkLogin"}} ",
+                            data: formData,
+                            dataType: "json",
+                            type: "POST",
+                            complete: function(){
+                                layer.close(index)
+                            },
+                            success: function (res) {
+                                if (res.errcode !== 0) {
+                                    layer.msg(res.message)
+                                } else {
+                                    window.location = "{{ urlfor "HomeController.Index"  }}"
+                                }
+                            },
+                            error: function (res) {
+                                window.location = "{{ urlfor "HomeController.Index"  }}"
                             }
-                        },
-                        // error: function () {
-                        // }
-                    })
-                }
+                        })
+                    }
+                });
             });
-        });
-    }
+        }
+    })
 
 </script>
 <script type="text/javascript">