From 836f5f4ac6e3cd59fb4b47c07805b0579864fe3a Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 1 Nov 2021 18:08:50 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/layouts/home/index.vue | 2 +-
src/pages/account/login/index.vue | 2 +-
src/pages/assessment/list/index.vue | 2 +-
src/pages/course/contentSettings/index.vue | 1 +
src/pages/match/manage/matchDetail.vue | 6 ++++++
src/pages/student/list/index.vue | 16 ++++++++--------
src/pages/system/list/role.vue | 4 ++--
src/setting.js | 4 ++--
src/styles/common.scss | 4 +++-
9 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/src/layouts/home/index.vue b/src/layouts/home/index.vue
index 3409a83..f31850c 100644
--- a/src/layouts/home/index.vue
+++ b/src/layouts/home/index.vue
@@ -61,7 +61,7 @@ export default {
.content {
min-height: calc(100vh - 176px);
- padding: 24px 24px 0;
+ padding: 24px 24px;
}
}
\ No newline at end of file
diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index 008fc94..caacd91 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -198,7 +198,7 @@ export default {
this.loginForm.phone = this.phone;
this.phoneVisible = false;
- util.local.set(Setting.tokenKey, res.data.token, Setting.tokenExpires);
+ util.local.set(Setting.tokenKey, res.token, Setting.tokenExpires);
let redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : "/index";
this.$router.replace(redirect);
util.successMsg("登录成功");
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index 88d551b..ee3b783 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -373,7 +373,7 @@ export default {
delAllData() {
if (this.multipleSelection.length) {
let ids = this.multipleSelection.map(item => {
- return item.projectId;
+ return item.id;
});
this.$confirm("确定要删除吗?", "提示", {
type: "warning"
diff --git a/src/pages/course/contentSettings/index.vue b/src/pages/course/contentSettings/index.vue
index de256ad..de42663 100644
--- a/src/pages/course/contentSettings/index.vue
+++ b/src/pages/course/contentSettings/index.vue
@@ -118,6 +118,7 @@
:on-exceed="handleExceed"
:action="this.api.fileupload"
:file-list="uploadList"
+ :headers="headers"
name="file"
>
上传资源
diff --git a/src/pages/match/manage/matchDetail.vue b/src/pages/match/manage/matchDetail.vue
index c0d0da4..b055d78 100644
--- a/src/pages/match/manage/matchDetail.vue
+++ b/src/pages/match/manage/matchDetail.vue
@@ -14,6 +14,7 @@
:limit="1"
:on-exceed="handleExceed"
:action="this.api.fileupload"
+ :headers="headers"
name="file"
>
@@ -37,6 +38,7 @@
:limit="1"
:on-exceed="handleExceed"
:action="this.api.fileupload"
+ :headers="headers"
name="file"
>
@@ -103,12 +105,16 @@