1 客人名字前有 WhatsApp 图标,表示该客人可以发送 WhatsApp,如果没有需要顾问到 HT 填写2 订单状态分类更清晰,比如新订单和催信图标是不一样的,具体几催,图标上有提示

dev/mobile
Jimmy Liow 2 years ago
parent 9555d6819d
commit d9a882aa26

@ -1,5 +1,6 @@
import { create } from 'zustand'
import { fetchJSON } from '@/utils/request'
import { isNotEmpty } from '@/utils/commons'
const useAuthStore = create((set, get) => ({
@ -27,9 +28,7 @@ const useAuthStore = create((set, get) => ({
const json = await fetchJSON(`https://p9axztuwd7x8a7.mycht.cn/dingtalk/dingtalkwork/WhatsAppAuth`, { authCode })
if (json.errcode === 0) {
if (json.errcode === 0 && isNotEmpty(json.result.opisn)) {
set(() => ({
loginUser: {
userId: json.result.opisn,
@ -91,6 +90,13 @@ const useAuthStore = create((set, get) => ({
window.sessionStorage.setItem('GLOBAL_SALES_LOGIN_USER', JSON.stringify(loginUser))
},
copyUserSession: () => {
const sessionData = window.sessionStorage.getItem('GLOBAL_SALES_LOGIN_USER')
if (sessionData !== null) {
navigator.clipboard.writeText(sessionData)
}
}
}))
export default useAuthStore

@ -1,13 +1,14 @@
import { useEffect } from 'react'
import {
Row, Col, Space, Descriptions, Avatar, Tag
Row, Col, Space, Descriptions, Avatar, Tag, FloatButton, App
} from 'antd'
import { UserOutlined } from '@ant-design/icons'
import { UserOutlined, BugOutlined } from '@ant-design/icons'
import useAuthStore from '@/stores/AuthStore'
function AccountProfile() {
const { loginUser } = useAuthStore()
const { message } = App.useApp()
const { loginUser, copyUserSession } = useAuthStore()
useEffect(() => {
//
@ -17,6 +18,10 @@ function AccountProfile() {
return (
<Row>
<Col span={12} offset={6}>
<FloatButton icon={<BugOutlined />} onClick={() => {
message.success('复制成功,请粘贴给开发人员,谢谢😀')
copyUserSession()
}} />
<Descriptions title='个人资料' layout='vertical' column={2}>
<Descriptions.Item label='名字'><Space size='middle'><Avatar src={loginUser.avatarUrl}>{loginUser.username.substring(1)}</Avatar>{loginUser.username}</Space></Descriptions.Item>
<Descriptions.Item label='HT 账号'>

@ -1,14 +1,15 @@
import {
App, Badge, Button, DatePicker, Tabs, Flex, Form, Input,
Radio, Row, Col, Select, Space, Switch, Table, Tag, Collapse
Radio, Row, Col, Select, Space, Switch, Table, Tag, Tooltip
} from 'antd'
import { InfoCircleTwoTone, MessageTwoTone, PhoneTwoTone, MailTwoTone, WhatsAppOutlined } from '@ant-design/icons'
import { memo, useCallback, useEffect, useState } from 'react'
import { Link } from 'react-router-dom'
import dayjs from 'dayjs'
import { Conditional } from '@/components/Conditional'
import useOrderStore from '@/stores/OrderStore'
import useAuthStore from '@/stores/AuthStore'
import { copy } from '@/utils/commons'
import { copy, isEmpty } from '@/utils/commons'
import useFormStore from '@/stores/FormStore';
import { useShallow } from 'zustand/react/shallow';
@ -165,8 +166,10 @@ function OrderGroupTable({ formValues }) {
render: (text, record) => {
let regularText = ''
if (record.buytime > 0) regularText = '(R' + record.buytime + ')'
const whatsAppIcon = isEmpty(record.coli_guest_WhatsApp) ? null : <WhatsAppOutlined />
return (
<Space>
{whatsAppIcon}
<Link to={`/order/chat/${record.COLI_SN}`} state={record} title={record.coli_guest_WhatsApp}>{text + regularText}</Link>
<Badge
count={record.unread_msg}
@ -183,11 +186,20 @@ function OrderGroupTable({ formValues }) {
dataIndex: 'COLI_State',
width: 150,
render: (text, record) => {
let extra = ''
if (record.RemindState === 1) extra = '(一催)'
if (record.RemindState === 2) extra = '(二催)'
if (record.RemindState === 3) extra = '(三催)'
return text + extra
// 1<InfoCircleTwoTone />2<MessageTwoTone />345<PhoneTwoTone />6<MailTwoTone />
const needTo = '要催信' + (record.coli_ordertype - 2)
let statusIcon = ''
if (record.coli_ordertype === 1) statusIcon = <Tooltip title='新订单'><InfoCircleTwoTone /></Tooltip>
else if (record.coli_ordertype === 2) statusIcon = <Tooltip title='新消息'><MessageTwoTone /></Tooltip>
else if (record.coli_ordertype === 3 || record.coli_ordertype === 4 || record.coli_ordertype === 5) statusIcon = <Tooltip title={needTo}><PhoneTwoTone /></Tooltip>
else if (record.coli_ordertype === 6) statusIcon = <Tooltip title='老邮件'><MailTwoTone /></Tooltip>
return (
<Space>
{text}
{statusIcon}
</Space>
)
}
},
{

Loading…
Cancel
Save