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

src/components/subnav/main.js

@@ -74,7 +74,6 @@ export default class topNav extends React.Component{
     }
 
   render(){
-    console.log(77, this.state.menulinklist);
     let history0= window.history.length<=1;
     let routeflag=sessionStorage.getItem('showflag')
     let breaknav=JSON.parse(sessionStorage.getItem('breaknav'))
@@ -162,12 +161,10 @@ export default class topNav extends React.Component{
                         <div className="dflexa" key={key2}>
                          {key2!=0?<span>></span>:null} 
                           <font  className={key2+1==breaknav[0].items.length?'nomenuactive':''}> {item2.name}</font>
-                         
                         </div>
                       )
                     })
                   }         
-
                   </div>
               </div>
                 )
@@ -176,7 +173,6 @@ export default class topNav extends React.Component{
             </div>
           ):null
         }
-        
       </div>)
   }
 }

src/pages/order/list/list.js

@@ -99,6 +99,12 @@ const Column = [
     name: 'opearo',
     type: "slot",
     width: '140px',
+  }, {
+    title: '平台批次号',
+    name: 'num',
+    type: "normal",
+    prop: 'num',
+    width: 'auto',
   },
   {
     title: '创建时间',