building

src/components/SelectButton/BuildSelect.jsx

@@ -0,0 +1,40 @@
+import React, { useState, useEffect } from 'react';
+import { Select } from 'antd';
+
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const BuildingSelect = (props) => {
+  const [ data, setData ] = useState([])
+
+  useEffect(() => {
+    getCityList();
+  },[])
+
+  const getCityList = (e) => {
+    request({
+        url: '/api/admin/buildinglist/select',
+        method: 'GET',
+        params: {pageNum: 1,pageSize: 999},
+    }).then((data) => {
+        setData(data.records)
+    })
+  }
+
+  return (
+      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择项目" onChange={props.onChange}>
+          {data.map(building => (
+            <Option key={building.buildingId}>{building.buildingName}</Option>
+          ))}
+      </Select>
+  )
+}
+export default BuildingSelect
+

src/components/SelectButton/CitySelect.jsx

@@ -20,18 +20,18 @@ const CitySelect = (props) => {
 
   const getCityList = (e) => {
     request({
-        url: '/api/admin/buildinglist/select',
+        url: '/api/admin/tdCity',
         method: 'GET',
-        params: {pageNum: 1,pageSize: 999},
+        params: {leveltype: 2, pageNum: 1,pageSize: 999},
     }).then((data) => {
-        setData(data.records)
+        setData(data)
     })
   }
 
   return (
       <Select value={props.value} style={{ width: '180px' }} placeholder="请选择城市" onChange={props.onChange}>
           {data.map(city => (
-            <Option key={city.buildingId}>{city.buildingName}</Option>
+            <Option key={city.id}>{city.name}</Option>
           ))}
       </Select>
   )

src/pages/activity/ActivityList.jsx

@@ -5,29 +5,13 @@ import styles from '../style/GoodsList.less';
 import router from 'umi/router';
 import moment from 'moment';
 import SelectCity from '../../components/SelectButton/CitySelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect'
 
 import request from '../../utils/request'
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-// 提交事件
-function handleSubmit(e, props) {
-  e.preventDefault();
-  props.form.validateFields((err, values) => {
-    if (!err) {
-      console.log('提交数据: ', values)
-    }
-  });
-}
-// Change 事件
-function handleSelectChange(props) {
-  console.log(props)
-}
 
-// 分页
-function onChange(pageNumber) {
-  console.log('Page: ', pageNumber);
-}
 // 跳转到编辑商品
 function toEditGoods() {
   router.push({
@@ -187,46 +171,60 @@ const sendDynamic = (row) => {
     })
 }
 
+const changePageNum = (pageNumber) => {
+    getList({ pageNum: pageNumber, pageSize: 10 })
+}
+
+
+
 const header = (props) => {
   const [ data, setData ] = useState({})
 //   const [page, changePage] = useState({})
 
   useEffect(() => {
-    getList();
+    getList({ pageNum: 1, pageSize: 10 });
   },[])
 
   // 查询列表
-  const getList = (e) => {
+  const getList = (params) => {
     request({
         url: '/api/admin/iBuildingDynamicList',
         method: 'GET',
-        params: {pageNum: 1,pageSize: 10},
+        params: { ...params },
     }).then((data) => {
         console.log(data)
         setData(data)
     })
   }
 
+  // 提交事件
+const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
   const { getFieldDecorator } = props.form
   return (
 
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
-          {getFieldDecorator('goodState')(
+          {getFieldDecorator('cityId')(
             <SelectCity />,
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('isMain')(
-            <Select style={{ width: '180px' }} placeholder="请选择项目" onChange={handleSelectChange}>
-              <Option value="1">首页推荐</Option>
-              <Option value="0">首页未推荐</Option>
-            </Select>,
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('name')(
+          {getFieldDecorator('title')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
               placeholder="请输入标题"
@@ -234,13 +232,13 @@ const header = (props) => {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('min')(
+          {getFieldDecorator('time')(
             <DatePicker />
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('goodState')(
-            <Select style={{ width: '180px' }} placeholder="是否报名" onChange={handleSelectChange}>
+          {getFieldDecorator('isEnlist')(
+            <Select style={{ width: '180px' }} placeholder="是否报名">
               <Option value="1">已报名</Option>
               <Option value="0">未报名</Option>
             </Select>,
@@ -253,7 +251,10 @@ const header = (props) => {
         </Form.Item>
       </Form>
       <Button type="primary" className={styles.addBtn} onClick={toEditGoods}>新增</Button>
-      <Table dataSource={data.list} columns={columns} />
+      <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} />
+      </div>
     </>
   )
 }