合并

config/config.js

@@ -144,6 +144,11 @@ export default {
                   name: '商品列表',
                   component: './integralMall/GoodsList',
                 },
+                {
+                  path: '/integralMall/achieve',
+                  name: '积分获取',
+                  component: './integralMall/achieve',
+                },
                 {
                   path: '/integralMall/editGoods',
                   name: '',
@@ -154,6 +159,11 @@ export default {
                   name: '兑换记录',
                   component: './integralMall/exchangeRecords',
                 },
+                {
+                  path: '/integralMall/writeOff',
+                  name: '商品核销',
+                  component: './integralMall/writeOff',
+                },
               ],
             },
             {
@@ -283,13 +293,12 @@ export default {
     basePath: '/',
   },
   chainWebpack: webpackPlugin,
-  
+
   proxy: {
     '/api/': {
-      target: 'http://localhost:8080/',
+      target: 'http://192.168.0.84:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },
   },
-  
 };

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/global.less

@@ -48,10 +48,10 @@ ol {
 }
 
 .ant-pro-global-header{
-  background:linear-gradient(180deg,rgba(107,192,216,1) 0%,rgba(54,141,212,1) 100%);
+  background:#393C39;
 }
 .ant-pro-sider-menu-sider.light .ant-pro-sider-menu-logo{
-  background:linear-gradient(180deg,rgba(107,192,216,1) 0%,rgba(54,141,212,1) 100%);
+  background:#EF273A;
   box-shadow: none;
   border: none;
 }
@@ -99,4 +99,10 @@ ol {
 }
 .ant-pro-sider-menu-logo img{
   height: 41px;
+}
+.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active {
+  color: #FF7E48;
+}
+.ant-table{
+  line-height: 3;
 }

src/layouts/UserLayout.less

@@ -20,21 +20,13 @@
 
 .content {
   flex: 1;
-  padding: 32px 0;
-
 }
 
 @media (min-width: @screen-md-min) {
   .container {
-    background-image: url('../assets/bg.jpg');
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: 100% 100%;
+    background-color: #fff;
   }
 
-  .content {
-    padding: 32px 0 24px;
-  }
 }
 
 .top {

src/pages/activity/ActivityList.jsx

@@ -5,228 +5,226 @@ 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({
-    pathname: '/activity/editActivity',
-    query: {
-      a: 'b',
-    },
-  });
-}
-
-/**
- *
- *
- * @param {*} props
- * @returns
- */
-
-const columns = [
-  {
-    title: '活动标题',
-    dataIndex: 'title',
-    key: 'title',
-    align: 'center',
-  },
-  {
-    title: '活动时间',
-    dataIndex: 'startDate',
-    key: 'startDate',
-    align: 'center',
-    render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format('YYYY-MM-DD')}`}</span></>
-  },
-  {
-    title: '已参加人数',
-    dataIndex: 'count',
-    key: 'count',
-    align: 'center',
-  },
-  {
-    title: '阅读量',
-    dataIndex: 'pvNum',
-    key: 'pvNum',
-    align: 'center',
-  },
-  {
-    title: '转发量',
-    dataIndex: 'shareNum',
-    key: 'shareNum',
-    align: 'center',
-  },
-  {
-    title: '收藏数',
-    dataIndex: 'saveNum',
-    key: 'saveNum',
-    align: 'center',
-  },
-  {
-    title: '状态',
-    dataIndex: 'isEnlist',
-    key: 'isEnlist',
-    align: 'center',
-    render: (isEnlist)=> <><span>{isEnlist == 0 ?"未开始" : isEnlist==1 ? "进行中" : "已结束"}</span></>
-  },
-  {
-    title: '操作',
-    dataIndex: 'handle',
-    key: 'handle',
-    align: 'center',
-    render: (x,row) => <><span style={{ color: '#1990FF'}} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? "报名记录" : ""}<Icon type="snippets" className={styles.shoppingCart} /></span>
-                         <span style={{ color: '#1990FF' }} onClick={sendOrPublicDynamic.bind(this,row)}>{ row.status === 1 ? '取消发布' : '发布' }<Icon type="close-circle" className={styles.edit} /></span>
-                         <span style={{ color: '#1990FF' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
-                         <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={topDynamic.bind(this,row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-                         <span style={{ color: '#FF925C' }}>编辑<Icon type="form" className={styles.edit} /></span>
-                       </>
-  },
-];
-
-const getSignList = (dynamicId) => {
-    router.push({
-        pathname: '/activity/SignList',
-        query: {
-            dynamicId
-        },
-      });
-}
-
-const finishDynamic = (row) => {
-    Modal.confirm({
-        title: '结束以后将无法编辑, 是否继续?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk() {
-            request({
-                url: '/api/admin/buildingDynamic/finish',
-                method: 'PUT',
-                data: {dynamicId: row.dynamicId, top: ""},
-            }).then((data) => {
-                console.log(data)
-                message.info('操作成功！')
-                // getList()
-            }).catch((err) => {
-                console.log(err)
-                message.info(err.msg || err.message)
-            })
-        },
-      });
-}
-
-const topDynamic = (row) => {
-    const weight = Math.abs(row.weight - 1)
-    request({
-        url: '/api/admin/buildingDynamic/weight',
-        method: 'PUT',
-        params: {dynamicId: row.dynamicId, weight},
-    }).then((data) => {
-        console.log(data)
-        message.info('操作成功！')
-        // getList()
-    }).catch((err) => {
-        console.log(err)
-        message.info(err.msg || err.message)
-    })
-}
-
-const sendOrPublicDynamic = (row) => {
-    if (row.status === 1) {
-        cancelDynamic(row)
-    } else {
-        sendDynamic(row)
-    }
-}
-
-// 取消活动
-const cancelDynamic = (row) => {
-    request({
-        url: '/api/admin/buildingDynamic/cancel/'+row.dynamicId,
-        method: 'PUT',
-    }).then((data) => {
-        message.info('操作成功！')
-        // getList()
-    }).catch((err) => {
-        console.log(err)
-        message.info(err.msg || err.message)
-    })
-}
-
-//发布活动
-const sendDynamic = (row) => {
-    request({
-        url: '/api/admin/buildingDynamic/send/'+row.dynamicId,
-        method: 'PUT',
-    }).then((data) => {
-        message.info('操作成功！')
-        // getList()
-    }).catch((err) => {
-        console.log(err)
-        message.info(err.msg || err.message)
-    })
-}
 
 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 toEditGoods = (dynamicId) => () => {
+    router.push({
+      pathname: '/activity/editActivity',
+      query: {
+        dynamicId
+      },
+    });
+  }
+  
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+  
+  const columns = [
+    {
+      title: '活动标题',
+      dataIndex: 'title',
+      key: 'title',
+      align: 'center',
+    },
+    {
+      title: '活动时间',
+      dataIndex: 'startDate',
+      key: 'startDate',
+      align: 'center',
+      render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format('YYYY-MM-DD')}`}</span></>
+    },
+    {
+      title: '已参加人数',
+      dataIndex: 'count',
+      key: 'count',
+      align: 'center',
+    },
+    {
+      title: '阅读量',
+      dataIndex: 'pvNum',
+      key: 'pvNum',
+      align: 'center',
+    },
+    {
+      title: '转发量',
+      dataIndex: 'shareNum',
+      key: 'shareNum',
+      align: 'center',
+    },
+    {
+      title: '收藏数',
+      dataIndex: 'saveNum',
+      key: 'saveNum',
+      align: 'center',
+    },
+    {
+      title: '状态',
+      dataIndex: 'isEnlist',
+      key: 'isEnlist',
+      align: 'center',
+      render: (isEnlist)=> <><span>{isEnlist == 0 ?"未开始" : isEnlist==1 ? "进行中" : "已结束"}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: (x,row) => <><span style={{ color: '#1990FF'}} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? "报名记录" : ""}<Icon type="snippets" className={styles.shoppingCart} /></span>
+                           <span style={{ color: '#1990FF' }} onClick={sendOrPublicDynamic.bind(this,row)}>{ row.status === 1 ? '取消发布' : '发布' }<Icon type="close-circle" className={styles.edit} /></span>
+                           <span style={{ color: '#1990FF' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+                           <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={topDynamic(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+                           <span style={{ color: '#FF925C' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>
+                         </>
+    },
+  ];
+  
+  const getSignList = (dynamicId) => {
+      router.push({
+          pathname: '/activity/SignList',
+          query: {
+              dynamicId
+          },
+        });
+  }
+  
+  const finishDynamic = (row) => {
+      Modal.confirm({
+          title: '结束以后将无法编辑, 是否继续?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+              request({
+                  url: '/api/admin/buildingDynamic/finish',
+                  method: 'PUT',
+                  data: {dynamicId: row.dynamicId, top: ""},
+              }).then((data) => {
+                  console.log(data)
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10 })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+  }
+  
+//   置顶
+  const topDynamic = (row) => () => {
+      const weight = Math.abs(row.weight - 1)
+      request({
+          url: '/api/admin/buildingDynamic/weight',
+          method: 'PUT',
+          params: {dynamicId: row.dynamicId, weight},
+      }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10 })
+      }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+      })
+  }
+  
+  const sendOrPublicDynamic = (row) => {
+      if (row.status === 1) {
+          cancelDynamic(row)
+      } else {
+          sendDynamic(row)
+      }
+  }
+  
+  // 取消活动
+  const cancelDynamic = (row) => {
+      request({
+          url: '/api/admin/buildingDynamic/cancel/'+row.dynamicId,
+          method: 'PUT',
+      }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10 })
+      }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+      })
+  }
+  
+  //发布活动
+  const sendDynamic = (row) => {
+      request({
+          url: '/api/admin/buildingDynamic/send/'+row.dynamicId,
+          method: 'PUT',
+      }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10 });
+      }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+      })
+  }
+  
+  const changePageNum = (pageNumber) => {
+      getList({ pageNum: pageNumber, pageSize: 10 })
+  }
+
+  // 提交事件
+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>,
@@ -252,8 +250,11 @@ const header = (props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEditGoods}>新增</Button>
-      <Table dataSource={data.list} columns={columns} />
+      <Button type="primary" 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} />
+      </div>
     </>
   )
 }

src/pages/activity/SignList.jsx

@@ -10,14 +10,6 @@ import request from '../../utils/request'
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
-
-
-// 分页
-function onChange(pageNumber) {
-  console.log('Page: ', pageNumber);
-}
-
-
 /**
  *
  *
@@ -27,51 +19,64 @@ function onChange(pageNumber) {
 
 const columns = [
   {
-    title: '活动标题',
-    dataIndex: 'title',
-    key: 'title',
+    title: '用户姓名',
+    dataIndex: 'name',
+    key: 'name',
     align: 'center',
   },
   {
-    title: '活动时间',
-    dataIndex: 'startDate',
-    key: 'startDate',
+    title: '手机号',
+    dataIndex: 'phone',
+    key: 'phone',
     align: 'center',
-    render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format('YYYY-MM-DD')}`}</span></>
   },
   {
-    title: '已参加人数',
-    dataIndex: 'count',
-    key: 'count',
+    title: '报名时间',
+    dataIndex: 'createDate',
+    key: 'createDate',
     align: 'center',
+    render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD')}`}</span></>
   }
 ];
 
 
 
 const header = (props) => {
-  const [ data, setData ] = useState({})
+  const [ data, setData ] = useState({list: {}})
 //   const [page, changePage] = useState({})
   useEffect(() => {
-    getSignList();
+    getSignList({pageNum: 1,pageSize: 10, dynamicId: props.location.query.dynamicId });
   },[])
 
   // 查询列表
-  const getSignList = (e) => {
+  const getSignList = (params) => {
     request({
         url: '/api/admin/SignList',
         method: 'GET',
-        params: {pageNum: 1,pageSize: 10, dynamicId: props.location.query.dynamicId },
+        params: { ...params },
     }).then((data) => {
         console.log(data)
         setData(data)
     })
   }
 
+  const changePageNum = (pageNumber) => {
+    getList({ pageNum: pageNumber, pageSize: 10, dynamicId: props.location.query.dynamicId })
+  }
+
+  const toActivityList = () => {
+    router.push({
+      pathname: '/activity/ActivityList',
+    });
+  }
+
   return (
     <>
-      <Button type="primary" className={styles.addBtn}>返回</Button>
-      <Table dataSource={data} columns={columns} />
+      <Button type="primary" className={styles.addBtn} onClick={toActivityList}>返回</Button>
+      <Table dataSource={data.list.data} columns={columns} pagination={false} />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+      </div>
     </>
   )
 }

src/pages/activity/editActivity.jsx

@@ -3,45 +3,42 @@ import { Form, Input, Button, Icon, Select, Tabs, Radio } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 
-
-
 /**
  *
  *
  * @param {*} props
  * @returns
  */
-
-
- const Basic = (props) => {
-   return <div>Basic</div>
- }
- 
- const Poster = (props) => {
-  return <div>Poster</div>
-}
-
-const Share = (props) => {
-  return <div>Share</div>
-}
-
  const Edit = (props) => {
-   const [ tab, changeTab ] = useState('a');
-
+  const [ tab, changeTab ] = useState('basic');
+  const dynamicId = props.location.query.dynamicId
+  console.log(dynamicId)
+
+  const Basic = (props) => {
+  return <div>Basic</div>
+  }
+  
+  const Poster = (props) => {
+   return <div>Poster</div>
+  }
+ 
+  const Share = (props) => {
+    return <div>Share</div>
+  }
 
   return (
     <div>
       <div>
         <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
-          <Radio.Button value="a">基本信息</Radio.Button>
-          <Radio.Button value="b">海报图片</Radio.Button>
-          <Radio.Button value="c">分享设置</Radio.Button>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button>
         </Radio.Group>
       </div>
       <div>
-        { tab === 'a' && <Basic /> }
-        { tab === 'b' && <Poster /> }
-        { tab === 'c' && <Share /> }
+        { tab === 'basic' && <Basic /> }
+        { tab === 'poster' && <Poster /> }
+        { tab === 'share' && <Share /> }
       </div>
     </div>
   );

src/pages/building/type/edi.jsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import { Input, Button, Row, Col, Form, Alert } from 'antd';
 import router from 'umi/router';
 import Styles from './style.less';
@@ -8,22 +8,48 @@ import apis from '../../../services/apis';
 function body(props) {
   const { getFieldDecorator } = props.form;
 
-  console.log('id: ', props.location.query.id)
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  let data = {}
+  const { id } = props.location.query;
+
+  if (id !== '') {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      getById(id)
+    }, [])
+  }
 
   function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
         // 提交数据
-        values.status = 1
-        values.createDate = new Date()
         submitData(values)
       }
     });
   }
 
-  function submitData(data) {
-    request({ ...apis.buildingType.add, data: { ...data } }).then(() => {
+  // 获取详情信息
+  function getById(currentId) {
+    const { url, method } = apis.buildingType.getById
+    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(currentId)
+
+    request({ url: tempUrl, method }).then(res => {
+      data = res
+      props.form.setFieldsValue(res)
+    })
+  }
+
+  function submitData(dataSources) {
+    if (id !== '') {
+      // 修改
+      updateType(dataSources)
+      return
+    }
+
+    dataSources.status = 1
+    dataSources.createDate = new Date()
+    request({ ...apis.buildingType.add, data: { ...dataSources } }).then(() => {
       // eslint-disable-next-line no-unused-expressions
       <Alert
         style={{
@@ -47,9 +73,26 @@ function body(props) {
     })
   }
 
+    // 修改
+    function updateType(row) {
+      const { url, method } = apis.buildingType.update
+      const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(row.buildingTypeId)
+
+      request({ url: tempUrl, method, data: { ...row } }).then(() => {
+        router.go(-1)
+      })
+    }
+
   return (
     <>
         <Form onSubmit={handleSubmit} style={{ width: '500px', margin: 'auto' }}>
+          <Form.Item style={{ display: 'none' }}>
+            {getFieldDecorator('buildingTypeId')(
+              <Input
+                placeholder="buildingTtypeId"
+              />,
+            )}
+          </Form.Item>
           <Form.Item>
             {getFieldDecorator('buildingTypeName', {
               rules: [{ required: true, message: '请输入名称' }],

src/pages/building/type/index.jsx

@@ -85,18 +85,18 @@ function body() {
   }
 
   // 跳转修改页
-  function toEdi(id) {
+  function toEdi(currentId) {
     router.push({
       pathname: '/building/type/edi',
       query: {
-        id,
+        id: currentId || '',
       },
     });
   }
 
   return (
     <>
-      <Button type="primary" className={Styles.addButton} onClick={toEdi}>新增类型</Button>
+      <Button type="primary" className={Styles.addButton} onClick={() => toEdi()}>新增类型</Button>
       <Table dataSource={data.records} columns={columns} pagination={false}/>
       {/* 分页 */}
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

src/pages/integralMall/GoodsList.jsx

@@ -103,7 +103,7 @@ const columns = [
     dataIndex: 'handle',
     key: 'handle',
     align: 'center',
-    render: () => <><span style={{ color: '#1990FF', marginRight: '20px' }} onClick={confirm}>下架<Icon type="shopping-cart" className={styles.shoppingCart} /></span><span style={{ color: '#FF925C' }} onClick={toEditGoods}>编辑<Icon type="form" className={styles.edit} /></span></>,
+    render: () => <><span style={{ color: '#EF273A', marginRight: '20px' }} onClick={confirm}>下架<Icon type="shopping-cart" className={styles.shoppingCart} /></span><span style={{ color: '#FF925C' }} onClick={toEditGoods}>编辑<Icon type="form" className={styles.edit} /></span></>,
   },
 ];
 function confirm() {

src/pages/integralMall/achieve.jsx

@@ -0,0 +1,91 @@
+import React from 'react';
+import { Form, Input, Button, Icon, Tabs, Row, Col, Table } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import router from 'umi/router';
+
+
+const { TabPane } = Tabs;
+function callback(key) {
+  console.log(key);
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const dataSource = [
+  {
+    key: '1',
+    img: 'http://img0.imgtn.bdimg.com/it/u=4246326797,2657995307&fm=26&gp=0.jpg',
+    name: '华为P30 Pro',
+  },
+  {
+    key: '2',
+    img: '',
+    name: '大米',
+  },
+];
+
+const columns = [
+  {
+    title: '类型',
+    dataIndex: 'type',
+    key: 'type',
+    align: 'center',
+  },
+  {
+    title: '获取积分',
+    dataIndex: 'intergral',
+    key: 'intergral',
+    align: 'center',
+  },
+  {
+    title: '状态',
+    dataIndex: 'state',
+    key: 'state',
+    align: 'center',
+  },
+  {
+    title: '说明',
+    dataIndex: 'desc',
+    key: 'desc',
+    align: 'center',
+  },
+  {
+    title: '操作时间',
+    dataIndex: 'time',
+    key: 'time',
+    align: 'center',
+  },
+  {
+    title: '操作',
+    dataIndex: 'handle',
+    key: 'handle',
+    align: 'center',
+    render: () => <><span style={{ color: '#EF273A', marginRight: '20px' }} >停用<Icon type="stop" className={styles.shoppingCart} /></span><span style={{ color: '#EF273A', marginRight: '20px' }} >启用<Icon type="check-circle" className={styles.shoppingCart} /></span><span style={{ color: '#FF925C' }}>编辑<Icon type="form" className={styles.edit} /></span></>,
+  },
+
+];
+
+
+function header(props) {
+  const { getFieldDecorator } = props.form
+  return (
+    <>
+      <Tabs onChange={callback} type="card">
+        <TabPane tab="平台积分" key="1">
+          <Table style={{ marginTop: '40px' }} dataSource={dataSource} columns={columns} />
+        </TabPane>
+        <TabPane tab="项目积分" key="2">
+          <Table style={{ marginTop: '40px' }} dataSource={dataSource} columns={columns} />
+        </TabPane>
+      </Tabs>,
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/integralMall/exchangeRecords.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Form, Input, Button, Icon, Select, DatePicker } from 'antd';
+import { Form, Input, Button, Icon, Select, DatePicker, Table } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 
@@ -172,6 +172,72 @@ class DateRange2 extends React.Component {
   }
 }
 // 领取时间 组件  end
+const dataSource = [
+  {
+    key: '1',
+    img: 'http://img0.imgtn.bdimg.com/it/u=4246326797,2657995307&fm=26&gp=0.jpg',
+    name: '华为P30 Pro',
+  },
+  {
+    key: '2',
+    img: '',
+    name: '大米',
+  },
+];
+
+const columns = [
+
+  {
+    title: '用户姓名',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center',
+
+  },
+  {
+    title: '用户类型',
+    dataIndex: 'type',
+    key: 'type',
+    align: 'center',
+  },
+  {
+    title: '手机号',
+    dataIndex: 'phone',
+    key: 'phone',
+    align: 'center',
+  },
+  {
+    title: '商品图片',
+    dataIndex: 'img',
+    key: 'img',
+    align: 'center',
+    render: (text, record) => <img src={record.img} className={styles.touxiang} />,
+  },
+  {
+    title: '商品名称',
+    dataIndex: 'goodName',
+    key: 'goodName',
+    align: 'center',
+  },
+  {
+    title: '兑换时间',
+    dataIndex: 'time',
+    key: 'time',
+    align: 'center',
+  },
+  {
+    title: '领取时间',
+    dataIndex: 'time2',
+    key: 'time2',
+    align: 'center',
+  },
+  {
+    title: '状态',
+    dataIndex: 'state',
+    key: 'state',
+    align: 'center',
+  },
+];
 
 function record(props) {
   const { getFieldDecorator } = props.form
@@ -221,7 +287,6 @@ function record(props) {
             </Select>,
           )}
         </Form.Item>
-
         <Form.Item>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
@@ -234,6 +299,7 @@ function record(props) {
           <DateRange2 />
         </Form.Item>
       </Form>
+      <Table style={{ marginTop: '40px' }} dataSource={dataSource} columns={columns} />
     </>
   )
 }

src/pages/integralMall/writeOff.jsx

@@ -0,0 +1,73 @@
+import React from 'react';
+import { Form, Input, Button, Icon, Tabs, Row, Col } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import router from 'umi/router';
+import erweima from '../../assets/erweima.png';
+import saoma from '../../assets/saoma.png';
+import list from '../../assets/list.png';
+
+const { TabPane } = Tabs;
+function callback(key) {
+  console.log(key);
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+
+function header(props) {
+  const { getFieldDecorator } = props.form
+  return (
+    <>
+      <Tabs onChange={callback} type="card">
+        <TabPane tab="扫码核销" key="1">
+          <Row>
+            <Col span={8} style={{ textAlign: 'center' }}>
+              <img src={erweima} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
+              <p>1</p>
+              <p>请用户出示核销的二维码</p>
+              <p>请将网页输入法切换成英文</p>
+            </Col>
+            <Col span={8} style={{ textAlign: 'center' }}>
+              <img src={saoma} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
+              <p>2</p>
+              <p>点击“立即核销”按钮</p>
+              <p>使用扫码枪扫描客户二维码</p>
+            </Col>
+            <Col span={8} style={{ textAlign: 'center' }}>
+              <img src={list} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
+              <p>3</p>
+              <p style={{ margin: '44px auto' }}>根据提示进行核销操作</p>
+            </Col>
+          </Row>
+          <Button type="primary" style={{ margin: '80px auto', display: 'block', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }}>立即核销</Button>
+        </TabPane>
+        <TabPane tab="手机号核销" key="2">
+          <Row>
+            <Col span={12} style={{ textAlign: 'center' }}>
+              <img src={erweima} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
+              <p>1</p>
+              <p>请输入用户的手机号</p>
+            </Col>
+            <Col span={12} style={{ textAlign: 'center' }}>
+              <img src={list} style={{ width: '50px', height: '50px', margin: '30px auto' }} />
+              <p>2</p>
+              <p>点击“立即核销”按钮</p>
+            </Col>
+          </Row>
+          <div style={{ margin: '110px auto', display: 'block',textAlign:'center' }}>
+            <Input placeholder="请输入手机号" style={{width:'200px'}} />
+            <Button type="primary" style={{marginLeft:'10px', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }}>立即核销</Button>
+          </div>
+        </TabPane>
+      </Tabs>,
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/style/GoodsList.less

@@ -1,24 +1,24 @@
 .addBtn {
   padding: 0 30px;
   height: 36px;
-  background-color: #50be00;
+  background-color: #FF7E48;
   color: #fff;
   margin: 30px 0;
-  border-color: #50be00;
+  border-color: #FF7E48;
 }
 .addBtn:focus {
   color: #fff;
-  background-color: #50be00;
-  border-color: #50be00;
+  background-color: #FF7E48;
+  border-color: #FF7E48;
 }
 .searchBtn{
- background-color: #3A91D5;
- border-color: #3A91D5;
+ background-color: #EF273A;
+ border-color: #EF273A;
 }
 .searchBtn:focus {
   color: #fff;
-  background-color: #3A91D5;
-  border-color: #3A91D5;
+  background-color: #EF273A;
+  border-color: #EF273A;
 }
 .touxiang {
   width: 93px;
@@ -36,4 +36,4 @@
   color: #dcdcdc;
   margin-left: 6px;
   font-size: 15px;
-}
+}

src/pages/user/login/components/Login/LoginSubmit.jsx

@@ -9,7 +9,7 @@ const LoginSubmit = ({ className, ...rest }) => {
   const clsString = classNames(styles.submit, className);
   return (
     <FormItem>
-      <Button size="large" className={clsString} type="primary" htmlType="submit" {...rest} style={{ background: 'linear-gradient(270deg,rgba(43,112,192,1) 0%,rgba(6,185,209,1) 100%)', borderRadius: '7px', border: 'none' }} />
+      <Button size="large" className={clsString} type="primary" htmlType="submit" {...rest} style={{ backgroundColor: '#DB3C4B', borderRadius: '4px', border: 'none' }} />
     </FormItem>
   );
 };

src/pages/user/login/components/Login/index.jsx

@@ -14,7 +14,7 @@ class Login extends Component {
     className: '',
     defaultActiveKey: '',
     onTabChange: () => { },
-    onSubmit: () => {},
+    onSubmit: () => { },
   };
 
   constructor(props) {
@@ -113,16 +113,24 @@ class Login extends Component {
 
     });
     return (
-      <div  className={styles.loginBox}>
-      <div className={styles.leftBox}></div>
-      <LoginContext.Provider value={this.getContext()}>
-        <div className={styles.login}>
-          <Form onSubmit={this.handleSubmit}>
-            {children}
-          </Form>
+      <>
+        <div className={styles.topBox}>
+          <div className={styles.con}>
+            <p className={styles.welcome}>Welcome</p>
+            <div className={styles.title}>
+              <span style={{fontSize:'18px'}}>ying xiao yun</span>
+              <p className={styles.name}>营销云·系统</p>
+            </div>
+          </div>
         </div>
-      </LoginContext.Provider>
-      </div>
+        <LoginContext.Provider value={this.getContext()}>
+          <div className={styles.login}>
+            <Form onSubmit={this.handleSubmit}>
+              {children}
+            </Form>
+          </div>
+        </LoginContext.Provider>
+      </>
     );
   }
 }

src/pages/user/login/components/Login/index.less

@@ -1,33 +1,53 @@
 @import '~antd/es/style/themes/default.less';
-.loginBox{
-  width:880px;
-height:480px;
-background:rgba(255,255,255,1);
-box-shadow:0px 2px 14px 4px rgba(0,0,0,0.12);
-border-radius:30px;
-margin: 16vh auto;
-.leftBox{
-  width:440px;
-height:480px;
-background:linear-gradient(180deg,rgba(108,193,216,1) 0%,rgba(54,141,212,1) 100%);
-border-radius:30px 0px 0px 30px;
-display: inline-block;
-}
+
+.topBox{
+height:42vh;
+background-color: #DB3C4B;
+position: relative;
+  .con{
+    position: absolute;
+    left:50%;
+    top:50%;
+    margin-top: -100px;
+    margin-left: -136px;
+    text-align: center;
+    height: 200px;
+    width: 272px;
+    overflow: hidden;
+    .welcome{
+      color: #fff;
+      font-size: 60px;
+      font-style: italic;
+      margin-bottom: 0;
+    }
+    .title{
+      width: 260px;
+      height: 102px;
+      border:1px solid #fff;
+      text-align: left;
+      color:#fff;
+      padding: 14px  20px;
+      margin:  0 auto;
+      .name{
+        font-size: 40px;
+        margin:0; 
+      }
+    }
+    }
 }
 .login {
   background-color: #fff;
-  width:440px;
+  width:580px;
   height:480px;
   padding:120px 50px;
   border-radius:0px 30px 30px 0px;
- float: right;
+  margin: 0 auto;
   :global {
     .ant-tabs .ant-tabs-bar {
       margin-bottom: 24px;
       text-align: center;
       border-bottom: 0;
     }
-
     .ant-form-item {
       margin: 0 2px 24px;
     }

src/services/apis.js

@@ -34,5 +34,9 @@ export default {
       method: 'POST',
       url: `${prefix}/tdBuildingType`,
     },
+    getById: {
+      method: 'GET',
+      url: `${prefix}/tdBuildingType/id`,
+    },
   },
 }