Haina
/
Global-sales
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 解决合并冲突后错误

Browse Source
dev/ckeditor
LiaoYijun 4 months ago
parent 8b6326380d
commit 25722eff77
1 changed files with 13 additions and 303 deletions
Show Stats Download Patch File Download Diff File

316
src/views/orders/Follow.jsx
Unescape Escape View File

@ -210,119 +210,7 @@ function Follow() {
defaultExpandedKeys={['0-0-today-task', '0-1-todo-list']}
defaultSelectedKeys={['0-0-0']}
treeData={[...deiStickyTree['28']||deiStickyTree['30']||[], ...mailboxDir]
// [
// {
// title: '今日任务',
// key: '0-0-today-task',
// icon: <StarTwoTone />,
// children: [
// {
// title: '(新订单)HXZ240913082',
// key: '0-0-0',
// },
// {
// title: '(老邮件)HXZ241017089',
// key: '0-0-1',
// },
// ],
// },
// {
// title: '待办任务',
// key: '0-1-todo-list',
// icon: <CalendarTwoTone />,
// children: [
// {
// title: '(一催)HXZ250213117',
// key: '0-1-0',
// },
// {
// title: '(二催)HXZ250213117',
// key: '0-1-1',
// },
// {
// title: '(三催)HXZ250213117',
// key: '0-1-2',
// },
// {
// title: '(余款收付)HXZ250209048',
// key: '0-1-3',
// },
// {
// title: '(入境提醒)HXZ250209048',
// key: '0-1-4',
// },
// ],
// },
// {
// title: '草稿',
// key: '0-2-draft',
// icon: <BookTwoTone />,
// },
// {
// title: '收件箱',
// key: '0-3-inbox',
// icon: <MailTwoTone />,
// children: [
// {
// title: '1月',
// key: '0-3-0',
// icon: <FolderTwoTone />,
// },
// {
// title: '2月',
// key: '0-3-1',
// icon: <FolderTwoTone />,
// },
// {
// title: '3月',
// key: '0-3-2',
// icon: <FolderTwoTone />,
// },
// {
// title: '4月',
// key: '0-3-3',
// icon: <FolderTwoTone />,
// },
// {
// title: '5月',
// key: '0-3-4',
// icon: <FolderTwoTone />,
// children: [
// {
// title: 'Albee240422193452',
// key: 'Albee240422193452',
// },
// {
// title: 'Albee240422193285',
// key: 'Albee240422193285',
// },
// {
// title: 'Albee240422193752',
// key: 'Albee240422193752',
// },
// {
// title: 'Albee2404221934583',
// key: 'Albee2404221934583',
// },
// {
// title: 'Albee2404221937836',
// key: 'Albee2404221937836',
// },
// ],
// },
// ],
// },
// {
// title: '已发送',
// key: '0-4-sent',
// icon: <RightSquareTwoTone />,
// },
// {
// title: '已处理',
// key: '0-5-completed',
// icon: <CheckSquareTwoTone />,
// },
// ]
}
/>
</Flex>
@ -384,194 +272,7 @@ function Follow() {
placeholder={`邮件主题`}
/>
<Button onClick={() => {}}>高级搜索</Button>
</div>
<div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>
<List
// header={null}
header={
<Flex wrap gap='small'>
<Tooltip title='选择'>
<Checkbox></Checkbox>
</Tooltip>
<Tooltip title='标记已读'>
<Button shape='circle' type='text' size='small' icon={<ReadOutlined />} />
</Tooltip>
<Tooltip title='已处理'>
<Button shape='circle' type='text' size='small' icon={<CheckSquareOutlined />} />
</Tooltip>
<Tooltip title='刷新'>
<Button shape='circle' type='text' size='small' icon={<ReloadOutlined />} />
</Tooltip>
</Flex>
}
itemLayout='vertical'
size='large'
pagination={false}
dataSource={[
{
key: 5291957, // Math.random().toString(36).substring(2, 9),
description: 'Fran Grundman <frangrundman@rogers.com>',
title: '250520-LSS250429038 团的 变更 <20>确认：Japan Fleet',
mailDate: '2025-05-01 19:21:00',
orderNo: 'LSS250501006',
country: 'Thailand',
},
{
key: 5277561, // Math.random().toString(36).substring(2, 9),
description: 'Fran Grundman <frangrundman@rogers.com>',
title: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到',
mailDate: '2025-05-01 19:21:00',
orderNo: 'LSS250501006',
country: 'Thailand',
},
{
key: 5119909, //Math.random().toString(36).substring(2, 9),
description: 'Fran Grundman <frangrundman@rogers.com>',
title: 'Re: Personal information',
mailDate: '2025-05-01 19:21:00',
orderNo: 'LSS250501006',
country: 'Thailand',
},
{
key: 5115479, // Math.random().toString(36).substring(2, 9),
description: 'Fran Grundman <frangrundman@rogers.com>',
title: 'Re: Your Future Trip with Asia Highlights',
mailDate: '2025-05-01 19:21:00',
orderNo: 'LSS250501006',
country: 'Thailand',
},
{
key: 5113514, // Math.random().toString(36).substring(2, 9),
description: 'Fran Grundman <frangrundman@rogers.com>',
title: '回复： 回复：中华游251110-LSS250413051(AH)团计划',
mailDate: '2025-05-01 19:21:00',
orderNo: 'LSS250501006',
country: 'Thailand',
},
{
key: 5113512, //Math.random().toString(36).substring(2, 9),
description: 'Fran Grundman <frangrundman@rogers.com>',
title: 'Re: Greeting from Asia Highlights Alisa',
mailDate: '2025-05-01 19:21:00',
orderNo: 'LSS250501006',
country: 'Thailand',
},
{
key: 5113508, // Math.random().toString(36).substring(2, 9),
description: 'Fran Grundman <frangrundman@rogers.com>',
title: 'Re: Have you made any decisions about your Japan trip',
mailDate: '2025-05-01 19:21:00',
orderNo: 'LSS250501006',
country: 'Thailand',
},
{
key: 5112214, //Math.random().toString(36).substring(2, 9),
description: 'Fran Grundman <frangrundman@rogers.com>',
title: 'Re: Sri Lanka tour',
mailDate: '2025-05-01 19:21:00',
orderNo: 'LSS250501006',
country: 'Thailand',
},
{
key: 5095421, //Math.random().toString(36).substring(2, 9),
description: 'Fran Grundman <frangrundman@rogers.com>',
title: 'Re: How do you like the itinerary 3',
mailDate: '2025-05-01 19:21:00',
orderNo: 'LSS250501006',
country: 'Thailand',
},
{
key: 5095097, //Math.random().toString(36).substring(2, 9),
description: 'Fran Grundman <frangrundman@rogers.com>',
title: 'Re: Re: Re: Final cost',
mailDate: '2025-05-01 19:21:00',
orderNo: 'LSS250501006',
country: 'Thailand',
},
{
key: 5095083, //Math.random().toString(36).substring(2, 9),
description: 'Fran Grundman <frangrundman@rogers.com>',
title: 'Reference Number: LSS240628079',
mailDate: '2025-05-01 19:21:00',
orderNo: 'LSS250501006',
country: 'Thailand',
},
{
key: 5093980, //Math.random().toString(36).substring(2, 9),
description: 'Fran Grundman <frangrundman@rogers.com>',
title: 'Re: Personal information and Hiroshima tour for 2 people',
mailDate: '2025-05-01 19:21:00',
orderNo: 'LSS250501006',
country: 'Thailand',
},
],
},
{
title: '已发送',
key: '0-4-sent',
icon: <RightSquareTwoTone />,
},
{
title: '已处理',
key: '0-5-completed',
icon: <CheckSquareTwoTone />,
},
]}
/>
</Flex></Layout.Sider>
<Layout.Content>
<Row>
<Col className='bg-white' span={16}>
<div className='bg-white h-auto px-1 flex gap-1 items-center'>
<Dropdown.Button className='w-auto' placement="bottom" arrow type={'primary'} menu={{
items: [
{
key: '1',
label: '一催模版1：鼓励客人回复和讨论行程',
},
{
key: '2',
label: '一催模版2：询问客人对于报价是否有疑问',
},{
type: 'divider',
},
{
key: '3',
label: '二催模版1：省钱的方式',
},
{
key: '4',
label: '二催模版2：Why us',
},{
type: 'divider',
},
{
key: '5',
label: '三催模版1：再次强调服务',
},
{
key: '6',
label: '三催模版2：客人常见问题询问',
}],
onClick: (item)=> {console.info('menu', item)},
}} onClick={() => {console.info('新邮件')}}>
新邮件
</Dropdown.Button>
<Input.Search
className=''
allowClear
onChange={(e) => {}}
onPressEnter={(e) => {
return false
}}
placeholder={`邮件主题`}
/>
<Button onClick={() => {}} >高级搜索</Button>
<Flex wrap gap="small">
<Flex wrap gap="small">
<Tooltip title="选择">
<Checkbox></Checkbox>
</Tooltip>
@ -585,7 +286,9 @@ function Follow() {
<Button shape="circle" type="text" size='small' icon={<ReloadOutlined />} />
</Tooltip>
</Flex>
</div>
</div>
<div className='bg-white overflow-y-auto'
style={{height: 'calc(100vh - 198px)'}}>
<List
@ -724,6 +427,8 @@ function Follow() {
/>
</div>
</Col>
<Col span={8}>
<div>
@ -755,7 +460,12 @@ function Follow() {
订单状态
</Button>
</Flex>
</Layout.Sider>
</Flex>
</div>
</Col>
</Row>
</Layout.Content>
</Layout>
<Drawer

Write Preview
Loading…
Cancel
Save