接口联调

src/pages/orderList/index.tsx

@@ -25,6 +25,10 @@ interface FilterData {
   current?: number;
   limit?: number;
 }
+interface ITableColumns {
+  column: string,
+  title: string
+}
 
 const OrderList: React.FC = () => {
   const [class_name, set_className] = useState('');
@@ -36,6 +40,7 @@ const OrderList: React.FC = () => {
   const [totalCount, set_totalCount] = useState(0);
   const [current, set_current] = useState(1);
   const [limit, set_limit] = useState(PAGE_SIZE);
+  const [tableColunmSetting, setTableColunmSetting] = useState<Array<string>>([])
 
   const [form] = Form.useForm();
   const formItemLayout = {
@@ -60,8 +65,28 @@ const OrderList: React.FC = () => {
       current,
       limit
     });
+    getTableColumnSetting()
   }, []);
 
+  const getTableColumnSetting = () => {
+    api(`/51business/api/course/back/column/all`, {
+      type: 'GET',
+      data: {}
+    }).then(res => {
+      console.log(res)
+      let list: Array<string> = []
+      if (res && res.list && res.list.length > 0) {
+        res.list.map((item: ITableColumns) => {
+          list.push(item.column)
+          return null
+        })
+      } else {
+        list = ['order_no', 'class_name', 'pay', 'pay_time']
+      }
+      setTableColunmSetting(list)
+    });
+  }
+
   const getList = ({
     class_name = '',
     user_name = '',
@@ -219,6 +244,7 @@ const OrderList: React.FC = () => {
         current={current}
         totalCount={totalCount}
         handleTableChange={handleTableChange}
+        tableColunmSetting={tableColunmSetting}
       />
     </BasicPage>
   );

src/pages/orderList/list.tsx

@@ -18,6 +18,7 @@ interface DataSourceI {
   current: number;
   totalCount: number;
   handleTableChange: any;
+  tableColunmSetting: Array<string>
 }
 interface IColumnsValue {
   title: string;
@@ -25,18 +26,18 @@ interface IColumnsValue {
   key: string | number;
   render?: Function
 }
-const columns: Array<any> = []
-let userColumnsKeys: Array<string> = ['order_no', 'class_name', 'name', 'address', 'phone', 'pay', 'pay_time']
-userColumnsKeys.map((item) => {
-  for (let key in tableColumnsSetting) {
-    if (key === item) {
-      columns.push(tableColumnsSetting[key])
-    }
-  }
-  return null
-})
+
 
 const List: React.FC<DataSourceI> = props => {
+  const columns: Array<any> = []
+  props.tableColunmSetting.map((item) => {
+    for (let key in tableColumnsSetting) {
+      if (key === item) {
+        columns.push(tableColumnsSetting[key])
+      }
+    }
+    return null
+  })
   return (
     <div style={{ padding: '30px' }}>
       <Table

src/pages/orderList/tableColumnsSetting.tsx

@@ -24,7 +24,15 @@ const TableColumnsSetting: IObjectStringKeys = {
     dataIndex: 'address',
     key: 'name',
     render: (row: any) => {
-      return <span>{row.name}</span>;
+      return <span>{row.name ? row.name : '--'}</span>;
+    }
+  },
+  address_name: {
+    title: '用户姓名(收货人)',
+    dataIndex: 'address',
+    key: 'name',
+    render: (row: any) => {
+      return <span>{row.name ? row.name : '--'}</span>;
     }
   },
   address: {
@@ -32,12 +40,12 @@ const TableColumnsSetting: IObjectStringKeys = {
     dataIndex: 'address',
     key: 'address',
     render: (row: any) => {
+      const address = `${row.province ? row.province : ''}${row.city ? row.city : ''}${row.area ? row.area : ''}${row.address ? row.address : ''}`
       return (
         <span>
-          {row.province}
-          {row.city}
-          {row.area}
-          {row.address}
+          {
+            address ? address : '--'
+          }
         </span>
       );
     }
@@ -47,7 +55,7 @@ const TableColumnsSetting: IObjectStringKeys = {
     dataIndex: 'address',
     key: 'phone',
     render: (row: any) => {
-      return <span>{row.phone}</span>;
+      return <span>{row.phone ? row.phone : '--'}</span>;
     }
   },
   pay: {
@@ -59,6 +67,38 @@ const TableColumnsSetting: IObjectStringKeys = {
     title: '下单时间',
     dataIndex: 'pay_time',
     key: 'pay_time'
+  },
+  child_name: {
+    title: '孩子姓名',
+    dataIndex: 'columns',
+    key: 'child_name',
+    render: (row: any) => {
+      return <span>{row.child_name ? row.child_name : '--'}</span>;
+    }
+  },
+  child_age: {
+    title: '孩子年龄',
+    dataIndex: 'columns',
+    key: 'child_age',
+    render: (row: any) => {
+      return <span>{row.child_age ? row.child_age : '--'}</span>;
+    }
+  },
+  child_grade: {
+    title: '孩子年级',
+    dataIndex: 'columns',
+    key: 'child_grade',
+    render: (row: any) => {
+      return <span>{row.child_grade ? row.child_grade : '--'}</span>;
+    }
+  },
+  city: {
+    title: '所在城市',
+    dataIndex: 'columns',
+    key: 'city',
+    render: (row: any) => {
+      return <span>{row.city ? row.city : '--'}</span>;
+    }
   }
 }