From a284c82767ba9f0121e7f1ed031b701544a9de97 Mon Sep 17 00:00:00 2001
From: Fisher233333 <65141587+Fisher233333@users.noreply.github.com>
Date: Sat, 13 Aug 2022 15:12:49 +0800
Subject: [PATCH] fix:The "marking/score/test/list" interface is not
 returned;The login page cannot be redirected. (#25)

---
 controllers/score.go                      | 1 +
 web/src/App.js                            | 3 ---
 web/src/Setting.js                        | 2 ++
 web/src/api/group.js                      | 4 ++++
 web/src/views/Home/index.jsx              | 9 +++++----
 web/src/views/Login/normaluser/index.js   | 2 +-
 web/src/views/Login/normaluser/index.less | 3 +--
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/controllers/score.go b/controllers/score.go
index 92c0181..e18e292 100644
--- a/controllers/score.go
+++ b/controllers/score.go
@@ -76,6 +76,7 @@ func (c *ApiController) List() {
 	if err != nil {
 		resp := Response{Status: "10001", Msg: "get user info fail", Data: err}
 		c.Data["json"] = resp
+		c.ServeJSON()
 		return
 	}
 
diff --git a/web/src/App.js b/web/src/App.js
index 3646971..8d484f0 100644
--- a/web/src/App.js
+++ b/web/src/App.js
@@ -5,7 +5,6 @@ import AuthCallback from "./AuthCallback";
 import Home from "./views/Home";
 import * as Setting from "./Setting";
 import * as Conf from "./Conf";
-import normalLogin from "./views/Login/normaluser";
 
 class App extends React.Component {
   constructor(props) {
@@ -24,8 +23,6 @@ class App extends React.Component {
         <BrowserRouter>
           <Route path="/" component={Home} />
           <Route exact path="/callback" component={AuthCallback} />
-          <Route path="/normalLogin" component={normalLogin} />
-          <Route path="/home" component={Home} />
         </BrowserRouter>
       </div>
     );
diff --git a/web/src/Setting.js b/web/src/Setting.js
index e75058b..60508b2 100644
--- a/web/src/Setting.js
+++ b/web/src/Setting.js
@@ -1,5 +1,6 @@
 import {message} from "antd";
 import Sdk from "casdoor-js-sdk";
+import axios from "axios";
 // import {isMobile as isMobileDevice} from "react-device-detect";
 
 export let ServerUrl = "";
@@ -11,6 +12,7 @@ export function initServerUrl() {
     ServerUrl = `http://${hostname}:8080`;
   }
 }
+axios.defaults.withCredentials = true;
 
 export function initCasdoorSdk(config) {
   CasdoorSdk = new Sdk(config);
diff --git a/web/src/api/group.js b/web/src/api/group.js
index 7fef6bf..fd97b86 100644
--- a/web/src/api/group.js
+++ b/web/src/api/group.js
@@ -11,6 +11,10 @@ axios.defaults.baseURL = getServerUrl();
 axios.defaults.headers["Content-Type"] = "application/x-www-form-urlencoded;charset=UTF-8";
 const group = {
 
+  UserLogin(data) {
+    return axios.post("/login", data);
+  },
+
   userInfo(data) {
     return axios.post("/marking/supervisor/user/info", data);
   },
diff --git a/web/src/views/Home/index.jsx b/web/src/views/Home/index.jsx
index 334806e..2b3d5c2 100644
--- a/web/src/views/Home/index.jsx
+++ b/web/src/views/Home/index.jsx
@@ -31,7 +31,7 @@ import paperManage from "../Manage/paper_manage/manage";
 import detail from "../Manage/paper_manage/detail";
 
 import menuList from "../../menu/menuTab.js";
-
+import normalLogin from "../Login/normaluser";
 import logoUrl from "../../asset/images/OpenCT_Logo.png";
 import group from "../../api/group";
 import "./index.less";
@@ -40,7 +40,6 @@ const {Header, Sider, Content} = Layout;
 const {SubMenu} = Menu;
 
 export default class index extends Component {
-
     state = {
       account: null,
       current: "home",
@@ -174,9 +173,10 @@ export default class index extends Component {
             <a href={Setting.getSigninUrl()} style={{color: "#ffffff", marginLeft: "50px"}}>
               管理员登录
             </a>
-            <a onClick={() => {Setting.goToLink("/normalLogin");}} style={{color: "#ffffff", marginLeft: "50px"}}>
+            <Link
+              to={"/home/normaluser"} style={{color: "#ffffff", marginLeft: "50px"}}>
               组长/阅卷老师登录
-            </a>
+            </Link>
           </>
         );
       } else {
@@ -294,6 +294,7 @@ export default class index extends Component {
                     <Route path="/home/management/paper_manage" component={paperManage} exact></Route>
                     <Route path="/home/management/detailTable" component={detail} exact></Route>
 
+                    <Route path="/home/normaluser" component={normalLogin} exact></Route>
                   </>
 
                     : null
diff --git a/web/src/views/Login/normaluser/index.js b/web/src/views/Login/normaluser/index.js
index 40e45ef..5d70ffc 100644
--- a/web/src/views/Login/normaluser/index.js
+++ b/web/src/views/Login/normaluser/index.js
@@ -14,7 +14,7 @@ export async function login(account, password) {
     }).then(res => {
       resolve(res.data);
     }).catch(error => {
-      console.log(error);
+      Settings.showMessage("error", error);
     });
   });
 }
diff --git a/web/src/views/Login/normaluser/index.less b/web/src/views/Login/normaluser/index.less
index aeffc3d..c195368 100644
--- a/web/src/views/Login/normaluser/index.less
+++ b/web/src/views/Login/normaluser/index.less
@@ -1,5 +1,4 @@
 .bg {
-  height: 900px;
   background: linear-gradient(180deg, #85b4ff, #ffffff);
   margin: auto;
   // padding: 200px;
@@ -14,7 +13,7 @@
   height: 450px;
   background: #f2f3f7;
   border-radius: 20px;
-  margin: auto;
+  margin-top: 10%;
   text-align: center;
   justify-content: center;
   padding: 51px 60px;