增加多个 HT 账号展示

dev/mobile
Jimmy Liow 2 years ago
parent d82fcfe136
commit f1abb8cebd

@ -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: <App />,
element: <AuthApp />,
errorElement: <ErrorPage />,
children: [
{ index: true, element: <OrderFollow /> },

@ -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 (
<Row>
<Col span={12} offset={6}>
<Descriptions title='个人信息' layout='vertical' column={2}>
<Descriptions title='个人资料' layout='vertical' column={2}>
<Descriptions.Item label='名字'><Space size='middle'><Avatar src={loginUser.avatarUrl} />{loginUser.username}</Space></Descriptions.Item>
<Descriptions.Item label='HT 账号'>{loginUser.accountName}</Descriptions.Item>
<Descriptions.Item label='HT 账号'>
{loginUser.accountName}
<Radio.Group
options={[
{ label: 'LMY', value: '1' },
{ label: 'christy', value: '2' },
{ label: 'LMYGH', value: '3' }
]}
value='2'
optionType='button'
buttonStyle='solid'
/>
</Descriptions.Item>
<Descriptions.Item label='手机'>{loginUser.stateCode} {loginUser.mobile}</Descriptions.Item>
<Descriptions.Item label='邮件'>{loginUser.email}</Descriptions.Item>
</Descriptions>
@ -32,4 +39,4 @@ function AccountProfile() {
)
}
export default observer(AccountProfile)
export default AccountProfile

@ -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']}
>
<a onClick={(e) => e.preventDefault()} style={{ color: colorPrimary }}>
<Space>
廖一军
<DownOutlined />
</Space>
<Space size='middle'><Avatar src={loginUser.avatarUrl} />廖一军<DownOutlined /></Space>
</a>
</Dropdown>
@ -119,4 +116,4 @@ function App() {
)
}
export default App
export default AuthApp

@ -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 <Space size='middle'>{text}<Tag color='red'>重点</Tag></Space>
else if (record.COLI_LineGrade === 240002) return <Space size='middle'>{text}<Tag color='green'>潜力</Tag></Space>
else if (record.COLI_LineGrade === 240001) return <Space size='middle'>{text}<Tag color='blue'>休眠</Tag></Space>
else return <Space size='middle'>{text}</Space>
render: (text, record, index) => {
if (record.COLI_LineGrade === 240003) return <Space key={record.COLI_ID + index} size='middle'>{text}<Tag color='red'>重点</Tag></Space>
else if (record.COLI_LineGrade === 240002) return <Space key={record.COLI_ID + index} size='middle'>{text}<Tag color='green'>潜力</Tag></Space>
else if (record.COLI_LineGrade === 240001) return <Space key={record.COLI_ID + index} size='middle'>{text}<Tag color='blue'>休眠</Tag></Space>
else return <Space key={record.COLI_ID + index} size='middle'>{text}</Space>
}
},
{
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 (
<Table loading={loading} dataSource={orderData} columns={orderColumns} />
<Table key='Order Table' loading={loading} dataSource={orderData} columns={orderColumns} />
)
}
function OrderFollow() {

Loading…
Cancel
Save