Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

src/pages/activity/ActivityList.jsx

           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
+      <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       <Table dataSource={data.list} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />

src/pages/building/type/index.jsx

 
   return (
     <>
-      <Button type="primary" className={Styles.addButton} onClick={() => toEdi()}>新增类型</Button>
-      <Table dataSource={data.records} columns={columns} pagination={false}/>
+      <Button type="danger" onClick={() => toEdi()}>新增类型</Button>
+      <Table style={{marginTop:'30px'}} dataSource={data.records} columns={columns} pagination={false}/>
       {/* 分页 */}
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={onChange} />

src/pages/carouselFigure/advertisingList.jsx

           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEdit()}>新增</Button>
+      <Button type="danger" className={styles.addBtn} onClick={toEdit()}>新增</Button>
       <Table dataSource={data.records} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />

src/pages/carouselFigure/carouselFigureList.jsx

           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEditCarouse()}>新增</Button>
+      <Button type="danger" className={styles.addBtn} onClick={toEditCarouse()}>新增</Button>
       <Table dataSource={data.records} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />

src/pages/channel/brokerList.jsx

       {/* <Button onClick={() => refurbishList() }>重置</Button> */}
     </div>
     </div>
-    <Table dataSource={data.list} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
+    <Table style={{marginTop:'40px'}} dataSource={data.list} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
   </>
 )
 }

src/pages/customer/customerlist/index.jsx

           )}
         </Form.Item>
         <Form.Item>
-          <Button type="danger" htmlType="submit" >
-            搜索
+          <Button type="primary" htmlType="submit" >
+            查询
           </Button>
         </Form.Item>
       </Form>

src/pages/customer/report/index.jsx

           </Button>
         </Form.Item>
       </Form>
-      <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
+      <Table style={{marginTop:'40px'}} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
     </>
   );
 }

src/pages/integralMall/GoodsList.jsx

           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
+      <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       <Table dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />

src/pages/integralMall/exchangeRecords.jsx

           </Form.Item>
         </div>
       </Form>
-      <Table dataSource={data.records} columns={columns} pagination={false} />
+      <Table style={{marginTop:'40px'}} dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
       </div>