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

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',
+                },
               ],
             },
             {
@@ -220,6 +230,11 @@ export default {
                   name: '',
                   component: './activity/editActivity',
                 },
+                {
+                  path: '/activity/SignList',
+                  name: '报名列表',
+                  component: './activity/SignList',
+                },
               ],
             },
             {
@@ -278,7 +293,7 @@ export default {
     basePath: '/',
   },
   chainWebpack: webpackPlugin,
-  
+
   proxy: {
     '/api/': {
       target: 'http://localhost:8080/',
@@ -286,5 +301,5 @@ export default {
       // pathRewrite: { '^/server': '' },
     },
   },
-  
+
 };

src/components/SelectButton/CitySelect.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 CitySelect = (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(city => (
+            <Option key={city.buildingId}>{city.buildingName}</Option>
+          ))}
+      </Select>
+  )
+}
+export default CitySelect
+

src/global.less

@@ -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/pages/activity/ActivityList.jsx

@@ -3,6 +3,8 @@ import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagina
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import router from 'umi/router';
+import moment from 'moment';
+import SelectCity from '../../components/SelectButton/CitySelect'
 
 import request from '../../utils/request'
 
@@ -52,84 +54,155 @@ const columns = [
   },
   {
     title: '活动时间',
-    dataIndex: 'name',
-    key: 'name',
+    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: 'integral',
-    key: 'integral',
+    dataIndex: 'count',
+    key: 'count',
     align: 'center',
   },
   {
     title: '阅读量',
-    dataIndex: 'total',
-    key: 'total',
+    dataIndex: 'pvNum',
+    key: 'pvNum',
     align: 'center',
   },
   {
     title: '转发量',
-    dataIndex: 'exchanged',
-    key: 'exchanged',
+    dataIndex: 'shareNum',
+    key: 'shareNum',
     align: 'center',
   },
   {
     title: '收藏数',
-    dataIndex: 'rest',
-    key: 'rest',
+    dataIndex: 'saveNum',
+    key: 'saveNum',
     align: 'center',
   },
   {
     title: '状态',
-    dataIndex: 'state',
-    key: 'state',
+    dataIndex: 'isEnlist',
+    key: 'isEnlist',
     align: 'center',
+    render: (isEnlist)=> <><span>{isEnlist == 0 ?"未开始" : isEnlist==1 ? "进行中" : "已结束"}</span></>
   },
   {
     title: '操作',
     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' }}>编辑<Icon type="form" className={styles.edit} /></span></>,
+    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 confirm = () => {
-  Modal.confirm({
-    title: '确认下架该商品？',
-    okText: '确认',
-    cancelText: '取消',
-    onOk() {
-      console.log('OK');
-    },
-    onCancel() {
-      console.log('Cancel');
-    },
-  });
 
+const getSignList = (dynamicId) => {
+    router.push({
+        pathname: '/activity/SignList',
+        query: {
+            dynamicId
+        },
+      });
 }
 
-const header = (props) => {
-  const [ data, setData ] = useState({})
-//   const [page, changePage] = useState({})
+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)
+            })
+        },
+      });
+}
 
-  useEffect(() => {
+const topDynamic = (row) => {
+    const weight = Math.abs(row.weight - 1)
     request({
-        url: '/api/admin/iBuildingDynamicList',
-        method: 'GET',
-        params: {pageNum: 1,pageSize: 10},
+        url: '/api/admin/buildingDynamic/weight',
+        method: 'PUT',
+        params: {dynamicId: row.dynamicId, weight},
     }).then((data) => {
         console.log(data)
-        setData(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();
   },[])
 
+  // 查询列表
   const getList = (e) => {
     request({
-        url: '/api/xxx',
+        url: '/api/admin/iBuildingDynamicList',
         method: 'GET',
-        params: {},
+        params: {pageNum: 1,pageSize: 10},
     }).then((data) => {
+        console.log(data)
         setData(data)
     })
   }
@@ -141,10 +214,7 @@ const header = (props) => {
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
           {getFieldDecorator('goodState')(
-            <Select style={{ width: '180px' }} placeholder="请选择城市" onChange={handleSelectChange}>
-              <Option value="1">上架</Option>
-              <Option value="0">下架</Option>
-            </Select>,
+            <SelectCity />,
           )}
         </Form.Item>
         <Form.Item>
@@ -164,16 +234,16 @@ const header = (props) => {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('goodState')(
-            <Select style={{ width: '180px' }} placeholder="是否报名" onChange={handleSelectChange}>
-              <Option value="1">上架</Option>
-              <Option value="0">下架</Option>
-            </Select>,
+          {getFieldDecorator('min')(
+            <DatePicker />
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('min')(
-            <DatePicker />
+          {getFieldDecorator('goodState')(
+            <Select style={{ width: '180px' }} placeholder="是否报名" onChange={handleSelectChange}>
+              <Option value="1">已报名</Option>
+              <Option value="0">未报名</Option>
+            </Select>,
           )}
         </Form.Item>
         <Form.Item>
@@ -184,10 +254,6 @@ const header = (props) => {
       </Form>
       <Button type="primary" className={styles.addBtn} onClick={toEditGoods}>新增</Button>
       <Table dataSource={data.list} columns={columns} />
-      {/* 分页 */
-      /* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={500} onChange={onChange} />
-      </div> */}
     </>
   )
 }

src/pages/activity/SignList.jsx

@@ -0,0 +1,80 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import router from 'umi/router';
+import moment from 'moment';
+
+import request from '../../utils/request'
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+
+
+// 分页
+function onChange(pageNumber) {
+  console.log('Page: ', pageNumber);
+}
+
+
+/**
+ *
+ *
+ * @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',
+  }
+];
+
+
+
+const header = (props) => {
+  const [ data, setData ] = useState({})
+//   const [page, changePage] = useState({})
+  useEffect(() => {
+    getSignList();
+  },[])
+
+  // 查询列表
+  const getSignList = (e) => {
+    request({
+        url: '/api/admin/SignList',
+        method: 'GET',
+        params: {pageNum: 1,pageSize: 10, dynamicId: props.location.query.dynamicId },
+    }).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+
+  return (
+    <>
+      <Button type="primary" className={styles.addBtn}>返回</Button>
+      <Table dataSource={data} columns={columns} />
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

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

@@ -36,4 +36,4 @@
   color: #dcdcdc;
   margin-left: 6px;
   font-size: 15px;
-}
+}

src/utils/request.js

@@ -78,7 +78,7 @@ request.interceptors.response.use(async (response, options) => {
         throw new Error(message);
       }
 
-      if (data.token) {
+      if (data && data.token) {
         window.localStorage.setItem('x-token', data.token)
       }