zls

config/routes.js

@@ -274,6 +274,23 @@ export default [
                 hideInMenu: true,
                 component: './activity/drainage/Detail',
               },
+              {
+                path: '/activity/helpActivity/list',
+                name: '助力活动',
+                component: './activity/helpActivity/list',
+              },
+              {
+                path: '/activity/helpActivity/helpRecord',
+                name: '助力记录',
+                hideInMenu: true,
+                component: './activity/helpActivity/helpRecord',
+              },
+              {
+                path: '/activity/helpActivity/edithelpActivity',
+                name: '新增',
+                hideInMenu: true,
+                component: './activity/helpActivity/edithelpActivity',
+              },
             ],
           },
           {
@@ -374,6 +391,24 @@ export default [
               },
             ],
           },
+          {
+            path: '/third',
+            name: '第三方管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/third/thirdList',
+                name: '第三方公司',
+                component: './third/thirdList',
+              },
+              {
+                path: '/third/editThirdParty',
+                name: '编辑活动',
+                hideInMenu: true,
+                component: './third/editThirdParty',
+              },
+            ],
+          },
           {
             component: './404',
           },

src/pages/activity/ActivityList.jsx

@@ -13,40 +13,40 @@ import AuthButton from '@/components/AuthButton';
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
-const header = (props) => {
-  const [ data, setData ] = useState({})
+const header = props => {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState({ list: [], total: 0 })
 //   const [page, changePage] = useState({})
 
+ // 查询列表
+ const getList = params => {
+  request({ ...apis.activity.list, params: { ...params } }).then(data => {
+      console.log(data)
+      setData(data)
+  })
+}
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10 });
-  },[])
-
-  // 查询列表
-  const getList = (params) => {
-    request({ ...apis.activity.list, params: { ...params } }).then((data) => {
-        console.log(data)
-        setData(data)
-    })
-  }
+  }, [])
 
-  
 // 跳转到编辑商品
-const toEditGoods = (dynamicId) => () => {
+const toEditGoods = dynamicId => () => {
     router.push({
       pathname: '/activity/editActivity',
       query: {
-        dynamicId
+        dynamicId,
       },
     });
   }
-  
+
   /**
    *
    *
    * @param {*} props
    * @returns
    */
-  
   const columns = [
     {
       title: '活动标题',
@@ -90,14 +90,14 @@ const toEditGoods = (dynamicId) => () => {
       dataIndex: 'isEnlist',
       key: 'isEnlist',
       align: 'center',
-      render: (isEnlist)=> <><span>{isEnlist == 0 ?"未开始" : isEnlist==1 ? "进行中" : "已结束"}</span></>
+      render: isEnlist => <><span>{isEnlist == 0 ? "未开始" : isEnlist == 1 ? '进行中' : '已结束'}</span></>,
     },
     {
       title: '操作',
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x,row) => (
+      render: (x, row) => (
         <>
           <AuthButton name="admin.SignList.get" noRight={null}>
             <span style={{ color: '#1990FF', cursor: 'pointer'}} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? "报名记录" : ""}<Icon type="snippets" className={styles.shoppingCart} /></span>
@@ -116,48 +116,48 @@ const toEditGoods = (dynamicId) => () => {
       )
     },
   ];
-  
-  const getSignList = (dynamicId) => {
+
+  const getSignList = dynamicId => {
       router.push({
           pathname: '/activity/SignList',
           query: {
-              dynamicId
+              dynamicId,
           },
         });
   }
-  
-  const finishDynamic = (row) => {
+
+  const finishDynamic = row => {
       Modal.confirm({
           title: '结束以后将无法编辑, 是否继续?',
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({ ...apis.activity.finish, data: {dynamicId: row.dynamicId, top: ""} }).then((data) => {
+              request({ ...apis.activity.finish, data: {dynamicId: row.dynamicId, top: "" } }).then(data => {
                   console.log(data)
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10 })
-              }).catch((err) => {
+              }).catch(err => {
                   console.log(err)
                   message.info(err.msg || err.message)
               })
           },
         });
   }
-  
+
 //   置顶
-  const topDynamic = (row) => () => {
+  const topDynamic = row => () => {
       const weight = Math.abs(row.weight - 1)
-      request({ ...apis.activity.weight, params: {dynamicId: row.dynamicId, weight} }).then((data) => {
+      request({ ...apis.activity.weight, params: {dynamicId: row.dynamicId, weight} }).then(data => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 })
-      }).catch((err) => {
+      }).catch(err => {
           console.log(err)
           message.info(err.msg || err.message)
       })
   }
   
-  const sendOrPublicDynamic = (row) => {
+  const sendOrPublicDynamic = row => {
       if (row.status === 1) {
           cancelDynamic(row)
       } else {
@@ -166,7 +166,7 @@ const toEditGoods = (dynamicId) => () => {
   }
   
   // 取消活动
-  const cancelDynamic = (row) => {
+  const cancelDynamic = row => {
       request({ ...apis.activity.cancel, urlData: {id: row.dynamicId}}).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 })
@@ -177,7 +177,7 @@ const toEditGoods = (dynamicId) => () => {
   }
   
   //发布活动
-  const sendDynamic = (row) => {
+  const sendDynamic = row => {
       request({ ...apis.activity.send, urlData: {id: row.dynamicId}}).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 });
@@ -187,7 +187,7 @@ const toEditGoods = (dynamicId) => () => {
       })
   }
   
-  const changePageNum = (pageNumber) => {
+  const changePageNum = pageNumber => {
       getList({ pageNum: pageNumber, pageSize: 10 })
   }
 
@@ -258,7 +258,7 @@ const handleSubmit = (e, props) => {
       </AuthButton>
       <Table dataSource={data.list} columns={columns} pagination={false} rowKey="activityList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+       <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={(e) => changePageNum(e)} />
       </div>
     </>
   )

src/pages/activity/editActivity.jsx

@@ -29,7 +29,7 @@ const { TextArea } = Input;
 const Edit = (props) => {
   const [tab, changeTab] = useState('basic')
   const dynamicId = props.location.query.dynamicId
-  const [dynamicData, setDynamicData] = useState({})
+  const [dynamicData, setDynamicData] = useState({ isEnlist: 1 })
   if (dynamicId) {
     useEffect(() => {
       getDynamicData(dynamicId);
@@ -50,6 +50,11 @@ const Edit = (props) => {
     });
   }
 
+  const radioOnChange = e => {
+    console.log(e.target.value)
+    setDynamicData({ ...dynamicData, isEnlist: e.target.value })
+  }
+
   const Basic = (props) => {
     const fields = [
       {
@@ -123,7 +128,7 @@ const Edit = (props) => {
       {
         label: '是否需要报名',
         name: 'isEnlist',
-        render: <Radio.Group name="radiogroup">
+        render: <Radio.Group name="radiogroup" onChange={(e) => radioOnChange(e)}>
           <Radio value={1}>是</Radio>
           <Radio value={0}>否</Radio>
         </Radio.Group>,
@@ -132,9 +137,10 @@ const Edit = (props) => {
       {
         label: '报名时间',
         name: 'signupTime',
-        type: FieldTypes.RangePicker,
+        // type: FieldTypes.RangePicker,
+        render: dynamicData.isEnlist === 1 ? (<RangePicker format={ 'YYYY/MM/DD HH:mm' } style={{ width: '100%' }} />) : '',
         value: dynamicData.enlistStart != null ? [moment(dynamicData.enlistStart, 'YYYY-MM-DD HH:mm'), moment(dynamicData.enlistEnd, 'YYYY-MM-DD HH:mm')] : null,
-        props: {showTime:{ format: 'HH:mm' }},
+        // props: {showTime:{ format: 'HH:mm' }},
         rules: [
           { required: true, message: '请选择报名时间' },
         ]

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -0,0 +1,365 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../../style/GoodsList.less';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../../components/XForm';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import request from '../../../utils/request'
+import yinhao from '../../../assets/yinhao.png'
+import ImageUploader from '../../../components/XForm/ImageUpload';
+import logo from '../../../assets/logo.png';
+import touxiang from '../../../assets/touxiang.jpg';
+import poster1 from '../../../assets/poster1.png';
+import poster2 from '../../../assets/poster2.png';
+import xiaochengxu from '../../../assets/xiaochengxu.png'
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic')
+  // 判断是否展示助力次数的输入框
+  // const [help, helpTab] = useState('1')
+  const { dynamicId } = props.location.query
+  const [dynamicData, setDynamicData] = useState({})
+  if (dynamicId) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      // eslint-disable-next-line no-use-before-define
+      getDynamicData(dynamicId);
+    }, [])
+
+    // 查询列表
+    const getDynamicData = (dynamicId) => {
+      request({ ...apis.activity.details, params: { dynamicId } }).then((data) => {
+        console.log(data)
+        setDynamicData(data)
+      })
+    }
+  }
+
+  const cancelPage = () => {
+    router.push({
+      pathname: '/activity/ActivityList',
+    });
+  }
+
+  const Basic = props => {
+    const fields = [
+      {
+        label: '选择项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: dynamicData.buildingId,
+        rules: [
+          { required: true, message: '请选择项目' },
+        ]
+      },
+      {
+        label: '活动标题',
+        name: 'title',
+        type: FieldTypes.Text,
+        value: dynamicData.title,
+        rules: [
+          { required: true, message: '请输入活动标题' },
+        ]
+      },
+      {
+        label: '活动主图',
+        name: 'img',
+        type: FieldTypes.ImageUploader,
+        value: dynamicData.img,
+        help: '建议图片尺寸：750px*560px',
+      },
+      {
+        label: '活动时间',
+        name: 'activityTime',
+        type: FieldTypes.RangePicker,
+        value: dynamicData.startDate != null ? [moment(dynamicData.startDate, 'YYYY-MM-DD HH:mm'), moment(dynamicData.endDate, 'YYYY-MM-DD HH:mm')] : null,
+        props: { showTime: { format: 'HH:mm' } },
+        rules: [
+          { required: true, message: '请选择活动时间' },
+        ],
+      },
+      {
+        label: '助力邀请人数',
+        name: 'personNum',
+        type: FieldTypes.Text,
+        value: dynamicData.persionNum,
+        rules: [
+          { required: true, message: '请输入活动人数' },
+        ]
+      },
+      {
+        label: '助力次数',
+        name: 'maxEnlistByPerson',
+        type: FieldTypes.Text,
+        value: dynamicData.helpNum,
+        rules: [
+          { required: true, message: '请选择是否助力' },
+        ],
+        render: <Radio.Group name="radiogroup">
+        <Radio value={1}>不限制</Radio>
+        <Radio value={0}>次数限制</Radio>
+      </Radio.Group>,
+      },
+      {
+        label: ' ',
+        name: 'personNum',
+        type: FieldTypes.Text,
+        value: dynamicData.personNum,
+        rules: [
+          { required: true, message: '请输入次数' },
+        ],
+      },
+      {
+        label: '活动说明',
+        name: 'activityInstructions',
+        type: FieldTypes.ImageUploader,
+        value: dynamicData.activityInstructions,
+        help: '建议图片尺寸：750px*560px',
+      },
+    ]
+
+    const handleSubmit = val => {
+      const { activityTime, signupTime, ...submitValue } = val
+      console.log('val', val)
+      const [startDate, endDate] = activityTime
+      submitValue.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
+      submitValue.endDate = moment(endDate).format('YYYY-MM-DD HH:mm');
+      // const [enlistStart, enlistEnd] = signupTime
+      // submitValue.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
+      // submitValue.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
+      console.log('submit data --->', submitValue)
+      // if (dynamicId) {
+      //   submitValue.dynamicId = dynamicId
+      //   request({ ...apis.activity.update, data: submitValue }).then((data) => {
+      //     message.info("保存成功")
+      //     cancelPage()
+      //   }).catch((err) => {
+      //     message.info(err.msg || err.message)
+      //   })
+      // } else {
+      //   request({ ...apis.activity.add, data: submitValue }).then((data) => {
+      //     message.info("保存成功")
+      //     cancelPage()
+      //   }).catch((err) => {
+      //     message.info(err.msg || err.message)
+      //   })
+      // }
+    }
+
+    return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  }
+
+  const Poster = (props) => {
+    const [inputValue, changeInput] = useState('')
+    const [textAreaValue, changeTextArea] = useState('')
+    const [imgValue, changeImg] = useState('')
+    const [posterId, setPosterId] = useState('')
+
+    if (dynamicId) {
+      console.log(dynamicId, 'dynamicId')
+      useEffect(() => {
+        request({ ...apis.activity.poster, params: { targetId: dynamicId, targetType: 'activity' } }).then((data) => {
+          console.log(data, "2222")
+          if (data.length > 0) {
+            setPosterId(data[0].posterId)
+            changeImg(data[0].posterImg)
+            changeTextArea(data[0].posterDescription)
+            changeInput(data[0].posterTitle)
+          }
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+        getMiniappName()
+      }, [])
+    }else{
+      getMiniappName()
+    }
+    // 获取小程序名称
+    const [miniappName, setMiniappName] = useState('')
+    function getMiniappName() {
+      request({ ...apis.building.getMiniappName }).then(res => {
+        console.log(res, "0000000000000")
+        setMiniappName(res)
+      })
+    }
+
+    const submitPoster = () => {
+      if (dynamicId) {
+        if (posterId) {
+          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: dynamicId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        } else {
+          request({ ...apis.activity.addPoster, data: { targetId: dynamicId, targetType: 'activity', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+            setPosterId(data.posterId)
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        }
+      } else {
+        message.warn("请先保存基本信息数据")
+      }
+    }
+
+    return <div>
+      <div style={{ display: 'flex' }}>
+        <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
+          <div style={{ width: '375px', height: '700px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
+            <img style={{ width: '100%', height: '300px' }} src={imgValue ? imgValue : poster1} alt="" />
+            <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
+              <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src={touxiang} alt="" />
+              <span style={{ color: '#222', fontWeight: '600', margin: '24px 10px 0 14px', fontSize: '17px' }}>喵喵</span>
+              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您阅读</span>
+              <span style={{ color: '#999', margin: '25px 0 0 60px', fontSize: '17px' }}>2019.09.21</span>
+            </div>
+            <p style={{
+              margin: '10px 20px', fontSize: '20px', color: '#222', fontWeight: '600',
+              display: '-webkit-box', lineClamp: '3', height: '60px',
+              WebkitLineClamp: '2',
+              WebkitBoxOrient: 'vertical',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis'
+            }}>{inputValue ? inputValue : '海报标题'}</p>
+
+            <img src={yinhao} style={{ width: '30px', marginLeft: '20px' }} alt="" />
+            <p style={{
+              margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
+              display: '-webkit-box', lineClamp: '3', height: '72px',
+              WebkitLineClamp: '3',
+              WebkitBoxOrient: 'vertical',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis'
+            }}>{textAreaValue ? textAreaValue : '海报描述'}</p>
+            <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc', position: 'relative' }}>
+              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
+              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>进入<span style={{ margin: '0 5px', fontSize: '18px', color: '#333', fontWeight: '600' }}>{miniappName || '置业V顾问'}</span>报名活动</p>
+              <img style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }} src={xiaochengxu} alt="" />
+            </div>
+          </div>
+          <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
+        </div>
+
+        <div >
+          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片1</p>
+            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+          </div>
+          <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题1</p>
+            <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
+          </div>
+          <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述1</p>
+            <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+          </div>
+
+        </div>
+      </div>
+      <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+      <Button onClick={() => router.go(-1)}>取消</Button>
+    </div>
+
+  }
+
+
+
+  const Share = (props) => {
+    const [inputValue, changeInput] = useState('')
+    const [imgValue, changeImg] = useState('')
+    const [shareContentId, setShareContentId] = useState('')
+
+    if (dynamicId) {
+      useEffect(() => {
+        request({ ...apis.activity.shareContent, params: { targetId: dynamicId, targetType: 'activity' }, }).then((data) => {
+          console.log(data, "2222")
+          if (data.length > 0) {
+            setShareContentId(data[0].shareContentId)
+            changeImg(data[0].shareContentImg)
+            changeInput(data[0].shareContentTitle)
+          }
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }, [])
+    }
+
+    const submitShare = () => {
+      if (dynamicId) {
+        if (shareContentId) {
+          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        } else {
+          request({ ...apis.activity.addShareContent, data: { targetId: dynamicId, shareContentType: 'activity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+            setShareContentId(data.shareContentId)
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        }
+      } else {
+        message.warn("请先保存基本信息数据")
+      }
+    }
+
+    return <div style={{ padding: '20px' }}>
+      <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板1</p>
+        <div>
+          <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />知与行互动</p>
+          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '置业V客厅 精准获客平台'}</p>
+          <img style={{ width: '200px', height: '140px' }} src={imgValue ? imgValue : poster2} alt="" />
+        </div>
+      </div>
+      <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题1</p>
+        <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
+      </div>
+      <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片1</p>
+        <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+      </div>
+      <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+      <Button onClick={() => router.go(-1)}>取消</Button>
+    </div>
+  }
+
+  return (
+    <div>
+      <div>
+        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
+          <Radio.Button value="basic">基本信息1</Radio.Button>
+          <Radio.Button value="poster">海报图片1</Radio.Button>
+          <Radio.Button value="share">分享设置1</Radio.Button>
+        </Radio.Group>
+      </div>
+      <div>
+        {tab === 'basic' && <Basic />}
+        {tab === 'poster' && <Poster />}
+        {tab === 'share' && <Share />}
+      </div>
+    </div>
+  );
+}
+
+
+
+export default Edit

src/pages/activity/helpActivity/helpRecord.jsx

@@ -0,0 +1,330 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions } from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import router from 'umi/router';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import AuthButton from '@/components/AuthButton';
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+function body(props) {
+  const { getFieldDecorator, getFieldsValue } = props.form
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataSource, setDataSource] = useState({ records: [] })
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  // const [columns, setColumns] = useState(privateColumns)
+
+  // 默认私客
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [customerType, setCustomerType] = useState('private')
+
+  // 调整归属 ============  start
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [gVisibleData, setGVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
+  // 调整归属 ============= end
+
+  // 积分记录 ============  start
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [recordVisibleData, setRecordVisibleData] = useState({ visible: false, customerId: '' })
+  // 积分记录 ============= end
+
+  // 变更状态 ============  start
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [statusVisibleData, setStatusVisibleData] = useState({ visible: false, customerId: '', status: '' })
+  // 变更状态 ============= end
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList({ pageNumber: 1, pageSize: 10, customerType })
+  }, [])
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.customer.customerRecommend, params: { ...params } }).then(res => {
+      setDataSource(res)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  function displayNone() {
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setStatusVisibleData({ visible: false, customerId: '', status: '' })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    displayNone()
+
+
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, customerType, ...values })
+      }
+    });
+  }
+
+  // Change 事件
+  function handleSelectChange(e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+
+  // 分页
+  function onChange(pageNum) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    getList({ pageNumber: pageNum, pageSize: 10, customerType })
+  }
+
+  // 私客/公客切换
+  function radioButtonHandleSizeChange(e) {
+    displayNone()
+
+    const { value } = e.target
+    setCustomerType(value)
+    //setColumns(value === 'private' ? privateColumns : publicColumns)
+    getList({ pageNumber: 1, pageSize: 10, customerType: value })
+  }
+
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNumber: 1, pageSize: 10, customerType })
+  }
+
+
+  // 这里有个 Bug， 就是 Modal 弹框，会联动出现， 比如 我点击 调整归属的Model弹框， 那么 积分记录的Model弹框莫名其妙的也显示了
+  // 所有这里临时解决方法是，弹出一个Modal对话框的时候，把其他的对话框给隐藏
+
+  function showGM(record) {
+    setGVisibleData({ visible: true, customerId: record.customerId, realtyConsultant: record.realtyConsultant })
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setStatusVisibleData({ visible: false, customerId: '' })
+  }
+
+  function showRecord(record) {
+    setRecordVisibleData({ visible: true, customerId: record.customerId })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setStatusVisibleData({ visible: false, customerId: '' })
+  }
+
+  function showStatus(record) {
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setStatusVisibleData({ visible: true, customerId: record.customerId, status: record.status })
+  }
+  function toCustomerDateil(record) {
+    router.push({
+      pathname: '/customer/customerlist/customerDetail',
+      query: {
+        id: record.customerId,
+      },
+    });
+  }
+
+  function exportCustomer () {
+    const fieldsValue = getFieldsValue()
+    request({ ...apis.customer.customerRecommendExport, responseType: 'blob', params: { ...fieldsValue, customerType } })
+      .then(response => {
+        download(response)
+      }).catch(error => {
+
+      })
+  }
+
+  function download (data) {
+    if (!data) {
+      return
+    }
+    const url = window.URL.createObjectURL(new Blob([data]))
+    const link = document.createElement('a')
+    link.style.display = 'none'
+    link.href = url
+    link.setAttribute('download', '客户列表.xlsx')
+    document.body.append(link)
+    link.click()
+  }
+
+  const publicColumns = [
+    {
+      title: '头像',
+      dataIndex: 'picture',
+      key: 'picture',
+      align: 'center',
+      width: '15%',
+      render: (_, record) => <Avatar shape="square" src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
+    },
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{customerType === 'private' ? record.name : record.nickname}</span></>,
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+      width: '15%',
+    },
+    {
+      title: '推广人员',
+      dataIndex: 'sharePersonName',
+      key: 'sharePersonName',
+      align: 'center',
+      width: '15%',
+    },
+  ]
+
+  const privateColumns = [
+    {
+      title: '头像',
+      dataIndex: 'picture',
+      key: 'picture',
+      align: 'center',
+      width: '15%',
+      render: (_, record) => <Avatar shape="square" src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
+    },
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{customerType === 'private' ? record.name : record.nickname}</span></>,
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+      width: '15%',
+    },
+    {
+      title: '性别',
+      dataIndex: 'sex',
+      key: 'sex',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
+    },
+    {
+      title: '置业顾问',
+      dataIndex: 'consultantName',
+      key: 'consultantName',
+      align: 'center',
+      width: '15%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => (
+        <>
+          <span>{record.consultantName}</span>
+          <br />
+          <span>{record.consultTel}</span>
+        </>
+      ),
+    },
+    {
+      title: '推广人员',
+      dataIndex: 'sharePersonName',
+      key: 'sharePersonName',
+      align: 'center',
+      width: '15%',
+    },
+    {
+      title: '客户状态',
+      dataIndex: 'reportRecommendStatus',
+      key: 'reportRecommendStatus',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (text, records) => {
+        if (records.status === 1) { return '报备' }
+        if (records.status === 2) { return '到访' }
+        if (records.status === 3) { return '认筹' }
+        if (records.status === 4) { return '签约' }
+      },
+    },
+    {
+      title: '操作',
+      dataIndex: 'customerId',
+      key: 'customerId',
+      align: 'center',
+      width: '25%',
+      // eslint-disable-next-line no-nested-ternary
+    },
+  ]
+
+  return (
+    <>
+    {console.log('customerType', customerType)}
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('tel')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="电话"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+            <Button type="primary" htmlType="submit" >
+              查询
+            </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              返回
+            </Button>
+        </Form.Item>
+      </Form>
+      <Button type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+        导出
+      </Button>
+
+      <div style={{ margin: '20px 0'}}>
+        <AuthButton name="admin.customer.recommend.get" noRight={null}>
+          <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
+            <Radio.Button value="private">助力成功</Radio.Button>
+            <Radio.Button value="public">进行中</Radio.Button>
+            <Radio.Button value="error ">助力失败</Radio.Button>
+          </Radio.Group>
+        </AuthButton>
+      </div>
+      {customerType === 'private' ? 
+        <Table dataSource={dataSource.records} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
+        <Table dataSource={dataSource.records} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> 
+      }
+    </>
+  );
+}
+
+const WrappedBody = Form.create({ name: 'body' })(body);
+
+export default WrappedBody

src/pages/activity/helpActivity/list.jsx

@@ -0,0 +1,261 @@
+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 SelectCity from '../../../components/SelectButton/CitySelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = (props) => {
+  const [ data, setData ] = useState({})
+//   const [page, changePage] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.helpActivity.list, params: { ...params } }).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+
+  
+// 跳转到助力新增
+const toEditGoods = (dynamicId) => () => {
+    router.push({
+      pathname: '/activity/helpActivity/edithelpActivity',
+      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: 'enlistNum',
+      key: 'enlistNum',
+      align: 'center',
+    },
+    {
+      title: '助力成功数',
+      dataIndex: 'persionNum',
+      key: 'persionNum',
+      align: 'center',
+    },  
+    {
+      title: '状态',
+      dataIndex: 'isEnlist',
+      key: 'isEnlist',
+      align: 'center',
+      render: (text, records) => {
+        if (records.status === 0) { return '未开始' }
+        if (records.status === 1) { return '进行中' }
+        if (records.status === 2) { return '已结束' }
+      },
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: (x,row) => (
+        <>
+          <AuthButton name="admin.SignList.get" noRight={null}>
+            <span style={{ color: '#1990FF', cursor: 'pointer'}} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? "助力记录" : ""}<Icon type="snippets" className={styles.shoppingCart} /></span>
+          </AuthButton>
+          <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this,row)}>{ row.status === 1 ? '取消发布' : '发布' }<Icon type="close-circle" className={styles.edit} /></span>
+          </AuthButton>
+          <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
+            {row.isEnlist != 2 && <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
+          </AuthButton>
+          <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            {row.isEnlist != 2 && <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
+          </AuthButton>
+        </>
+      )
+    },
+  ];
+  
+  const getSignList = (dynamicId) => {
+      router.push({
+          pathname: '/activity/helpActivity/helpRecord',
+          query: {
+              dynamicId
+          },
+        });
+  }
+  
+  const finishDynamic = (row) => {
+      Modal.confirm({
+          title: '结束以后将无法编辑, 是否继续?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+              request({ ...apis.activity.finish, 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({ ...apis.activity.weight, 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({ ...apis.activity.cancel, urlData: {id: row.dynamicId}}).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10 })
+      }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+      })
+  }
+  
+  //发布活动
+  const sendDynamic = (row) => {
+      request({ ...apis.activity.send, urlData: {id: row.dynamicId}}).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 })
+      }
+    });
+  }
+
+   //重置搜索
+   function handleReset() {
+    props.form.resetFields();
+  }
+
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+            <SelectCity />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('title')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="请输入标题"
+            />,
+          )}
+        </Form.Item>
+        {/* <Form.Item>
+          {getFieldDecorator('time')(
+            <DatePicker />
+          )}
+        </Form.Item> */}
+        <Form.Item>
+          {getFieldDecorator('isEnlist')(
+            <Select style={{ width: '180px' }} placeholder="活动状态">
+              <Option value="1">进行中</Option>
+              <Option value="2">未开始</Option>
+              <Option value="3">已结束</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+            搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
+      </AuthButton>
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="activityList"/>
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/building/list/add/components/base.jsx

@@ -90,7 +90,7 @@ function AddBuilding(props) {
     const api = data.buildingId === undefined ? apis.building.addBuilding : apis.building.updateBuilding
     request({ ...api, data: { ...data } }).then(() => {
       openNotificationWithIcon('success', '操作成功')
-      router.go(-1)
+      // router.go(-1)
     }).catch(err => {
       openNotificationWithIcon('error', err.message)
     })

src/pages/building/list/add/components/buildingProjectType.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { Button, Radio, Icon, Form, Input, Row, Col, Modal, notification, Checkbox } from 'antd';
+import { Button, Radio, Icon, Form, Input, Row, Col, Modal, notification, Checkbox, InputNumber } from 'antd';
 import { render } from 'react-dom';
 import request from '../../../../../utils/request';
 import apis from '../../../../../services/apis';
@@ -32,7 +32,13 @@ class TypeForm extends React.Component {
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
         // console.log('Received values of form: ', values);
-        values[name] = e.target.value
+        const currentValue = e.target.value
+        if (currentValue === '') {
+          values[name] = null
+        } else {
+          values[name] = currentValue
+        }
+        
         values.buildingTypeName = this.props.type.buildingTypeName
         console.log('values: ', values)
         this.props.onSuccess(values)
@@ -48,7 +54,7 @@ class TypeForm extends React.Component {
     const { getFieldDecorator } = this.props.form;
 
     // this.props.form.setFieldsValue(this.props.type)
-
+    console.log(this.props.type)
     return (
       <>
         <Col span={11} style={{
@@ -130,7 +136,7 @@ class ProjectTypeBody extends React.Component {
     const { projectType } = this.state
     const buildingType = projectType.filter(item => checked.includes(`${item.buildingTypeId}`))
 
-    const tempDate = buildingType.map(item => ({ buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName, price: '', decoration: '', rightsYear: '', status: '1' }))
+    const tempDate = buildingType.map(item => ({ buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName, price: null, decoration: null, rightsYear: null, status: '1' }))
     const updateProjectDate = this.updateProjectType(tempDate)
     console.log('updateProjectDate: ', updateProjectDate)
     this.setState({ data: updateProjectDate })
@@ -138,7 +144,10 @@ class ProjectTypeBody extends React.Component {
 
   onClose = e => {
     const { data } = this.state
+    console.log('onClose——data: ', data)
+    console.log('onClose: ', e.buildingTypeId)
     const buildingType = data.filter(item => e.buildingTypeId !== item.buildingTypeId)
+    console.log('onClose——data: ', buildingType)
     this.setState({ data: buildingType })
     this.setState({ defaultCheckboxValue: buildingType.map(item => item.buildingTypeId) })
   }
@@ -234,7 +243,7 @@ class ProjectTypeBody extends React.Component {
         </Modal>
         <Row type="flex" justify="space-between">
           {
-            this.state.data.map(item => <WrappedTypeForm type={item} key={item.id} onSuccess={(e) => this.onSuccess(e, item)} onClose={(e) => this.onClose(e)} />)
+            this.state.data.map(item => <WrappedTypeForm type={item} key={item.buildingTypeId} onSuccess={(e) => this.onSuccess(e, item)} onClose={(e) => this.onClose(e)} />)
           }
         </Row>
       </>

src/pages/third/editThirdParty.jsx

@@ -0,0 +1,109 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import apis from '../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit'
+import request from '../../utils/request'
+import yinhao from '../../assets/yinhao.png'
+import ImageUploader from '../../components/XForm/ImageUpload';
+import logo from '../../assets/logo.png';
+import touxiang from '../../assets/touxiang.jpg';
+import poster1 from '../../assets/poster1.png';
+import poster2 from '../../assets/poster2.png';
+import xiaochengxu from '../../assets/xiaochengxu.png'
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const third = (props) => {
+  const configId = props.location.query.configId
+  const [thirdData, setThirdData] = useState({})
+  if (configId) {
+    useEffect(() => {
+      getThirdData(configId);
+    }, [])
+
+    // 查询列表
+    const getThirdData = (configId) => {
+      request({ ...apis.third.details, urlData: { id: configId } }).then((data) => {
+        console.log(data)
+        setThirdData(data)
+      })
+    }
+  }
+
+  const cancelPage = () => {
+    router.push({
+      pathname: '/third/thirdList',
+    });
+  }
+ 
+  const fields = [
+    {
+      label: 'appid',
+      name: 'appid',
+      type: FieldTypes.Text,
+      value: thirdData.appid,
+      rules: [
+        { required: true, message: '请输入appid' },
+      ]
+    },
+    {
+      label: 'appSecret',
+      name: 'appSecret',
+      type: FieldTypes.Text,
+      value: thirdData.appSecret,
+      rules: [
+        { required: true, message: '请输入appSecret' },
+      ]
+    },
+    {
+      label: '过期时间',
+      name: 'expirationDate',
+      type: FieldTypes.DatePicker,
+      value: thirdData.expirationDate != null ? moment(thirdData.expirationDate, 'YYYY-MM-DD HH:mm') : null,
+      rules: [
+        { required: true, message: '请选择时间' },
+      ]
+    },
+  ]
+
+  const handleSubmit = val => {
+    console.log('submit data --->', val)
+    if (configId) {
+      val.configId = configId
+      request({ ...apis.third.update, data: val }).then((data) => {
+        message.info("保存成功")
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+    } else {
+      request({ ...apis.third.add, data: val }).then((data) => {
+        message.info("保存成功")
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+    }
+  }
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  );
+}
+
+
+
+export default third

src/pages/third/thirdList.jsx

@@ -0,0 +1,103 @@
+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 SelectCity from '../../components/SelectButton/CitySelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import apis from '../../services/apis';
+import request from '../../utils/request';
+import AuthButton from '@/components/AuthButton';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = (props) => {
+  const [ data, setData ] = useState({})
+//   const [page, changePage] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.third.thirdPartyMiniapp, params: { ...params },}).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+
+  //重置搜索
+  const handleReset = () => {
+    props.form.resetFields();
+  }
+
+  const toEditThirdParty =  (configId) => () => {
+    router.push({
+      pathname: '/third/editThirdParty',
+      query: {
+        configId
+      },
+    });
+  }
+
+  const columns = [
+    {
+      title: 'appid',
+      dataIndex: 'appid',
+      key: 'appid',
+      align: 'center',
+    },
+    {
+      title: 'appSecret',
+      dataIndex: 'appSecret',
+      key: 'appSecret',
+      align: 'center',
+    },
+    {
+      title: '过期时间',
+      dataIndex: 'expirationDate',
+      key: 'expirationDate',
+      align: 'center',
+      render: (x, row) => <><span>{moment(row.expirationDate).format('YYYY-MM-DD')}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: (x,row) => (
+        <>
+          <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
+            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditThirdParty(row.configId)}>编辑<Icon type="form" className={styles.edit} /></span>
+          </AuthButton>
+        </>
+      )
+    },
+  ];
+   
+  
+  const changePageNum = (pageNumber) => {
+      getList({ pageNum: pageNumber, pageSize: 10 })
+  }
+ 
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEditThirdParty()}>新增</Button>
+      </AuthButton>
+      <Table rowKey="messageList" 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>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/services/apis.js

@@ -678,4 +678,33 @@ export default {
     action: 'admin.updateAuthMenu.post',
   },
  },
+ helpActivity: {
+  list: {
+    url: `${prefix}/helpActivity/list`,
+    method: 'GET',
+    action: 'admin.taRole.get',
+  },
+ },
+ third: {
+  thirdPartyMiniapp: {
+    url: `${prefix}/thirdPartyMiniapp`,
+    method: 'GET',
+    action: 'admin.thirdPartyMiniapp.get',
+  },
+  update: {
+    url: `${prefix}/thirdPartyMiniapp/update`,
+    method: 'PUT',
+    action: 'admin.thirdPartyMiniapp.update.put',
+  },
+  add: {
+    url: `${prefix}/thirdPartyMiniapp/add`,
+    method: 'POST',
+    action: 'admin.thirdPartyMiniapp.add.post',
+  },
+  details: {
+    url: `${prefix}/thirdPartyMiniapp/:id`,
+    method: 'GET',
+    action: 'admin.thirdPartyMiniapp.id.get',
+  },
+ },
 }