diff --git a/src/api/person.ts b/src/api/person.ts
index 00e392a..2bcb9be 100644
--- a/src/api/person.ts
+++ b/src/api/person.ts
@@ -1,42 +1,4 @@
-import req1 from '@/utils/requset'
-import { AxiosInstance } from 'axios'
-function copyRequest(req1: AxiosInstance, instanceConfig = {}) {
- let request: AxiosInstance, copyStatus: boolean
- try {
- // @ts-ignore
- const req2 = req1.create(instanceConfig)
- function acopyInterceptors(target: any, interceptorManager: any) {
- const handlers = interceptorManager.handlers
- for (let index = 0; index < handlers?.length; index++) {
- const { fulfilled, rejected, runWhen, synchronous } = handlers[index]
- let options
- if (synchronous !== false || runWhen !== null)
- options = { synchronous, runWhen }
- target.use(fulfilled, rejected, options)
- }
- }
- acopyInterceptors(req2.interceptors.request, req1.interceptors.request)
- acopyInterceptors(req2.interceptors.response, req1.interceptors.response)
- request = req2
- copyStatus = true
- } catch (error) {
- console.warn('拷贝失败,私有拦截器可能失效:\n', error)
- request = req1
- copyStatus = false
- }
-
- return { request, copyStatus }
-}
-
-const { request, copyStatus } = copyRequest(req1)
-
-// 若拷贝成功,添加自己独有的拦截器
-if (copyStatus) {
- request.interceptors.response.use((response: any) => {
- if (response.code >= 200 && response.code < 300) return response
- else return Promise.reject(response)
- })
-}
+import request from '@/utils/requset'
// =============================================================================
enum api {
diff --git a/src/main.ts b/src/main.ts
index d8b92df..ee45777 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -19,7 +19,7 @@ import themeStore from './store/module/theme'
// 引入仓库
import { createPinia } from 'pinia'
// 引入路由
-import router from './router'
+import router from './permissions'
import '@/utils/rem.js'
import defaultImage from '@/directives/defaultImage'
// 创建vue实例
diff --git a/src/utils/requset.ts b/src/utils/requset.ts
index 3c5532d..ccb15ca 100644
--- a/src/utils/requset.ts
+++ b/src/utils/requset.ts
@@ -13,7 +13,8 @@ const server = axios.create({
server.interceptors.request.use((config) => {
const useuserStore = userStore(pinia)
-
+ console.log(useuserStore.token,'1212');
+
config.headers.Authorization = useuserStore.token
config.headers['x-access-token'] = useuserStore.token
return config
diff --git a/src/views/registrationGroup/components/stuList.vue b/src/views/registrationGroup/components/stuList.vue
index ccdd6d8..b641cb1 100644
--- a/src/views/registrationGroup/components/stuList.vue
+++ b/src/views/registrationGroup/components/stuList.vue
@@ -23,7 +23,7 @@
用户
-
+
@@ -55,7 +55,7 @@
学号
-
+
@@ -66,7 +66,7 @@
手机号
-
+
@@ -77,7 +77,7 @@
邮箱
-
+
@@ -88,7 +88,7 @@
队员序号
-
+
diff --git a/src/views/registrationGroup/index.vue b/src/views/registrationGroup/index.vue
index 1ed529d..5f5809f 100644
--- a/src/views/registrationGroup/index.vue
+++ b/src/views/registrationGroup/index.vue
@@ -240,6 +240,12 @@ const submit = (substa:string) => {
if (!ruleForm.teamName) return ElMessage.warning('请输入队伍名称')
ruleForm.instructorSheetList = [...teaRef.value.submit()]
ruleForm.teamManagementList = [...stuRef.value.submit()]
+ console.log(ruleForm.instructorSheetList, 'ruleForm.instructorSheetList');
+ console.log( ruleForm.teamManagementList,' ruleForm.teamManagementList');
+ if(ruleForm.teamManagementList.every((member:any) => member.captain == "0")){
+ ElMessage.warning('请选择队长')
+ return
+ }
ruleForm.substa = substa
ruleForm.id = route.query.id
// ruleForm.annualCompid = route.query.id
diff --git a/src/views/userInfo/index.vue b/src/views/userInfo/index.vue
index 1191cd8..edfe967 100644
--- a/src/views/userInfo/index.vue
+++ b/src/views/userInfo/index.vue
@@ -259,7 +259,12 @@ const submit = async () => {
delete data[key]
}
}
- await editUserInfoApi(data)
+ await editUserInfoApi(data).then((res: any) => {
+ console.log(res.code);
+ if(res.code != 200){
+ return ElMessage.error(res.message)
+ }
+ })
useUserStore.getUserInfo()
userInfo.value = useUserStore.userInfo
dialogVisible.value = false