diff --git a/src/actions/ConversationActions.js b/src/actions/ConversationActions.js
index 5795894..5dbfb05 100644
--- a/src/actions/ConversationActions.js
+++ b/src/actions/ConversationActions.js
@@ -51,7 +51,7 @@ export const fetchTemplates = async (params) => {
'7notification_of_one_day_before_ending_the_trip_only_asean_by_cr_v7',
'notification_of_one_day_before_ending_the_trip_by_cr_v2',
];
- const crNamesOmit = [
+ const NamesOmit = [
'birthday_greetings_by_marketing','one_day_before_ending_the_trip_by_marketing',
'introduce_the_voucher_one_day_before_ending_the_trip_by_marketing',
'birthday_greetings_by_customer_relations_0',
@@ -66,6 +66,7 @@ export const fetchTemplates = async (params) => {
'notification_of_account_updated_by_cr',
'birthday_greetings_by_customer_relations',
'one_day_before_ending_the_trip_by_customer_relations',
+ 'network_troubleshooting',
]
const canUseTemplates = (data?.result?.items || [])
.filter((_t) => _t.status === 'APPROVED' && !['say_hello_from_trip_advisor', 'free_style_7', 'free_style_1', 'free_style_2'].includes(_t.name))
@@ -76,15 +77,15 @@ export const fetchTemplates = async (params) => {
key: ele.name,
// displayName: ele.name.startsWith('order_updated') ? templatesDisplayNameMap['order_updated']+`_${i}` : templatesDisplayNameMap?.[ele.name] || ele.name,
displayName: templatesDisplayNameMap?.[ele.name] || (ele.name.startsWith('order_updated') ? templatesDisplayNameMap['order_updated'] + `_${i}` : ele.name),
- displayLanguage: crNamesOmit.includes(ele.name)
- ? '客运-'
- : crNamesAuto.includes(ele.name)
- ? '客运Task'
- : crNames.includes(ele.name) || ele.name.includes('by_cr')
- ? ele.language + '-客运'
- : scNames.includes(ele.name)
- ? ele.language + '-示例'
- : ele.language,
+ displayLanguage: NamesOmit.includes(ele.name)
+ ? '--'
+ : crNamesAuto.includes(ele.name)
+ ? '客运Task'
+ : crNames.includes(ele.name) || ele.name.includes('by_cr')
+ ? ele.language + '-客运'
+ : scNames.includes(ele.name)
+ ? ele.language + '-示例'
+ : ele.language.slice(0, 2),
}))
const top2Name = topName.concat(canUseTemplates.filter(_t => _t.name.startsWith('order_updated')).map(_tem => _tem.name));
@@ -94,7 +95,7 @@ export const fetchTemplates = async (params) => {
const secondS = second.sort(sortBy('name'));
const raw = canUseTemplates.filter((_t) => !top2Name.includes(_t.name) && !_t.name.includes('free_style'));
// 剩下的排序
- const rawS = sortArrayByOrder(raw, 'name', [...crNames, ...scNames, ...crNamesOmit ]);
+ const rawS = sortArrayByOrder(raw, 'name', [...crNames, ...scNames, ...NamesOmit ]);
return [...top, ...secondS, ...rawS];
};
/**
diff --git a/src/views/Conversations/Online/Input/Template.jsx b/src/views/Conversations/Online/Input/Template.jsx
index 0e98305..ab05c3c 100644
--- a/src/views/Conversations/Online/Input/Template.jsx
+++ b/src/views/Conversations/Online/Input/Template.jsx
@@ -27,6 +27,7 @@ const splitTemplate = (template) => {
// MARKETING
const templateCaterogyText = { 'UTILITY': '跟进', 'MARKETING': '营销' }
const templateCaterogyTipText = { 'UTILITY': '触达率高', 'MARKETING': '' }
+const templateCaterogyTipText2 = { 'UTILITY': '', 'MARKETING': '美国(+1)❌' }
const CategoryList = ({ dataSource, handleSendTemplate, valueMapped, onInput, activeInput }) => {
const currentConversation = useConversationStore((state) => state.currentConversation);
@@ -167,6 +168,7 @@ const CategoryList = ({ dataSource, handleSendTemplate, valueMapped, onInput, ac
{/* {templateCaterogyText[item.category]} */}
{templateCaterogyTipText[item.category] && {templateCaterogyTipText[item.category]}}
+ {templateCaterogyTipText2[item.category] && {templateCaterogyTipText2[item.category]}}