解决订单bug

src/pages/order/list/list.js

@@ -73,14 +73,14 @@ const Column = [
   },   {
     title: '账号',
     name: 'account',
-    type: "account",
+    type: "normal",
-    prop:'name',
+    prop:'account',
     width:'auto',
   },
   {
     title: '订单类型',
-    name: 'type',
+    name: 'type_text',
-    prop:'type',
+    prop:'type_text',
     width:'auto',
     type: "normal",
   },
@@ -119,9 +119,9 @@ export default class orderlist extends React.Component{
     this.state={
     tabList:[{title:"订单列表"}],
     orderList:[],
-    filterList:[{id:0,label:"订单状态",menuList:[{id:0,name:"待支付"},{id:1,name:"充值中"},{id:2,name:"已完成"},{id:3,name:"充值失败"},{id:4,name:"已取消"}]},{id:1,label:"订单类型",menuList:[{id:0,name:"兑换码"}]}],
+    filterList:[{id:0,label:"订单状态",menuList:[{id:0,name:"待支付"},{id:1,name:"充值中"},{id:2,name:"已完成"},{id:3,name:"充值失败"},{id:4,name:"已取消"}]}],
     selectiondata:[],
-    menuList:[{id:0,name:"订单状态",check:false},{id:1,name:"订单类型",check:false}]
+    menuList:[{id:0,name:"订单状态",check:false}]
     ,allcheck:false,
     itemcheck:false,
     combinedValue:[],