diff --git a/src/main.jsx b/src/main.jsx
index 679e0dc..7377936 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -5,8 +5,7 @@ import { createBrowserRouter, RouterProvider } from 'react-router-dom'
import { AuthContext } from '@/stores/AuthContext'
import { ThemeContext } from '@/stores/ThemeContext'
import ConversationProvider from '@/views/Conversations/ConversationProvider'
-import Auth from '@/stores/Auth'
-import App from '@/views/App'
+import AuthApp from '@/views/AuthApp'
import Standlone from '@/views/Standlone'
import OrderFollow from '@/views/OrderFollow'
import ChatHistory from '@/views/ChatHistory'
@@ -31,7 +30,7 @@ configure({
const router = createBrowserRouter([
{
path: '/',
- element: ,
+ element: ,
errorElement: ,
children: [
{ index: true, element: },
diff --git a/src/views/AccountProfile.jsx b/src/views/AccountProfile.jsx
index f95e8ed..bb32fc4 100644
--- a/src/views/AccountProfile.jsx
+++ b/src/views/AccountProfile.jsx
@@ -1,17 +1,12 @@
import { useEffect } from 'react'
-import { observer } from 'mobx-react'
import {
- Row, Col, Space, Descriptions, Avatar
+ Row, Col, Space, Descriptions, Avatar, Radio
} from 'antd'
import { useAuthContext } from '@/stores/AuthContext'
function AccountProfile() {
- const { loginUser, permissionList } = useAuthContext()
- console.info('loginUser: ')
- console.info(loginUser)
- console.info('permissionList: ')
- console.info(permissionList)
+ const { loginUser } = useAuthContext()
useEffect(() => {
// 测试错误捕获:
@@ -21,9 +16,21 @@ function AccountProfile() {
return (
-
+
{loginUser.username}
- {loginUser.accountName}
+
+ {loginUser.accountName}
+
+
{loginUser.stateCode} {loginUser.mobile}
{loginUser.email}
@@ -32,4 +39,4 @@ function AccountProfile() {
)
}
-export default observer(AccountProfile)
+export default AccountProfile
diff --git a/src/views/App.jsx b/src/views/AuthApp.jsx
similarity index 93%
rename from src/views/App.jsx
rename to src/views/AuthApp.jsx
index 4bb5dc4..245821a 100644
--- a/src/views/App.jsx
+++ b/src/views/AuthApp.jsx
@@ -1,5 +1,5 @@
import { Outlet, Link, useHref, NavLink } from 'react-router-dom';
-import { Layout, Menu, ConfigProvider, theme, Empty, Row, Col, Dropdown, Space, Typography, App as AntApp } from 'antd';
+import { Layout, Menu, ConfigProvider, theme, Empty, Row, Col, Avatar, Dropdown, Space, Typography, App as AntApp } from 'antd';
import { DownOutlined } from '@ant-design/icons';
import ErrorBoundary from '@/components/ErrorBoundary';
import zhLocale from 'antd/locale/zh_CN';
@@ -16,7 +16,7 @@ const { Header, Footer, Content } = Layout
const { Title } = Typography
// AuthApp
-function App() {
+function AuthApp() {
const { colorPrimary, borderRadius } = useThemeContext()
const { loginUser, permissionList } = useAuthContext()
@@ -90,10 +90,7 @@ function App() {
trigger={['click']}
>
e.preventDefault()} style={{ color: colorPrimary }}>
-
- 廖一军
-
-
+ 廖一军
@@ -119,4 +116,4 @@ function App() {
)
}
-export default App
+export default AuthApp
diff --git a/src/views/OrderFollow.jsx b/src/views/OrderFollow.jsx
index e8a83fb..f18ad8c 100644
--- a/src/views/OrderFollow.jsx
+++ b/src/views/OrderFollow.jsx
@@ -96,19 +96,17 @@ function OrderList({ formValues }) {
{
title: '订单号',
dataIndex: 'COLI_ID',
- key: 'COLI_ID',
width: 222,
- render: (text, record) => {
- if (record.COLI_LineGrade === 240003) return {text}重点
- else if (record.COLI_LineGrade === 240002) return {text}潜力
- else if (record.COLI_LineGrade === 240001) return {text}休眠
- else return {text}
+ render: (text, record, index) => {
+ if (record.COLI_LineGrade === 240003) return {text}重点
+ else if (record.COLI_LineGrade === 240002) return {text}潜力
+ else if (record.COLI_LineGrade === 240001) return {text}休眠
+ else return {text}
}
},
{
title: '客人姓名',
dataIndex: 'coli_guest',
- key: 'coli_guest',
render: (text, record) => {
let regularText = ''
if (record.buytime > 0) regularText = '(R' + record.buytime + ')'
@@ -128,7 +126,6 @@ function OrderList({ formValues }) {
{
title: '订单状态',
dataIndex: 'COLI_State',
- key: 'COLI_State',
width: 120,
render: (text, record) => {
let extra = ''
@@ -141,18 +138,15 @@ function OrderList({ formValues }) {
{
title: '报价title',
dataIndex: 'lettertitle',
- key: 'lettertitle',
ellipsis: true,
},
{
title: '客人最后一次回复时间',
dataIndex: 'last_received_time',
- key: 'last_received_time',
},
{
title: '附加信息',
dataIndex: 'COLI_Introduction',
- key: 'COLI_Introduction',
},
]
const { notification } = App.useApp()
@@ -166,7 +160,7 @@ function OrderList({ formValues }) {
.then(response => response.json())
.then(json => {
if (json.errcode === 0) {
- setOrderData([...json.result])
+ setOrderData(json.result.map((order) => { return {...order, key: order.COLI_ID}}))
} else {
notification.error({
message: '查询出错',
@@ -188,7 +182,7 @@ function OrderList({ formValues }) {
}, [formValues])
return (
-
+
)
}
function OrderFollow() {