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

src/pages/order/list/list.js

@@ -120,7 +120,7 @@ const Column = [
   {
     title: '平台批次号',
     name: 'channel_activity_id',
-    type: 'normal',
+    type: 'slot',
     prop: 'channel_activity_id',
     width: 'auto'
   },
@@ -733,6 +733,9 @@ export default class orderlist extends React.Component {
                 if (com === 'type_text') {
                   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') {
                   return (
                     <div>