- {/* {'/question-bank' == pathname && (
-
- console.log(value)}
- style={{ width: 300, borderRadius: '10px' }}
- />
-
- )} */}
+ {'/question-bank' == pathname && (
+
+ console.log(value)}
+ style={{ width: 300, borderRadius: '10px' }}
+ />
+
+ )}
{/*
*/}
{/* */}
{/*
*/}
diff --git a/src/views/login/index.tsx b/src/views/login/index.tsx
index 98cba84..414268b 100644
--- a/src/views/login/index.tsx
+++ b/src/views/login/index.tsx
@@ -33,6 +33,8 @@ const Login = () => {
setTimeout(() => {
navigate('/question-bank')
}, 1000)
+ } else {
+ message.error('登录失败，请重试')
}
})
}
diff --git a/src/views/question-bank/index.tsx b/src/views/question-bank/index.tsx
index 3325dac..9ad37c4 100644
--- a/src/views/question-bank/index.tsx
+++ b/src/views/question-bank/index.tsx
@@ -181,7 +181,7 @@ const QuestionBank = () => {
{questionList.length == 0
- ? '暂无数据'
+ ? ''
: loading && !finished
? '努力加载中...'
: '我是有底线的（：'}
diff --git a/src/views/user-info/index.tsx b/src/views/user-info/index.tsx
index 93473ce..2c3e17a 100644
--- a/src/views/user-info/index.tsx
+++ b/src/views/user-info/index.tsx
@@ -1,30 +1,82 @@
import Head from '@/imgs/head.jpg'
import { LoadingOutlined, PlusOutlined } from '@ant-design/icons'
import req from '@utils/request'
-import { Button, Card, Col, Form, Input, Radio, Row, message } from 'antd'
-import { memo, useState } from 'react'
-import { useNavigate } from 'react-router-dom'
+import { Button, Card, Col, Form, Input, Radio, Row, Upload, message } from 'antd'
+import { memo, useEffect, useState } from 'react'
import './index.less'
const { TextArea } = Input
-const apiName = '/user/update'
+const apiName = {
+ update: '/user/update',
+ queryInfo: '/user/getUserInfo'
+}
const layout = {
labelCol: { span: 4 },
wrapperCol: { span: 10, offset: 1 }
}
+const beforeUpload = (file: RcFile) => {
+ const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png'
+ if (!isJpgOrPng) {
+ message.error('You can only upload JPG/PNG file!')
+ }
+ const isLt2M = file.size / 1024 / 1024 < 2
+ if (!isLt2M) {
+ message.error('Image must smaller than 2MB!')
+ }
+ return isJpgOrPng && isLt2M
+}
+
+interface UserInfo {
+ nickName?: string
+ phone?: string
+ email?: string
+ sex?: string | number
+ introduce?: string
+}
+
+const Sex: Record
= {
+ 1: '男',
+ 2: '女'
+}
+
const UserInfo = () => {
+ const userInfoStorage = localStorage.getItem('userInfo')
+ const { loginId = '' } = userInfoStorage ? JSON.parse(userInfoStorage) : {}
+
const [form] = Form.useForm()
const [editFlag, setEditFlag] = useState(false)
const [loading, setLoading] = useState(false)
- const navigate = useNavigate()
+ const [userInfo, setUserInfo] = useState({})
+
+ const getUserInfo = async () => {
+ req(
+ {
+ method: 'post',
+ url: apiName.queryInfo,
+ data: {
+ userName: loginId
+ }
+ },
+ '/auth'
+ ).then(res => {
+ if (res?.success && res?.data) {
+ setUserInfo(res.data)
+ form.setFieldsValue(res.data)
+ }
+ })
+ }
+
+ useEffect(() => {
+ if (loginId) {
+ getUserInfo()
+ }
+ }, [loginId])
const onFinish = () => {
setLoading(true)
- const userInfoStorage = localStorage.getItem('userInfo')
- const { loginId = '' } = userInfoStorage ? JSON.parse(userInfoStorage) : {}
const values = form.getFieldsValue()
if (!Object.values(values).filter(Boolean).length) {
setLoading(false)
@@ -37,7 +89,7 @@ const UserInfo = () => {
req(
{
method: 'post',
- url: apiName,
+ url: apiName.update,
data: { ...params }
},
'/auth'
@@ -46,11 +98,13 @@ const UserInfo = () => {
if (res.success) {
message.success('更新成功')
setTimeout(() => {
- navigate('/question-bank')
- }, 1000)
+ getUserInfo()
+ setLoading(false)
+ setEditFlag(false)
+ }, 500)
+ } else {
+ setLoading(false)
}
- setLoading(false)
- setEditFlag(false)
})
.catch(() => {
message.error('更新失败')
@@ -58,6 +112,10 @@ const UserInfo = () => {
})
}
+ const handleChange = info => {
+ console.log(info)
+ }
+
const uploadButton = (
{loading ?
:
}
@@ -71,9 +129,33 @@ const UserInfo = () => {