Merge remote-tracking branch 'origin/客户运营'

# Conflicts:
#	src/stores/AuthStore.js
dev/full-email
Lei OT 6 months ago
commit 679fc3888b

@ -1,4 +1,5 @@
import React, { useState } from 'react' import React, { useState } from 'react'
import { Link } from 'react-router-dom'
import { Form, Input, Button, DatePicker, Select, Table } from 'antd' import { Form, Input, Button, DatePicker, Select, Table } from 'antd'
import dayjs from 'dayjs' import dayjs from 'dayjs'
import useCustomerRelationStore from '@/stores/CustomerRelationStore' import useCustomerRelationStore from '@/stores/CustomerRelationStore'
@ -75,12 +76,20 @@ const Index = () => {
{ title: '发送时间', dataIndex: 'crt_send_datetime', key: 'crt_send_datetime' }, { title: '发送时间', dataIndex: 'crt_send_datetime', key: 'crt_send_datetime' },
{ title: '模板', dataIndex: 'crt_template', key: 'crt_template' }, { title: '模板', dataIndex: 'crt_template', key: 'crt_template' },
{ title: 'WhatsApp', dataIndex: 'crt_whatsapp', key: 'crt_whatsapp' }, { title: 'WhatsApp', dataIndex: 'crt_whatsapp', key: 'crt_whatsapp' },
{ title: '会话ID', dataIndex: 'crt_conversation_id', key: 'crt_conversation_id' }, {
{ title: '消息ID', dataIndex: 'crt_message_id', key: 'crt_message_id' }, title: '会话',
dataIndex: 'crt_conversation_id',
key: 'crt_conversation_id',
render: (text, record) => {
if (text) {
return <Link to={`/order/chat/${record.crt_conversation_id}`}>查看会话</Link>
}
},
},
// { title: 'ID', dataIndex: 'crt_message_id', key: 'crt_message_id' },
// { title: '', dataIndex: 'crt_mei_maillist', key: 'crt_mei_maillist' }, // { title: '', dataIndex: 'crt_mei_maillist', key: 'crt_mei_maillist' },
// { title: '', dataIndex: 'ct_datetime', key: 'ct_datetime' }, // { title: '', dataIndex: 'ct_datetime', key: 'ct_datetime' },
// { title: '', dataIndex: 'crt_mei_country', key: 'crt_mei_country' }, // { title: '', dataIndex: 'crt_mei_country', key: 'crt_mei_country' },
] ]
return ( return (

Loading…
Cancel
Save