Merge branch 'addMenu' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu

This commit is contained in:
wangsongsole 2022-06-15 14:43:14 +08:00
commit f5eb05a523
1 changed files with 4 additions and 1 deletions

View File

@ -120,7 +120,7 @@ const Column = [
{ {
title: '平台批次号', title: '平台批次号',
name: 'channel_activity_id', name: 'channel_activity_id',
type: 'normal', type: 'slot',
prop: 'channel_activity_id', prop: 'channel_activity_id',
width: 'auto' width: 'auto'
}, },
@ -733,6 +733,9 @@ export default class orderlist extends React.Component {
if (com === 'type_text') { if (com === 'type_text') {
return <span>{rowData.type === 1 ? '商品' : '立减金'}</span> return <span>{rowData.type === 1 ? '商品' : '立减金'}</span>
} }
if(com=='channel_activity_id'){
return <span>{rowData.channel_activity_id?rowData.channel_activity_id : '-'}</span>
}
if (com == 'opearo') { if (com == 'opearo') {
return ( return (
<div> <div>