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

config/routes.js

@@ -103,36 +103,28 @@ export default [
                 component: './customer/drift/index',
               },
               {
-                path: '/customer/report/list',
-                name: '报备客户',
-                component: './customer/report/index',
-              },
-              {
-                path: '/customer/recommendCustomer/list',
-                name: '推荐客户',
-                component: './customer/recommendCustomer/index',
-              },
-              {
-                path: '/customer/recommendCustomer/audit',
-                name: '客户审核',
+                path: '/customer/customerlist/publicCustomerDetail',
+                name: '公客详情',
                 hideInMenu: true,
-                component: './customer/recommendCustomer/audit',
-              },
-              {
-                path: '/customer/independentList',
-                name: '专业经纪人',
-                component: './customer/independentList/index',
+                component: './customer/customerlist/publicCustomerDetail',
               },
+            ],
+          },
+          {
+            path: '/recommend',
+            name: '推荐客户',
+            component: '../layouts/BlankLayout',
+            routes: [
               {
-                path: '/customer/visiting',
-                name: '到访记录',
-                component: './customer/visiting/index',
+                path: '/recommend/recommendCustomer/list',
+                name: '推荐记录',
+                component: './recommend/recommendCustomer/index',
               },
               {
-                path: '/customer/customerlist/publicCustomerDetail',
-                name: '公客详情',
+                path: '/recommend/recommendCustomer/audit',
+                name: '客户审核',
                 hideInMenu: true,
-                component: './customer/customerlist/publicCustomerDetail',
+                component: './recommend/recommendCustomer/audit',
               },
             ],
           },
@@ -221,6 +213,11 @@ export default [
                 hideInMenu: true,
                 component: './channel/InviteClients',
               },
+              {
+                path: '/channel/independentList',
+                name: '专业经纪人',
+                component: './channel/independentList/index',
+              },
             ],
           },
           {
@@ -259,7 +256,7 @@ export default [
             routes: [
               {
                 path: '/activity/ActivityList',
-                name: '活动列表',
+                name: '报名活动',
                 component: './activity/ActivityList',
               },
               {
@@ -269,21 +266,16 @@ export default [
                 component: './activity/editActivity',
               },
               {
-                path: '/activity/SignList',
-                name: '报名列表',
+                path: '/activity/detailActivity',
+                name: '活动详情',
                 hideInMenu: true,
-                component: './activity/SignList',
+                component: './activity/detailActivity',
               },
               {
-                path: '/activity/drainage/DrainageList',
-                name: '全网投放引流',
-                component: './activity/drainage/DrainageList',
-              },
-              {
-                path: '/activity/drainage/Detail',
-                name: '查看详情',
+                path: '/activity/SignList',
+                name: '报名列表',
                 hideInMenu: true,
-                component: './activity/drainage/Detail',
+                component: './activity/SignList',
               },
               {
                 path: '/activity/helpActivity/list',
@@ -302,7 +294,12 @@ export default [
                 hideInMenu: true,
                 component: './activity/helpActivity/edithelpActivity',
               },
-              
+              {
+                path: '/activity/helpActivity/signList',
+                name: '报名列表',
+                hideInMenu: true,
+                component: './activity/helpActivity/signList',
+              },
               {
                 path: '/activity/groupActivity/list',
                 name: '拼团活动',
@@ -320,7 +317,37 @@ export default [
                 hideInMenu: true,
                 component: './activity/groupActivity/editgroupActivity',
               },
-
+              {
+                path: '/activity/groupActivity/detailActivity',
+                name: '活动详情',
+                hideInMenu: true,
+                component: './activity/groupActivity/detailActivity',
+              },
+              {
+                path: '/activity/drainage/DrainageList',
+                name: 'H5活动',
+                component: './activity/drainage/DrainageList',
+              },
+              {
+                path: '/activity/drainage/Detail',
+                name: '查看详情',
+                hideInMenu: true,
+                component: './activity/drainage/Detail',
+              },
+              {
+                path: '/activity/drainage/DetailDrainage',
+                name: 'H5详情',
+                hideInMenu: true,
+                component: './activity/drainage/DetailDrainage',
+              },
+              {
+                path: '/activity/helpActivity/detailActivity',
+                name: '活动详情',
+                hideInMenu: true,
+                component: './activity/helpActivity/detailActivity',
+              },
+              
+              
             ],
           },
           {
@@ -357,16 +384,22 @@ export default [
                 hideInMenu: true,
                 component: './staff/list/addRole',
               },
+              {
+                path: '/staff/list/distribution',
+                name: '分配归属',
+                hideInMenu: true,
+                component: './staff/list/distribution',
+              },
             ],
           },
           {
             path: '/carouselFigure',
-            name: '轮播图管理',
+            name: '资源位管理',
             component: '../layouts/BlankLayout',
             routes: [
               {
                 path: '/carouselFigure/carouselFigureList',
-                name: '轮播图列表',
+                name: '轮播图',
                 component: './carouselFigure/carouselFigureList',
               },
               {
@@ -386,6 +419,28 @@ export default [
                 hideInMenu: true,
                 component: './carouselFigure/editAdvertising',
               },
+              {
+                path: '/carouselFigure/propagandaList',
+                name: '宣传位',
+                component: './carouselFigure/propagandaList',
+              },
+              {
+                path: '/carouselFigure/propaganda',
+                name: '宣传位编辑',
+                hideInMenu: true,
+                component: './carouselFigure/propaganda',
+              },
+              {
+                path: '/carouselFigure/customImg/list',
+                name: '其他',
+                component: './carouselFigure/customImg/list',
+              },
+              {
+                path: '/carouselFigure/customImg/edit',
+                name: '其他编辑',
+                hideInMenu: true,
+                component: './carouselFigure/customImg/edit',
+              },
             ],
           },
           {
@@ -410,7 +465,7 @@ export default [
               },
               {
                 path: '/system/housingPolicy',
-                name: '购房政策维护',
+                name: '购房政策',
                 component: './system/housingPolicy',
               },
               {
@@ -432,6 +487,23 @@ export default [
               },
             ],
           },
+          {
+            path: '/record',
+            name: '数据记录',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/record/report/list',
+                name: '报备记录',
+                component: './record/report/index',
+              },
+              {
+                path: '/record/drainage/DrainageVisitRecordList',
+                name: '分享记录',
+                component: './record/drainage/DrainageVisitRecordList',
+              },
+            ],
+          },
           {
             component: './404',
           },

package.json

@@ -43,7 +43,8 @@
   "dependencies": {
     "@ant-design/pro-layout": "^4.5.9",
     "@antv/data-set": "^0.10.2",
-    "antd": "^3.25.0",
+    "ant": "^0.2.0",
+    "antd": "^3.26.0",
     "classnames": "^2.2.6",
     "dayjs": "^1.8.16",
     "dva": "^2.4.1",

src/components/AuthButton/index.jsx

@@ -13,11 +13,12 @@ const AuthButton = ({ children, name, noRight }) => {
 
   // const hasRight = btn.roles.some(x => current.some(y => x === y))
 
-  if (!btn || !btn.rolesList || !btn.rolesList.length) {
+  if (!btn) {
     return <>{children}</>
   }
 
-  const hasRight = btn.rolesList.some(x => current.some(y => x.roleId === y))
+  const hasRight = current.filter(x => x.code === name)[0]
+  
   return hasRight ? <>{children}</> : <>{noRight}</>
 }
 

src/components/Cards/PosterCard.jsx

@@ -1,7 +1,12 @@
 import React, { useState, useEffect } from 'react';
-import { Card, Checkbox } from 'antd';
+import { Card, Checkbox, Button, Upload } from 'antd';
 import apis from '../../services/apis';
 import request from '../../utils/request'
+import { uploaderProps } from '../../utils/upload';
+import head1 from '../../assets/head1.png';
+import head2 from '../../assets/head2.png';
+import head3 from '../../assets/head3.png';
+import link from '../../assets/link.png';
 
 const { Meta } = Card;
 
@@ -12,48 +17,117 @@ const { Meta } = Card;
  * @returns
  */
 const PosterCard = (props) => {
-  const [ data, setData ] = useState([])
-//   const [ checkedData, setCheckedData ] = useState([])
+  const [data, setData] = useState([])
+  const [indexOneUrl, setIndexOneUrl] = useState('')
+  const [indexTwoUrl, setIndexTwoUrl] = useState('')
+  const [indexThreeUrl, setIndexThreeUrl] = useState('')
+  let resultData = []
 
   useEffect(() => {
-    getCardsList(props.postType);    
-  },[])
+  }, [])
 
+  const handleUploadIndexOneSucess = url => {
+    console.log(url, "第一张图上传回调");
+    setIndexOneUrl(url)
+    resultData[0] = url
+    resultData[1] = indexTwoUrl
+    resultData[2] = indexThreeUrl
+    props.onChange(resultData)
+  }
 
-  const getCardsList = (postType) => {
-    request({ ...apis.poster.posterTemplate, params: { type: postType }}).then((data) => {
-        setData(data)
-      }).catch((err) => {
-        message.info(err.msg || err.message)
-      })
+  const handleUploadIndexTwoSucess = url => {
+    console.log(url, "第二张图上传回调");
+    setIndexTwoUrl(url)
+    resultData[0] = indexOneUrl
+    resultData[1] = url
+    resultData[2] = indexThreeUrl
+    props.onChange(resultData)
   }
 
-  const onChange = (template) => (e) => {
-    // debugger
-
-    if (e.target.checked) {
-        if (props.checkedList.indexOf(template.templateId) > -1) {
-            props.onChange(props.checkedList)
-        } else {
-            props.onChange(props.checkedList.concat(template.templateId))
-        }
-    } else {
-        props.onChange(props.checkedList.filter(x => x !== template.templateId))
-    }
+  const handleUploadIndexThreeSucess = url => {
+    console.log(url, "第三张图上传回调");
+    setIndexThreeUrl(url)
+    resultData[0] = indexOneUrl
+    resultData[1] = indexTwoUrl
+    resultData[2] = url
+    props.onChange(resultData)
   }
 
   return (
-      data.map(template => (
-        <Card
-            hoverable
-            style={{ width: 240 }}
-            cover={<img src={template.img} />}
-        >
 
-        <Checkbox checked={props.checkedList.indexOf(template.templateId) !== -1} onChange={onChange(template)}>生成海分享给朋友</Checkbox>
+    <div style={{ display: 'flex' }}>
+
+      <div style={{ width: '420px', height: '940px', display: 'inline-block', marginTop: '30px' }}>
+        <div style={{ width: '375px', height: '780px', backgroundColor: '#CFCFCF', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
+          <img style={{ width: '100%', height: '100%' }} src={indexOneUrl} alt="" />
+          <img src={head1} style={{ width: '66px', height: '66px', position: 'absolute', left: '20px', bottom: '38px' }} alt="" />
+          <p style={{ margin: '0', fontSize: '18px', position: 'absolute', left: '96px', bottom: '79px', color: '#333' }}>小五子</p>
+          <p style={{ margin: '0', fontSize: '15px', position: 'absolute', left: '96px', bottom: '58px', color: '#333' }}>175 1256 0225</p>
+          <p style={{ margin: '0', fontSize: '14px', position: 'absolute', left: '96px', bottom: '39px', color: '#666' }}>邀请您参与活动</p>
+          <img src={link} style={{ margin: '0', width: '80px', height: '80px', backgroundColor: '#fff', padding: '4px', borderRadius: '6px', position: 'absolute', right: '30px', bottom: '45px' }} alt="" />
+          <p style={{ margin: '0', fontSize: '13px', position: 'absolute', right: '30px', bottom: '20px', color: '#666' }}>长按识别更多</p>
+
+        </div>
+        <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>生成海报分享给朋友</p>
+        <p style={{ textAlign: 'center' }}>
+          <Upload showUploadList={false}
+            {...uploaderProps}
+            onSuccess={handleUploadIndexOneSucess}>
+            <Button>
+              上传图片
+          </Button>
+          </Upload>
+        </p>
+      </div>
+
+      <div style={{ width: '420px', height: '940px', display: 'inline-block', marginTop: '30px' }}>
+        <div style={{ width: '375px', height: '780px', backgroundColor: '#CFCFCF', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
+          <img style={{ width: '100%', height: '100%' }} src={indexTwoUrl} alt="" />
+          <img src={head1} style={{ width: '66px', height: '66px', position: 'absolute', left: '20px', bottom: '122px' }} alt="" />
+          <p style={{ margin: '0', fontSize: '18px', position: 'absolute', left: '96px', bottom: '163px', color: '#333' }}>小五子</p>
+          <p style={{ margin: '0', fontSize: '15px', position: 'absolute', left: '96px', bottom: '142px', color: '#333' }}>175 1256 0225</p>
+          <p style={{ margin: '0', fontSize: '14px', position: 'absolute', left: '96px', bottom: '121px', color: '#666' }}>邀请您参与活动</p>
+          <div style={{ margin: '0', width: '100%', height: '112px', backgroundColor: '#fff', position: 'absolute', left: '0px', bottom: '0.5px', }}>
+            <p style={{ margin: '0', fontSize: '16px', position: 'absolute', left: '30px', bottom: '58px', color: '#666' }}>长按识别小程序码</p>
+            <p style={{ margin: '0', fontSize: '16px', position: 'absolute', left: '30px', bottom: '31px', color: '#666' }}>进入<span style={{ margin: '0 10px', fontSize: '17px', color: '#000' }}>橙蕉</span>查看详情</p>
+            <img src={link} style={{ margin: '0', width: '100px', height: '100px', position: 'absolute', right: '20px', bottom: '6px' }} alt="" />
+          </div>
+        </div>
+        <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>生成海报分享给朋友</p>
+        <p style={{ textAlign: 'center' }}>
+          <Upload showUploadList={false}
+            {...uploaderProps}
+            onSuccess={handleUploadIndexTwoSucess}>
+            <Button>
+              上传图片
+          </Button>
+          </Upload></p>
+      </div>
 
-        </Card>
-      ))
+      <div style={{ width: '420px', height: '940px', display: 'inline-block', marginTop: '30px' }}>
+        <div style={{ width: '375px', height: '780px', backgroundColor: '#CFCFCF', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
+          <img style={{ width: '100%', height: '100%' }} src={indexThreeUrl} alt="" />
+          <img src={head1} style={{ width: '66px', height: '66px', position: 'absolute', left: '20px', bottom: '142px' }} alt="" />
+          <p style={{ margin: '0', fontSize: '18px', position: 'absolute', left: '96px', bottom: '183px', color: '#333' }}>小五子</p>
+          <p style={{ margin: '0', fontSize: '15px', position: 'absolute', left: '96px', bottom: '162px', color: '#333' }}>175 1256 0225</p>
+          <p style={{ margin: '0', fontSize: '14px', position: 'absolute', left: '96px', bottom: '141px', color: '#666' }}>邀请您参与活动</p>
+          <div style={{ margin: '0', width: '335px', borderRadius: '6px', height: '112px', backgroundColor: '#fff', position: 'absolute', left: '20px', bottom: '20px', }}></div>
+          <p style={{ margin: '0', fontSize: '16px', position: 'absolute', left: '50px', bottom: '78px', color: '#666' }}>长按识别小程序码</p>
+          <p style={{ margin: '0', fontSize: '16px', position: 'absolute', left: '50px', bottom: '51px', color: '#666' }}>进入<span style={{ margin: '0 10px', fontSize: '17px', color: '#000' }}>橙蕉</span>查看详情</p>
+          <img src={link} style={{ margin: '0', width: '100px', height: '100px', position: 'absolute', right: '50px', bottom: '26px' }} alt="" />
+        </div>
+        <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>生成海报分享给朋友</p>
+        <p style={{ textAlign: 'center' }}>
+          <Upload showUploadList={false}
+            {...uploaderProps}
+            onSuccess={handleUploadIndexThreeSucess}>
+            <Button>
+              上传图片
+          </Button>
+          </Upload>
+        </p>
+      </div>
+    </div>
   )
 }
 export default PosterCard

src/components/SelectButton/BuildSelect.jsx

@@ -21,40 +21,37 @@ function usePrevious(props) {
  */
 const BuildingSelect = props => {
   const [data, setData] = useState([])
-  const [value, setValue] = useState('')
-
+  const [value, setValue] = useState([])
   useEffect(() => {
-    setValue(props.value)
+    getBuildList();
   }, [props.value])
 
-  useEffect(() => {
-    getCityList();
-  }, [])
 
-  const getCityList = e => {
-    request({ ...apis.building.getList, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+  const getBuildList = e => {
+    request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
         setData(data.records)
+        checkValue(data.records)
         // 默认选中第一个
-        if (props.checkFirst) {
-          setValue(data.records[0].buildingId)
-          props.onChange(data.records[0].buildingId)
-        }
     })
   }
 
-  const handleChange = e => {
-    setValue(e)
-    props.onChange(e)
+
+  const checkValue = (data) => {
+    if (props.value) {
+      const tempData = data.filter(f => f.buildingId == props.value)
+      const va = (tempData.length > 0) ? props.value : '项目已下线，请重新选择项目'
+      props.onChange(va)
+
+    }
   }
-  // '' === value ? undefined : value
+
   return (
       <Select
-      {...props} 
       showSearch
-      value={value}
-      style={{ width: '180px' }}
+      value={props.value}
+      style={{ width: '300px' }}
       placeholder="请选择项目"
-      onChange={handleChange}
+      onChange={props.onChange}
       filterOption={(input, option) =>
         option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
       }>

src/components/SelectButton/CitySelect.jsx

@@ -42,12 +42,13 @@ const CitySelect = (props) => {
   }
 
   return (
-      <Select 
-      showSearch 
+      <Select
+      {...props}
+      showSearch
       value={props.value}
-      style={{ width: '180px' }}
-      placeholder="请选择城市" 
-      onChange={props.onChange} 
+      style={{ width: '300px' }}
+      placeholder="请选择城市"
+      onChange={props.onChange}
       filterOption={(input, option) =>
         option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
       }
@@ -59,4 +60,3 @@ const CitySelect = (props) => {
   )
 }
 export default CitySelect
-

src/components/SelectButton/CitySelect2.jsx

@@ -0,0 +1,63 @@
+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();
+  },[props.value])
+
+  const getCityList = (e) => {
+    request({
+        url: '/api/admin/tdCityList/tdCity',
+        method: 'GET',
+        params: {leveltype: 2, pageNum: 1,pageSize: 999},
+        action: 'select',
+    }).then((data) => {
+        setData(data)
+        getValue(data);
+        console.log('---123---')
+    })
+  }
+
+  /**
+   * 因为 有个需求是，如果这个城市被删除了，那么就直接展示为空，不能展示 cityId
+   */
+  const getValue = (data) => {
+    console.log(props.value)
+    if (props.value) {
+      const tempData = data.filter(f => f.id == props.value)
+      const va = (tempData.length > 0) ? props.value : undefined
+      props.onChange(va)
+    }
+  }
+
+  return (
+      <Select
+      showSearch
+      value={props.value}
+      style={{ width: '180px' }}
+      placeholder="请选择城市"
+      onChange={props.onChange}
+      filterOption={(input, option) =>
+        option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }
+      >
+          {data.map(city => (
+            <Option key={city.id} value={city.id}>{city.name}</Option>
+          ))}
+      </Select>
+  )
+}
+export default CitySelect

src/components/SelectButton/NewTypeSelect.jsx

@@ -49,7 +49,7 @@ const NewsTypeSelect = (props) => {
   }
 
   return (
-      <Select value={'' === value ? undefined : value} style={{ width: '180px' }} placeholder="请选择资讯类型" onChange={handleChange}>
+      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择资讯类型" onChange={handleChange}>
           {data.map(type => (
             <Option key={type.newsTypeId} value={type.newsTypeId}>{type.newsTypeName}</Option>
           ))}

src/components/XForm/ImageUpload.jsx

@@ -53,7 +53,6 @@ class ImageUpload extends React.Component {
     );
 
     const value = this.props.value;
-
     return (
       <Upload
         listType="picture-card"
@@ -62,6 +61,7 @@ class ImageUpload extends React.Component {
         beforeUpload={this.props.beforeUpload}
         onChange={this.handleChange}
         {...uploaderProps}
+        disabled={this.props.disabled}
         onSuccess={this.handleUploadSucess}
       >
         {(this.state.imageUrl || value) ? (

src/components/XForm/WrapperForm.jsx

@@ -61,7 +61,7 @@ class WrapperForm extends React.Component {
 
   render () {
     const {fields, form, children, submitBtn, cancelBtn, ...formProps} = this.props;
-
+    console.log('fields:', fields)
     const FeildItems = (fields || []).filter(x => x).map((props, inx) => (<WrapperItem key={inx} {...props} form={form} />))
     
     return (

src/components/XForm/WrapperItem.jsx

@@ -122,7 +122,8 @@ const WrapperItem = props => {
         Field = <Select placeholder={placeholder} style={{ width: '100%' }} {...fieldProps}>{SelectOpts}</Select>
         break;
       case FieldTypes.ImageUploader:
-        Field = <ImageUploader {...fieldProps}/>
+        const beforeUpload = { beforeUpload: props.beforeUpload }
+        Field = <ImageUploader {...fieldProps} { ...beforeUpload}/>
         break;
       default:
         throw new Error(`暂时不支持的组件类型: ${type}`)

src/layouts/BasicLayout.jsx

@@ -14,7 +14,7 @@ import RightContent from '@/components/GlobalHeader/RightContent';
 import RenderAuthorize from '@/components/Authorized';
 import { isAntDesignPro } from '@/utils/utils';
 import logo from '../assets/logo.png';
-  
+
 const footerRender = () => {
   return (
     <div
@@ -24,7 +24,13 @@ const footerRender = () => {
         fontSize: '30px',
         fontFamily: 'monospace',
         fontWeight: '200',
+        // height:'200px',
         color: 'rgba(102, 102, 102, 1)',
+        // position: 'fixed',
+        // bottom: '0',
+        // right: '0',
+        // marginTop: '20px',
+        // width:'100%'
       }}
     >
       Copy Right @ 知与行
@@ -42,7 +48,7 @@ const menuHeaderRender = (logo, title) => {
 
 const BasicLayout = props => {
   const { dispatch, children, settings } = props;
-  
+
   useEffect(() => {
     if (dispatch && !props.user.currentUser.userId) {
       dispatch({
@@ -53,7 +59,7 @@ const BasicLayout = props => {
       });
     }
   }, []);
-  
+
   const Authorized = RenderAuthorize(props.user.currentUser.roles)
 
   const handleMenuCollapse = payload => {
@@ -68,7 +74,7 @@ const BasicLayout = props => {
   const findAuthority = (path) => {
     return ((props.user.menuList || []).filter(x => x.code === path)[0] || {}).roles
   }
-  
+
   /**
    * use Authorized check all menu item
    */
@@ -92,12 +98,12 @@ const BasicLayout = props => {
       menuItemRender={(menuItemProps, defaultDom) => {
         if (menuItemProps.isUrl) {
           return defaultDom;
-        }        
+        }
         return <Link to={menuItemProps.path}>{defaultDom}</Link>;
       }}
       breadcrumbRender={(routers = []) => [
         {
-          path: '/welcome',
+          path: '/',
           breadcrumbName: formatMessage({
             id: 'menu.home',
             defaultMessage: 'Home',

src/layouts/BlankLayout.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 
 const Layout = ({ children }) => (
-  <PageHeaderWrapper style={{height:'49px',background:'rgba(240,240,240,1)',paddingTop:'15px'}}>
+  <PageHeaderWrapper style={{height:'auto',background:'rgba(240,240,240,1)',paddingTop:'15px'}}>
     <div
       style={{
         backgroundColor: '#fff',

src/layouts/SearchList/BodyBodyPagination.jsx

@@ -0,0 +1,34 @@
+import React, { PureComponent } from 'react'
+import PropTypes from 'prop-types'
+import { Pagination } from 'antd'
+
+import Style from './style.less'
+
+export default class BodyPagination extends PureComponent {
+  static propTypes = {
+    storage: PropTypes.func,
+    onChange: PropTypes.func,
+    configs: PropTypes.object,
+  }
+
+  // storage = this.props.storage
+
+  handleChange = (page, pageSize) => {
+    if (this.props.onChange) {
+      this.props.onChange(page, pageSize)
+    }
+  }
+
+  render() {
+    return (
+      <div className={Style['body-paged']}>
+        <Pagination
+          showSizeChanger
+          onChange={this.handleChange}
+          onShowSizeChange={this.handleChange} 
+          {...(this.props.configs || {})}
+        />
+      </div>
+    )
+  }
+}

src/layouts/SearchList/BodyHeader.jsx

@@ -0,0 +1,17 @@
+import React, { PureComponent } from 'react'
+import Style from './style.less';
+
+export default class BodyHeader extends PureComponent {
+  render() {
+    return (
+      <div className={Style['body-header']}>
+        <div className={Style['body-header-title']}>
+          {this.props.title}
+        </div>
+        <div className={Style['body-header-action']}>
+          {this.props.actions}
+        </div>
+      </div>
+    )
+  }
+}

src/layouts/SearchList/SearchBody.jsx

@@ -0,0 +1,28 @@
+import React, { PureComponent } from 'react'
+import PropTypes from 'prop-types'
+
+import { Table } from 'antd'
+import { isFunction } from './utils'
+
+export default class SearchBody extends PureComponent {
+  static propTypes = {
+    storage: PropTypes.func,
+    dataSource: PropTypes.array,
+    configs: PropTypes.object,
+  }
+
+  // storage = this.props.storage
+
+  render() {
+    const { dataSource, configs } = this.props
+    const { render, ...leftProps } = configs || {}
+
+    if (isFunction(render)) {
+      return render(dataSource)
+    }
+
+    return (
+      <Table dataSource={dataSource} {...leftProps} />
+    )
+  }
+}

src/layouts/SearchList/SearchForm.jsx

@@ -0,0 +1,12 @@
+import React, { PureComponent } from 'react'
+
+export default class SearchForm extends PureComponent {
+  render() {
+    return (
+      <div>
+        
+      </div>
+    )
+  }
+}
+

src/layouts/SearchList/index.jsx

@@ -0,0 +1,116 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import classNames from 'classnames'
+import { notification } from 'antd'
+
+import SearchForm from './SearchForm'
+import SearchBody from './SearchBody'
+import BodyHeader from './BodyHeader'
+import BodyPagination from './BodyBodyPaginationation'
+import { getStorageBuilder } from './utils'
+import Style from './style.less'
+
+class SearchList extends React.PureComponent {
+  static propTypes = {
+    title: PropTypes.element,
+    actions: PropTypes.element,
+    search: PropTypes.object,
+    body: PropTypes.object,
+    pagination: PropTypes.object,
+  }
+
+  storage = getStorageBuilder(window.Math.random().toString(36).substr(2))
+
+  state = {
+    dataSource: [],
+    conditions: {},
+    pageConfig: {
+      current: 1,
+      pageSize: 10,
+      total: 0,
+    },
+  }
+
+  handlePageChange = (page, pageSize) => {
+    this.setState(
+      (state) => ({
+        ...state,
+        pageConfig: {
+          ...pageConfig,
+          current: page,
+          pageSize,
+        }
+      }),
+      this.queryData,
+    )
+  }
+
+  handleSearchSubmit = (conditions) => {
+    this.setState(
+      (state) => ({
+        ...state,
+        conditions,
+      }),
+      this.queryData,
+    )
+  }
+
+  queryData = () => {
+    if (this.props.service) {
+      const pageConfigProps = this.props.pagination || {}
+      const keyOfPageNumber = pageConfigProps.keyOfPageNumber || 'pageNumber'
+      const keyOfPageSize= pageConfigProps.keyOfPageSize || 'pageSize'
+      const keyOfTotalSize= pageConfigProps.keyOfTotalSize || 'total'
+
+      const { conditions = {}, pageConfig } = this.state
+
+      this.props.service({
+        ...conditions,
+        ...{
+          [`${keyOfPageNumber}`]: pageConfig.current,
+          [`${keyOfPageSize}`]: pageConfig.pageSize,
+        },
+      }).then((res) => {
+        const [dataSource, pageParams] = res || []
+
+        this.setState((state) => ({
+          ...state,
+          dataSource,
+          pageConfig: {
+            ...pageConfig,
+            total: pageParams[keyOfTotalSize],
+          },
+        }))
+      }).catch((e) => {
+        console.error(e)
+      })
+    }
+  }
+
+  render() {    
+    const {
+      keyOfPageNumber,
+      keyOfPageSize,
+      keyOfTotalSize,
+      ...leftPageParams,
+    } = this.props.pagination || {}
+
+    const pageConfig = {
+      ...leftPageParams,
+      ...this.state.pageConfig,
+    }
+
+    return (
+      <div className={Style['search-list']}>
+        <div className={Style['head']}>
+          <SearchForm storage={storage} onSubmit={this.handleSearchSubmit} configs={this.props.search} />
+        </div>
+        <div className={Style['body']}>
+          <BodyHeader storage={storage} title={this.props.title} actions={this.props.actions} />
+          <SearchBody storage={storage} dataSource={this.state.dataSource} configs={this.props.body} />
+          <BodyPagination storage={storage} onChange={this.handlePageChange} configs={pageConfig} />
+        </div>
+      </div>
+    )
+  }
+}

src/layouts/SearchList/style.less

@@ -0,0 +1,40 @@
+
+.search-list {
+  .head {
+    margin-bottom: 24px;
+    padding: 16px;
+    overflow: hidden;
+    background: #fff;
+  }
+
+  .body {
+    .body-header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 64px;
+      padding: 0 24px;
+      line-height: 64px;
+
+      .body-header-title {
+        flex: 1 1;
+        color: #000;
+        font-size: 16px;
+        line-height: 24px;
+      }
+
+      .body-header-action {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+      }
+
+    }
+
+    .body-paged {
+      padding: 0 24px;
+      float: right;
+      margin: 16px 0;
+    }
+  }
+}

src/layouts/SearchList/utils.js

@@ -0,0 +1,34 @@
+
+export function isFunction(fn) {
+  return typeof fn === 'function'
+}
+
+export function setStorage(k, v) {
+  if (typeof v !== 'object') return
+
+  window.localStorage.setItem(k, window.JSON.stringify(v))
+}
+
+export function getStorage(k) {
+  const str = window.localStorage.getItem(k);
+  if (!str) return;
+
+  return window.JSON.parse(str);
+}
+
+export function getStorageBuilder(key, initData = {}) {
+  setStorage(key, initData)  
+
+  return {
+    set: (k, v) => {
+      const data = getStorage(key) || {}
+
+      setStorage({ ...data, [`${k}`]: v })
+    },
+
+    get: (k) => {
+      const data = getStorage(key) || {}
+      return data[k]
+    }
+  }
+}

src/models/login.js

@@ -40,7 +40,8 @@ const Model = {
         }
       }
 
-      yield put(routerRedux.replace(redirect || '/'));
+      // yield put(routerRedux.replace(redirect || '/'));
+      yield put(routerRedux.replace('/'));
     },
 
     *getCaptcha({ payload }, { call }) {

src/models/user.js

@@ -34,7 +34,7 @@ const UserModel = {
       const currentUser = { ...taUser, roles: (taUser.roles || []).map(x => x.roleId) }
 
       setAllBtnAuth(buttonList)
-      setUserBtnAuth(currentUser.roles)
+      setUserBtnAuth(currentUser.buttons)
 
       return { ...state, currentUser, menuList, buttonList };
     },

src/pages/activity/ActivityList.jsx

@@ -58,7 +58,23 @@ const header = props => {
     x.send();
   }
 
+  const getActivityDetail = (dynamicId) => () => {
+    router.push({
+      pathname: '/activity/detailActivity',
+      query: {
+        dynamicId,
+      },
+    });
+  }
 
+  const getJoinPeople = (dynamicId) => () => {
+    router.push({
+      pathname: '/activity/SignList',
+      query: {
+        dynamicId,
+      },
+    });
+  }
   /**
    *
    *
@@ -72,7 +88,8 @@ const header = props => {
       key: 'title',
       align: 'center',
       // width: '15%',
-      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>{row.title}</div></>,
+      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
+                              <span style={{color: 'blue',cursor: 'pointer'}} onClick={getActivityDetail(row.dynamicId)}>{row.title}</span></div></>,
       // width: '300px',
       // ellipsis:'true'overflow: hidden; /*溢出隐藏*/
 // text-overflow: ellipsis; /*以省略号...显示*/
@@ -92,30 +109,32 @@ const header = props => {
       dataIndex: 'count',
       key: 'count',
       align: 'center',
+      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
+                              <span style={{color: 'blue',cursor: 'pointer'}} onClick={getJoinPeople(row.dynamicId)}>{row.count}</span></div></>,
       // width: '10%',
       // width: '6%',
     },
-    {
-      title: '阅读量',
-      dataIndex: 'pvNum',
-      key: 'pvNum',
-      align: 'center',
-      // width: '10%',
-    },
-    {
-      title: '转发量',
-      dataIndex: 'shareNum',
-      key: 'shareNum',
-      align: 'center',
-      // width: '10%',
-    },
-    {
-      title: '收藏数',
-      dataIndex: 'saveNum',
-      key: 'saveNum',
-      align: 'center',
-      // width: '10%',
-    },
+    // {
+    //   title: '阅读量',
+    //   dataIndex: 'pvNum',
+    //   key: 'pvNum',
+    //   align: 'center',
+    //   // width: '10%',
+    // },
+    // {
+    //   title: '转发量',
+    //   dataIndex: 'shareNum',
+    //   key: 'shareNum',
+    //   align: 'center',
+    //   // width: '10%',
+    // },
+    // {
+    //   title: '收藏数',
+    //   dataIndex: 'saveNum',
+    //   key: 'saveNum',
+    //   align: 'center',
+    //   // width: '10%',
+    // },
     {
       title: '报名状态',
       dataIndex: 'activityStatus',
@@ -137,20 +156,25 @@ const header = props => {
       align: 'center',
       render: (x, row) => (
         <>
-          <AuthButton name="admin.SignList.get" noRight={null}>
+          {/* <AuthButton name="admin.SignList.get" noRight={null}>
           {(row.activityStatus === 0 || row.activityStatus === 2) && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, row.dynamicId)}>报名记录{<Icon type="snippets" className={styles.shoppingCart} />}</span>}
-          </AuthButton>
+          </AuthButton> */}
           <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
             <span style={{ color: '#1990FF',marginRight: '20px', 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.activityStatus === 0 && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={finishDynamic.bind(this, row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
           </AuthButton>
-          <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
+          <AuthButton name="admin.buildingDynamic.tag" 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>
+          </AuthButton>
+          <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={homeDynamic(row)}>{row.home === 1 ? '取消推首页' : '推首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+          </AuthButton>
+          <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
             {(row.activityStatus === 0 || row.activityStatus === 1) && <span style={{ color: '#FF925C',marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
           </AuthButton>
-      {(row.activityStatus === 0 || row.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{'下载二维码'} {<Icon type="qrcode" className={styles.shoppingCart} />}</span>}
+      {/* {(row.activityStatus === 0 || row.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{'下载二维码'} {<Icon type="qrcode" className={styles.shoppingCart} />}</span>} */}
         </>
       ),
     },
@@ -195,6 +219,19 @@ const header = props => {
     })
   }
 
+  //   推首页
+  const homeDynamic = row => () => {
+    const home = Math.abs(row.home - 1)
+    request({ ...apis.activity.home, params: { dynamicId: row.dynamicId, home } }).then(data => {
+      console.log(data)
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() })
+    }).catch(err => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+
   const sendOrPublicDynamic = row => {
     if (row.status === 1) {
       cancelDynamic(row)
@@ -305,17 +342,11 @@ const header = props => {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('isEnlist')(
-            <Select style={{ width: '180px' }} placeholder="是否报名">
-              <Option value="1">已报名</Option>
-              <Option value="0">未报名</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-            搜索
-          </Button>
+          <AuthButton name="admin.buildingDynamic.search" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
+            </Button>
+          </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
             </Button>
@@ -324,7 +355,13 @@ const header = props => {
       <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.list} columns={columns} pagination={false} rowKey="activityList" />
+      <Table
+        // onRow={record => {
+        //   return {
+        //     onClick: getActivityDetail(record.dynamicId),
+        //   };
+        // }}
+       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={e => changePageNum(e)} current={data.current}/>
       </div>

src/pages/activity/detailActivity.jsx

@@ -0,0 +1,427 @@
+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';
+import AuthButton from '@/components/AuthButton';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+const formItemLayout = {
+  labelCol: { span: 6 },
+  wrapperCol: { span: 14 },
+};
+
+const cancelPage = () => {
+  router.push({
+    pathname: '/activity/ActivityList',
+  });
+}
+
+const getSignList = dynamicId => {
+  router.push({
+    pathname: '/activity/SignList',
+    query: {
+      dynamicId,
+    },
+  });
+}
+
+const newQrcode = row => {
+  const x = new XMLHttpRequest();
+  const resourceUrl = row.qrCode
+  x.open('GET', resourceUrl, true);
+  x.responseType = 'blob';
+  x.onload = function (e) {
+    const url = window.URL.createObjectURL(x.response)
+    const a = document.createElement('a');
+    a.href = url;
+    a.style.display = 'none'
+    a.download = '活动二维码.png';
+    a.click();
+  }
+  x.send();
+}
+
+const BasicForm = props => {
+  const detailData = props.detailData || {}
+
+  const radioOnChange = e => {
+    // setIsEnlist(e.target.value)
+  }
+
+  const { dynamicId } = props
+ 
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('Received values of form: ', values);
+        const { activityTime, signupTime } = values
+        const [startDate, endDate] = activityTime
+        values.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
+        values.endDate = moment(endDate).format('YYYY-MM-DD HH:mm');
+        if (signupTime) {
+          const [enlistStart, enlistEnd] = signupTime
+          values.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
+          values.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
+        }
+        
+        console.log('submit data --->', values)
+        if (dynamicId) {
+          values.dynamicId = dynamicId
+          request({ ...apis.activity.update, data: values }).then(data => {
+            message.info('保存成功')
+            // router.go(-1)
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        } else {
+          request({ ...apis.activity.add, data: { ...values } }).then((data) => {
+            message.info('保存成功')
+            router.push({
+              pathname: '/activity/editActivity',
+              query: {
+                dynamicId: data.dynamicId,
+              },
+            });
+            // router.go(-1)
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        }
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+  return (
+    <>
+      <Form {...formItemLayout} onSubmit={handleSubmit}>
+        <Form.Item label="所属项目">
+        {getFieldDecorator('buildingId', {
+          initialValue: detailData.buildingId,
+          rules: [
+            {
+              required: true,
+              message: '请选择所属项目',
+            },
+          ],
+        })(<BuildSelect disabled/>)}
+        </Form.Item>
+        <Form.Item label="活动封面图1">
+           <img src={detailData.listImgUrl} height="210px" width="375px" />
+        </Form.Item>
+        <Form.Item label="活动封面图2">
+          <img src={detailData.bannerListImg} height="125px" width="375px" />
+        </Form.Item>
+        <Form.Item label="活动详情主图">
+          <img src={detailData.imgUrl} height="300px" width="375px" />
+        </Form.Item>
+        <Form.Item label="活动标题">
+          <span>{detailData.title}</span>
+        </Form.Item>
+        <Form.Item label="活动时间">
+          <span>{`${moment(detailData.startDate).format('YYYY-MM-DD HH:mm')} —— ${moment(detailData.endDate).format('YYYY-MM-DD HH:mm')}`}</span>
+        </Form.Item>
+        <Form.Item label="活动地点">
+          <span>{detailData.address}</span>
+        </Form.Item>
+        <Form.Item label="活动人数">
+          <span>{detailData.personNum}</span>
+        </Form.Item>
+        <Form.Item label="阅读量">
+          <span>{detailData.pvNum}</span>
+        </Form.Item>
+        <Form.Item label="转发量">
+          <span>{detailData.shareNum}</span>
+        </Form.Item>
+        <Form.Item label="收藏数">
+          <span>{detailData.saveNum}</span>
+        </Form.Item>
+        <Form.Item label="最大报名人数">
+          <span>{detailData.maxEnlistByPerson}</span>
+        </Form.Item>
+        <Form.Item label="活动详情">
+          <div style={{ maxHeight: '500px', overflowY: 'auto' }} dangerouslySetInnerHTML={{ __html: detailData.desc}}></div>
+        </Form.Item>
+        <Form.Item label="报名时间">
+          <span>{`${moment(detailData.enlistStart).format('YYYY-MM-DD HH:mm')} —— ${moment(detailData.enlistEnd).format('YYYY-MM-DD HH:mm')}`}</span>
+        </Form.Item>  
+        <Form.Item label="权重">
+          <span>{detailData.heavy}</span>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic')
+  const { dynamicId } = props.location.query
+  const [detailData, setDetailData] = useState(false)
+
+  const getDynamicData = dynamicId => {
+    request({ ...apis.activity.details, params: { dynamicId } }).then((data) => {
+      console.log(data)
+      data.activityTime = [moment(data.startDate), moment(data.endDate)]
+      data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
+
+      setDetailData(data)
+    })
+  }
+
+  
+    useEffect(() => {
+      if (dynamicId) {
+        getDynamicData(dynamicId);
+      }
+    }, [])
+
+
+  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' }}>活动海报图</p>
+            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+          </div>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报</p>
+          <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</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' }}>海报描述</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={() => cancelPage()}>
+        取消
+      </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' }}>分享模板</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: '160px' }} 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' }}>分享标题</p>
+        {inputValue === '' ? '无' : <span>{inputValue}</span>}
+      </div>
+      <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动分享图</p>
+        {imgValue === '' ? '无':<img src={imgValue} height="120px" height="150px" />}
+      </div>
+      {/* <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+      <Button onClick={() => cancelPage()}>
+        取消
+      </Button> */}
+    </div>
+  }
+
+  return (
+    <div>
+      <div>
+        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button>
+        </Radio.Group>
+      </div>
+      <div>
+        {tab === 'basic' && <Basic dynamicId={dynamicId} detailData={detailData} />}
+        {tab === 'poster' && <Poster />}
+        {tab === 'share' && <Share />}
+      </div>
+      <div style={{textAlign: 'center'}}>
+        <AuthButton name="admin.SignList.get" noRight={null}>
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, detailData.dynamicId)}><Button>报名记录</Button></span>}
+          </AuthButton>
+          <AuthButton name="admin.dymic.qrcode" noRight={null}>
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, detailData)}>{<Button>下载二维码</Button>}</span>}
+          </AuthButton>
+          <Button onClick={() => cancelPage()}>
+            取消
+          </Button>
+      </div>
+    </div>
+  );
+}
+
+export default Edit

src/pages/activity/drainage/Detail.jsx

@@ -171,6 +171,7 @@ const header = (props) => {
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
             </Button>
+            <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px', marginLeft: '30px' }}>返回</Button>  
         </Form.Item>
       </Form>
       <div>

src/pages/activity/drainage/DrainageList.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, Radio } from 'antd';
 import router from 'umi/router';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../../style/GoodsList.less';
@@ -8,6 +8,7 @@ import request from '../../../utils/request';
 import XForm, { FieldTypes } from '../../../components/XForm';
 import moment from 'moment';
 import AuthButton from '../../../components/AuthButton';
+import ImageUploader from '../../../components/XForm/ImageUpload';
 
 const toEditList = (row) => () => {
   router.push({
@@ -63,6 +64,54 @@ const header = (props) => {
     });
   }
 
+  const toDrainageDetail = (drainageId) => () => {
+    router.push({
+      pathname: '/activity/drainage/DetailDrainage',
+      query: {
+        drainageId
+      },
+    });
+  }
+
+  const exchangeDrainage = drainage => () => {
+    if(drainage.status === 1){
+      if(drainage.isMiniapp){
+        Modal.confirm({
+          title: '下架后当前H5活动关联的小程序端开屏图、banner图等也会自动下架。',
+          okText: '确认',
+          cancelText: '取消',
+          onOk () {
+            request({ ...apis.activity.exchangeDrainage, urlData: { id: drainage.drainageId }, data: drainage }).then((data) => {
+              message.info('操作成功！')
+              gettaDrainage({ pageNum: 1, pageSize: 10 })
+            }).catch((err) => {
+              console.log(err)
+              message.info(err.msg || err.message)
+            })
+          }
+        });
+      }else{
+        request({ ...apis.activity.exchangeDrainage, urlData: { id: drainage.drainageId }, data: drainage }).then((data) => {
+          message.info('H5活动已下架！')
+          gettaDrainage({ pageNum: 1, pageSize: 10 })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      }
+      
+    }else{
+      request({ ...apis.activity.exchangeDrainage, urlData: { id: drainage.drainageId }, data: drainage }).then((data) => {
+        message.info('H5活动已上架！')
+        gettaDrainage({ pageNum: 1, pageSize: 10 })
+      }).catch((err) => {
+        console.log(err)
+        message.info(err.msg || err.message)
+      })
+    }
+    
+  }
+
   const columns = [
     {
       title: 'H5项目编号',
@@ -70,6 +119,13 @@ const header = (props) => {
       key: 'drainageId',
       align: 'center',
     },
+    {
+      title: '是否投放小程序',
+      dataIndex: 'isMiniapp',
+      key: 'isMiniapp',
+      align: 'cenxter',
+      render: (isMiniapp) => <span>{ isMiniapp ? '是' : '否'  }</span>, 
+    },
     {
       title: 'H5项目名称',
       dataIndex: 'name',
@@ -77,23 +133,23 @@ const header = (props) => {
       align: 'center',
       render: (text, datas) => <>
 
-        <div style={{ color: '#66B3FF' }} onClick={() => addshowModal(datas)} >{datas.name}</div>
+        <div style={{ color: '#66B3FF', cursor: 'pointer' }} onClick={toDrainageDetail(datas.drainageId)}>{datas.name}</div>
 
       </>
     },
     {
-      title: 'appid',
-      dataIndex: 'appid',
-      key: 'appid',
+      title: '链接地址',
+      dataIndex: 'h5Address',
+      key: 'h5Address',
       align: 'center',
       // render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>, 
     },
     {
-      title: 'secret',
-      dataIndex: 'appSecret',
-      key: 'appSecret',
+      title: '上架状态',
+      dataIndex: 'status',
+      key: 'status',
       align: 'center',
-      // render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>,
+    render: (status) => <span>{status === 1 ? '已上架' : '已下架'}</span>,
     },
     {
       title: '新建时间',
@@ -107,7 +163,7 @@ const header = (props) => {
       ),
     },
     {
-      title: '截止时间',
+      title: '自动下架时间',
       dataIndex: 'endDate',
       key: 'endDate',
       align: 'center',
@@ -117,48 +173,53 @@ const header = (props) => {
         </>
       ),
     },
-    {
-      title: '参与数',
-      dataIndex: 'enlistNum',
-      key: 'enlistNum',
-      align: 'center',
-      // render:
-    },
+    // {
+    //   title: '参与数',
+    //   dataIndex: 'enlistNum',
+    //   key: 'enlistNum',
+    //   align: 'center',
+    //   // render:
+    // },
     {
       title: '操作',
       key: 'action',
       align: 'center',
       render: (text, datas) => (
         <>
-          <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
-            <span style={{ right: '20px', top: '20px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(datas)}>
-              查看详情
-            </span>
-          </AuthButton>
+        <AuthButton name="admin.taDrainage.put" noRight={null}>
+          <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer'}} onClick={() => addshowModal(datas)}>
+            编辑
+          </span>
+        </AuthButton>
           <AuthButton name="admin.taDrainage.id.delete" noRight={null}>
             <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', marginLeft: 20 }} onClick={deleteDrainage(datas.drainageId)}>
               删除
             </span>
           </AuthButton >
+          <AuthButton name="admin.taDrainage.publish" noRight={null}>
+          <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', marginLeft: 20 }} onClick={exchangeDrainage(datas)}>
+            {datas.status === 1 ? '下架' : '上架'}
+          </span>
+          </AuthButton>
+          <AuthButton name="admin.taDrainage.data" noRight={null}>
+            <span style={{ right: '20px', top: '20px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer', marginLeft: 20  }} onClick={toEditList(datas)}>
+              数据
+            </span>
+          </AuthButton>
         </>
       ),
     },
   ];
   const Forms = props => {
-
-    console.log(date, '---------------')
-    console.log(formsdate.name, '---------------')
-    console.log(formsdate, '22222222')
-
-
     const { formsDate } = props
-    useEffect(() => {
-      if (formsDate) {
-        props.form.setFieldsValue({ name: formsdate.name, endDate: formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null })
-      }
-    }, [formsDate])
-
-
+    // useEffect(() => {
+    //   if (formsDate) {
+    //     props.form.setFieldsValue({ ...formsDate, endDate: formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null })
+    //   }
+    // }, [formsDate])
+
+    const [hiddenStatus, setHiddenStatus] = useState(formsdate.isMiniapp)
+    
     const handleSubmit = e => {
       e.preventDefault();
       props.form.validateFields((err, values) => {
@@ -222,28 +283,87 @@ const header = (props) => {
       },
     };
 
+    const changeMiniapp = e => {
+      if(e.target.value == 1){
+        setHiddenStatus(true)
+      }else{
+        setHiddenStatus(false)
+      }
+    }
+
     const { getFieldDecorator } = props.form;
     {/* <XForm onSubmit={handleSubmit} onCancel={handleCancel} fields={fields} ></XForm> */ }
 
     return <Form {...formItemLayout} onSubmit={handleSubmit}>
 
-
+      <Form.Item label="是否投放小程序端" help='选择是后,该活动可投放至小程序的轮播位以及开屏广告'>
+        {getFieldDecorator('isMiniapp',{
+          initialValue : formsDate.isMiniapp ? 1 : 0,
+          rules: [
+            { required: true, message: '请选择是否投放小程序' },
+          ],
+        })(
+          <Radio.Group onChange={changeMiniapp}>
+            <Radio value={1}>是</Radio>
+            <Radio value={0}>否</Radio>
+          </Radio.Group>
+        )}
+      </Form.Item>
       <Form.Item label="H5项目名称">
-        {getFieldDecorator('name')(
+        {getFieldDecorator('name',{initialValue : formsDate.name,
+          rules: [
+            { required: true, message: '请输入H5项目名称' },
+          ],
+        })(
           <Input
             placeholder="请输入H5项目名称"
           />,
         )}
       </Form.Item>
-      <Form.Item label="截止时间">
-        {getFieldDecorator('endDate')(
+      <Form.Item label="下架时间">
+        {getFieldDecorator('endDate',{initialValue : formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm:ss') : null,
+          rules: [
+            { required: true, message: '请输入下架时间' },
+          ]})(
           <DatePicker
-          // prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-          // placeholder={formsdate.endDate}
-          // value= formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null
+          showTime={{ format: 'HH:mm:ss' }}
           />,
         )}
       </Form.Item>
+      {hiddenStatus && (<Form.Item label="活动链接地址">
+        {getFieldDecorator('h5Address',{initialValue : formsDate.h5Address,
+          rules: [
+            { required: true, message: '请输入H5活动链接地址' },
+          ]})(
+          <Input
+            placeholder="请输入H5活动链接地址"
+            disabled={formsDate.isMiniapp}
+          />,
+        )}
+      </Form.Item>)}
+      {hiddenStatus && (<Form.Item label="分享设置" help="建议图片尺寸：750*600px，比例5:4,格式：jpg">
+          {getFieldDecorator('shareImg',{initialValue : formsDate.shareImg,
+          rules: [
+            { required: true, message: '请选择分享图片' },
+          ]})(<ImageUploader />)}
+      </Form.Item>)}
+      {hiddenStatus && (<Form.Item label="活动分享语">
+        {getFieldDecorator('shareTitle',{initialValue : formsDate.shareTitle,
+          rules: [
+            { required: true, message: '请输入活动分享语' },
+          ]})(
+          <Input
+            placeholder="分享语，不超过15个字"
+            maxLength="15"
+          />,
+        )}
+      </Form.Item>)}
+      {hiddenStatus && (<Form.Item label="中间页飞机图" help="建议图片尺寸：750*1667px，比例9:20,格式：jpg。图片底部不要放置关键信息。">
+          {getFieldDecorator('middleImg',{initialValue : formsDate.middleImg,
+          rules: [
+            { required: true, message: '请选择中间页飞机图' },
+          ]})(<ImageUploader />)}
+      </Form.Item>)}
       <Form.Item {...tailFormItemLayout}>
         <AuthButton name="admin.taDrainage.id.put" noRight={null}>
           <Button type="primary" htmlType="submit" className={styles.searchBtn} onClick>
@@ -272,23 +392,13 @@ const header = (props) => {
   function addshowModal (datas) {
 
     // alert(datas.drainageId)
-    console.log(datas, '22222222')
-    setFormsDate({
-      drainageId: datas.drainageId,
-      name: datas.name,
-      endDate: datas.endDate,
-    })
-    console.log(formsdate, '22222222')
+    setFormsDate(datas)
     setDate({
       visible: true,
       title: "修改H5项目"
     });
-
-
-    console.log('form :', props.form)
-
-
   };
+
   function showModal () {
     setFormsDate({
       drainageId: '',
@@ -301,7 +411,11 @@ const header = (props) => {
     });
   };
   const changePageNum = pageNumber => {
-    gettaDrainage({ pageNum: pageNumber, pageSize: 10 })
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        gettaDrainage({ pageNum: pageNumber, pageSize: 10, ...values })
+      }
+    });
   }
 
   function handleOk () {
@@ -336,6 +450,12 @@ const header = (props) => {
     });
   }
 
+  //打开新页面
+  const openIndexImg = () => {
+    const newWin=window.open('about:blank');
+    newWin.location.href="https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1575977446224-1.png"
+  }
+  
   const { getFieldDecorator } = props.form;
   const { visible, confirmLoading, ModalText, title } = date;
   return (
@@ -360,10 +480,28 @@ const header = (props) => {
               />,
             )}
           </Form.Item>
+          <Form.Item>
+          {getFieldDecorator('isMiniapp')(
+            <Select style={{ width: '180px' }} placeholder="是否投放小程序">
+              <Option value="1">是</Option>
+              <Option value="0">否</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="上架状态">
+              <Option value="1">已上架</Option>
+              <Option value="0">已下架</Option>
+            </Select>,
+          )}
+        </Form.Item>
           <Form.Item >
+          <AuthButton name="admin.taDrainage.search" noRight={null}>
             <Button type="primary" htmlType="submit" className={styles.searchBtn} onClick>
               搜索
           </Button>
+          </AuthButton>
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>
@@ -372,6 +510,7 @@ const header = (props) => {
         <AuthButton name="admin.taDrainage.add.post" noRight={null}>
           <Button type="danger" className={styles.addBtn} onClick={showModal}>新增</Button>
         </AuthButton>
+          <span style={{ color: '#66B3FF', cursor: 'pointer', margin: '20px',display:'inline-block' }} onClick={openIndexImg}>优质案例</span>
         <Modal
           title={title}
 
@@ -383,7 +522,13 @@ const header = (props) => {
         >
           <Formss formsDate={formsdate} />
         </Modal>
-        <Table columns={columns} dataSource={datas.records} pagination={false} rowKey="drainageList" />
+        <Table 
+        // onRow={record => {
+        //   return {
+        //     onClick: toDrainageDetail(record.drainageId),
+        //   };
+        // }}
+        columns={columns} dataSource={datas.records} pagination={false} rowKey="drainageList" />
         <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
           <Pagination showQuickJumper defaultCurrent={1} total={datas.total} onChange={(e) => changePageNum(e)} current={datas.current} />
         </div>

src/pages/activity/drainage/detailDrainage.jsx

@@ -0,0 +1,87 @@
+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 apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import request from '../../../utils/request'
+import AuthButton from '@/components/AuthButton';
+
+const cancelPage = () => {
+  router.go(-1)
+}
+
+const BasicForm = props => {
+  const { drainageId } = props.location.query
+  const [data, setData] = useState({})
+
+  useEffect(() => {
+    request({...apis.activity.detailDrainage,urlData: { id: drainageId }}).then((data) => {
+      setData(data);
+    })
+  }, [])
+
+  const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
+  const formItemLayout = {
+    labelCol: {
+      xs: { span: 24 },
+      sm: { span: 8 },
+    },
+    wrapperCol: {
+      xs: { span: 24 },
+      sm: { span: 16 },
+    },
+  };
+  return (
+    <>
+      <Form  {...formItemLayout}>
+        <Form.Item label="H5活动编号：">
+          <span>{data.drainageId}</span>
+        </Form.Item>
+        <Form.Item label="是否投放小程序：">
+        <span>{data.isMiniapp ? "是" : "否"}</span>
+        </Form.Item>
+        <Form.Item label="H5活动名称：">
+        <span>{data.name}</span>
+        </Form.Item>
+        {data.isMiniapp && <Form.Item label="链接地址：">
+        <span>{data.h5Address}</span>
+        </Form.Item>}
+        <Form.Item label="上架状态：">
+        <span>{data.status === 1 ? "已上架" : "未上架"}</span>
+        </Form.Item>
+        <Form.Item label="新建时间：">
+        <span>{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>
+        </Form.Item>
+        <Form.Item label="自动下架时间：">
+        <span>{moment(data.endDate).format('YYYY-MM-DD HH:mm:ss')}</span>
+        </Form.Item>
+        <Form.Item label="appid：">
+        <span>{data.appid}</span>
+        </Form.Item>
+        <Form.Item label="secret：">
+        <span>{data.appSecret}</span>
+        </Form.Item>
+        <Form.Item label="参与人数：">
+        <span>{data.enlistNum}</span>
+        </Form.Item>
+        {data.isMiniapp && <Form.Item label="分享语：">
+        <span>{data.shareTitle}</span>
+        </Form.Item>}
+        {data.isMiniapp && <Form.Item label="分享图：">
+        <img src={data.shareImg} width="75px" height="60px" />
+        </Form.Item>}
+        {data.isMiniapp && <Form.Item label="中间页飞机图：">
+        <img src={data.middleImg} width="75px" height="166.7px" />
+        </Form.Item>}
+        <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
+          <Button onClick={() => cancelPage()}>
+            取消
+          </Button>
+        </Form.Item>
+      </Form>
+    </>
+  );
+}
+
+export default BasicForm

src/pages/activity/editActivity.jsx

@@ -120,7 +120,7 @@ const BasicForm = props => {
           ],
         })(<BuildSelect disabled={disable}/>)}
         </Form.Item>
-        <Form.Item label="活动封面图1" help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于活动列表">
+        <Form.Item label="活动封面图1" help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于：首页推荐/活动列表">
           {getFieldDecorator('listImgUrl', {
           rules: [
             {
@@ -130,7 +130,7 @@ const BasicForm = props => {
           ],
         })(<ImageUploader />)}
         </Form.Item>
-        <Form.Item label="活动封面图2" help="建议图片尺寸：750*250，比例3:1，格式：jpg，用于：项目详情活动轮播">
+        <Form.Item label="活动封面图2" help="建议图片尺寸：750*250，比例3:1，格式：jpg，用于：项目详情页">
           {getFieldDecorator('bannerListImg', {
           rules: [
             {
@@ -140,7 +140,7 @@ const BasicForm = props => {
           ],
         })(<ImageUploader />)}
         </Form.Item>
-        <Form.Item label="活动详情主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于普通活动详情">
+        <Form.Item label="活动详情主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：普通活动详情">
           {getFieldDecorator('imgUrl', {
           rules: [
             {
@@ -198,7 +198,7 @@ const BasicForm = props => {
               message: '请输入最大报名人数',
             },
           ],
-        })(<Input type="number" disabled={activityStatus===0 ? true : false}/>)}
+        })(<Input type="number" min={1} disabled={activityStatus===0 ? true : false}/>)}
         </Form.Item>
         <Form.Item label="活动详情">
         {getFieldDecorator('desc')(<Wangedit />)}
@@ -364,7 +364,7 @@ const Edit = props => {
           </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' }}>海报描述</p>
-            <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+            <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
           </div>
 
         </div>
@@ -426,7 +426,7 @@ const Edit = props => {
         <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="" />
+          <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
         </div>
       </div>
       <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>

src/pages/activity/groupActivity/detailActivity.jsx

@@ -0,0 +1,399 @@
+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';
+import AuthButton from '@/components/AuthButton';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+const formItemLayout = {
+  labelCol: { span: 6 },
+  wrapperCol: { span: 14 },
+};
+
+const cancelPage = () => {
+  router.push({
+    pathname: '/activity/groupActivity/list',
+  });
+}
+
+const getSignList = groupActivityId => {
+    router.push({
+        pathname: '/activity/groupActivity/helpRecord',
+        query: {
+            groupActivityId,
+        },
+      });
+}
+
+const BasicForm = props => {
+  // const [activityStatus, setActivityStatus] = useState(1)
+  // const [disable, setDisable] = useState(false)
+  // const [detailData, setDetailData] = useState(false)
+
+  const { groupActivityId } = props
+
+  const detailData = props.detailData || {}
+ 
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('Received values of form: ', values);
+        const { activityTime, signupTime } = values
+        const [startDate, endDate] = activityTime
+        values.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
+        values.endDate = moment(endDate).format('YYYY-MM-DD HH:mm');
+        if (signupTime) {
+          const [enlistStart, enlistEnd] = signupTime
+          values.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
+          values.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
+        }
+        
+        console.log('submit data --->', values)
+        if (groupActivityId) {
+          values.groupActivityId = groupActivityId
+          request({ ...apis.groupActivity.update, data: values }).then(data => {
+            message.info('保存成功')
+            // router.go(-1)
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        } else {
+          request({ ...apis.groupActivity.add, data: { ...values } }).then((data) => {
+            message.info('保存成功')
+            router.push({
+              pathname: '/activity/groupActivity/edithelpActivity',
+              query: {
+                groupActivityId: data.groupActivityId,
+              },
+            });
+            // router.go(-1)
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        }
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+  return (
+    <>
+      <Form {...formItemLayout} onSubmit={handleSubmit}>
+        <Form.Item label="所属项目">
+        {getFieldDecorator('buildingId', {
+          initialValue: detailData.buildingId,
+          rules: [
+            {
+              required: true,
+              message: '请选择所属项目',
+            },
+          ],
+        })(<BuildSelect disabled/>)}
+        </Form.Item>
+        <Form.Item label="活动标题">
+          <span>{detailData.activityName}</span>
+        </Form.Item>
+        <Form.Item label="拼团详情主图">
+          <img src={detailData.mainImg} height="300px" width="375px" />
+        </Form.Item>
+        <Form.Item label="拼团封面图1">
+           <img src={detailData.listImg} height="210px" width="375px" />
+        </Form.Item>
+        <Form.Item label="拼团封面图2">
+          <img src={detailData.bannerListImg} height="125px" width="375px" />
+        </Form.Item>
+        <Form.Item label="活动时间">
+          <span>{`${moment(detailData.startDate).format('YYYY-MM-DD HH:mm:ss')} —— ${moment(detailData.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>
+        </Form.Item>
+        <Form.Item label="成团人数">
+            <span>{detailData.groupBuyPeople}</span>
+        </Form.Item>
+        <Form.Item label="所需积分">
+            <span>{detailData.integral}</span>
+        </Form.Item>
+        <Form.Item label="活动说明">
+          <img src={detailData.descImg} height="300px" width="375px" />
+        </Form.Item>
+        <Form.Item label="权重">
+          <span>{detailData.heavy}</span>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic')
+  const { groupActivityId } = props.location.query
+  const [detailData, setDetailData] = useState(false)
+
+  useEffect(() => {
+    if (groupActivityId) {
+      getDynamicData(groupActivityId);
+    }
+  }, [])
+
+  // 查询详情
+  const getDynamicData = (groupActivityId) => {
+    request({ ...apis.groupActivity.details, urlData: {id: groupActivityId } }).then((data) => {
+      console.log(data)
+      data.activityTime = [moment(data.startTime), moment(data.endTime)]
+
+      // setActivityStatus(data.activityStatus)
+      // setDisable(data.activityStatus === 0 ? true : false)
+      // props.form.setFieldsValue(data)
+      setDetailData(data)
+    })
+  }
+
+  const Poster = (props) => {
+    const [inputValue, changeInput] = useState('')
+    const [textAreaValue, changeTextArea] = useState('')
+    const [imgValue, changeImg] = useState('')
+    const [posterId, setPosterId] = useState('')
+
+    if (groupActivityId) {
+      console.log(groupActivityId, 'groupActivityId')
+      useEffect(() => {
+        request({ ...apis.activity.poster, params: { targetId: groupActivityId, targetType: 'groupActivity' } }).then((data) => {
+          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 (helpActivityId) {
+        if (posterId) {
+          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: groupActivityId, targetType: 'groupActivity', 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: groupActivityId, targetType: 'groupActivity', 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' }}>活动海报图</p>
+            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+          </div>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报</p>
+          <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</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' }}>海报描述</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={() => cancelPage()}>
+        取消
+      </Button> */}
+    </div>
+
+  }
+
+
+
+  const Share = (props) => {
+    const [inputValue, changeInput] = useState('')
+    const [imgValue, changeImg] = useState('')
+    const [shareContentId, setShareContentId] = useState('')
+
+    if (groupActivityId) {
+      useEffect(() => {
+        request({ ...apis.activity.shareContent, params: { targetId: groupActivityId, targetType: 'groupActivity' }, }).then((data) => {
+          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 (groupActivityId) {
+        if (shareContentId) {
+          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: groupActivityId, shareContentType: 'groupActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        } else {
+          request({ ...apis.activity.addShareContent, data: { targetId: groupActivityId, shareContentType: 'groupActivity', 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' }}>分享模板</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: '160px' }} 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' }}>分享标题</p>
+        {inputValue === '' ? '无' : <span>{inputValue}</span>}
+      </div>
+      <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动分享图</p>
+        {imgValue === '' ? '无':<img src={imgValue} height="120px" height="150px" />}
+      </div>
+      {/* <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+      <Button onClick={() => cancelPage()}>
+        取消
+      </Button> */}
+    </div>
+  }
+
+  return (
+    <div>
+      <div>
+        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button>
+        </Radio.Group>
+      </div>
+      <div>
+        {tab === 'basic' && <Basic groupActivityId={groupActivityId} detailData={detailData}/>}
+        {tab === 'poster' && <Poster />}
+        {tab === 'share' && <Share />}
+      </div>
+      <div style={{textAlign: 'center'}}>
+        <AuthButton name="admin.share.record" noRight={null}>
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && 
+            <span 
+              style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} 
+              onClick={getSignList.bind(this, detailData.groupActivityId)}>
+              <Button>拼团记录</Button>
+            </span>}
+          </AuthButton>
+          <Button onClick={() => cancelPage()}>
+            取消
+          </Button>
+      </div>
+
+    </div>
+    
+  );
+}
+
+export default Edit

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -95,7 +95,7 @@ const Edit = props => {
         rules: [
           { required: true, message: '请输入拼团详情主图' },
         ],
-        help: '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于拼团活动详情',
+        help: '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：拼团活动详情',
       },
       {
         label: '拼团封面图1',
@@ -105,7 +105,7 @@ const Edit = props => {
         rules: [
           { required: true, message: '请输入拼团封面图1' },
         ],
-        help: '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于活动列表',
+        help: '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于：活动列表/首页推荐',
       },
       {
         label: '拼团封面图2',
@@ -115,7 +115,7 @@ const Edit = props => {
         rules: [
           { required: true, message: '请输入拼团封面图2' },
         ],
-        help: '建议图片尺寸：750*250px，比例3:1,格式：jpg，用于首页底部活动轮播',
+        help: '建议图片尺寸：750*250px，比例3:1,格式：jpg，用于：项目详情页',
       },
       {
         label: '活动时间',
@@ -310,7 +310,7 @@ const Edit = props => {
           </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' }}>海报描述</p>
-            <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+            <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
           </div>
 
         </div>
@@ -370,7 +370,7 @@ const Edit = props => {
         <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="" />
+          <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
         </div>
       </div>
       <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>

src/pages/activity/groupActivity/helpRecord.jsx

@@ -315,7 +315,7 @@ function body(props) {
   // 分页
   function onChange(pageNum) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    getList({ pageNumber: pageNum, pageSize: 10, groupStatus })
+    getList({ pageNumber: pageNum, pageSize: 10, groupStatus, groupActivityId: groupActivityId, ...props.form.getFieldsValue() })
   }
 
   // 助力成功/进行中/助力失败
@@ -326,9 +326,9 @@ function body(props) {
     const { value } = e.target
     setgroupStatus(value)
     if (value == 0) { 
-        getList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId }) }
+        getList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId, ...props.form.getFieldsValue() }) }
     if (value == 1 || value == 2) {
-         getFailList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId })
+         getFailList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId, ...props.form.getFieldsValue() })
          }
   }
 

src/pages/activity/groupActivity/list.jsx

@@ -41,6 +41,24 @@ const header = props => {
     });
   }
 
+  const getActivityDetail = (groupActivityId) => () => {
+    router.push({
+      pathname: '/activity/groupActivity/detailActivity',
+      query: {
+        groupActivityId,
+      },
+    });
+  } 
+
+  const getJoinPeople = (groupActivityId) => () => {
+    router.push({
+      pathname: '/activity/groupActivity/helpRecord',
+      query: {
+          groupActivityId,
+      },
+    });
+  } 
+
   /**
    *
    *
@@ -54,6 +72,8 @@ const header = props => {
       dataIndex: 'activityName',
       key: 'activityName',
       align: 'center',
+      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
+                              <span style={{color: 'blue',cursor: 'pointer'}} onClick={getActivityDetail(row.groupActivityId)}>{row.activityName}</span></div></>,
     },
     {
       title: '活动时间',
@@ -73,6 +93,8 @@ const header = props => {
       dataIndex: 'participateNum',
       key: 'participateNum',
       align: 'center',
+      render: (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
+                            <span style={{color: 'blue',cursor: 'pointer'}} onClick={getJoinPeople(row.groupActivityId)}>{row.participateNum}</span></div></>,
     },
     {
       title: '成团数',
@@ -107,19 +129,16 @@ const header = props => {
           {row.activityStatus === 0 &&
             <AuthButton name="admin.taShareActivity.finish.put" noRight={null}><span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span></AuthButton>
           }
-          {(row.activityStatus === 0 || row.activityStatus === 2)&&
-            <AuthButton name="admin.taShareSuccessRecord.get" noRight={null}>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
-            </AuthButton>
-          }
           {
-            <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
+            <AuthButton name="admin.taShareActivity.publish" noRight={null}>
               <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>
             </AuthButton>
           }
           {
-            <AuthButton name="admin.taShareActivity.list.get" noRight={null}>
+            <AuthButton name="admin.taShareActivity.tag" noRight={null}>
               <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{row.weight === 1 ? '取消标签' : '添加标签'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+            </AuthButton>}{
+            <AuthButton name="admin.taShareActivity.top" noRight={null}>
               <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
             </AuthButton>}
 
@@ -132,15 +151,7 @@ const header = props => {
       ),
     },
   ];
-  const getSignList = groupActivityId => {
-    router.push({
-      pathname: '/activity/groupActivity/helpRecord',
-      query: {
-        groupActivityId,
-      },
-    });
-  }
-
+  
   const finishDynamic = (row) => {
     Modal.confirm({
       title: '结束以后将无法编辑, 是否继续?',
@@ -301,9 +312,11 @@ const header = props => {
           )}
         </Form.Item>
         <Form.Item>
+        <AuthButton name="admin.taShareActivity.search" noRight={null}>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
+          </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
             </Button>
@@ -312,7 +325,13 @@ const header = props => {
       <AuthButton name="admin.taShareActivity.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditActivity()}>新增</Button>
       </AuthButton>
-      <Table style={{marginTop:'30px'}} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
+      <Table 
+      // onRow={record => {
+      //     return {
+      //       onClick: getActivityDetail(record.groupActivityId),
+      //     };
+      //   }}
+        style={{marginTop:'30px'}} 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} current={data.current} />
       </div>

src/pages/activity/helpActivity/detailActivity.jsx

@@ -0,0 +1,397 @@
+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';
+import AuthButton from '@/components/AuthButton';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+const formItemLayout = {
+  labelCol: { span: 6 },
+  wrapperCol: { span: 14 },
+};
+
+const cancelPage = () => {
+  router.push({
+    pathname: '/activity/helpActivity/list',
+  });
+}
+
+const getSignList = helpActivityId => {
+    router.push({
+        pathname: '/activity/helpActivity/signList',
+        query: {
+          helpActivityId,
+        },
+      });
+}
+
+const BasicForm = props => {
+
+  const detailData = props.detailData || {}
+  
+  const { helpActivityId } = props
+
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('Received values of form: ', values);
+        const { activityTime, signupTime } = values
+        const [startDate, endDate] = activityTime
+        values.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
+        values.endDate = moment(endDate).format('YYYY-MM-DD HH:mm');
+        if (signupTime) {
+          const [enlistStart, enlistEnd] = signupTime
+          values.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
+          values.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
+        }
+        
+        console.log('submit data --->', values)
+        if (helpActivityId) {
+          values.helpActivityId = helpActivityId
+          request({ ...apis.helpActivity.update, data: values }).then(data => {
+            message.info('保存成功')
+            // router.go(-1)
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        } else {
+          request({ ...apis.helpActivity.add, data: { ...values } }).then((data) => {
+            message.info('保存成功')
+            router.push({
+              pathname: '/activity/helpActivity/edithelpActivity',
+              query: {
+                helpActivityId: data.helpActivityId,
+              },
+            });
+            // router.go(-1)
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        }
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+  return (
+    <>
+      <Form {...formItemLayout} onSubmit={handleSubmit}>
+        <Form.Item label="所属项目">
+        {getFieldDecorator('buildingId', {
+          initialValue: detailData.buildingId,
+          rules: [
+            {
+              required: true,
+              message: '请选择所属项目',
+            },
+          ],
+        })(<BuildSelect disabled/>)}
+        </Form.Item>
+        <Form.Item label="活动标题">
+          <span>{detailData.title}</span>
+        </Form.Item>
+        <Form.Item label="助力详情主图">
+          <img src={detailData.img} height="300px" width="375px" />
+        </Form.Item>
+        <Form.Item label="助力封面图1">
+           <img src={detailData.listImg} height="210px" width="375px" />
+        </Form.Item>
+        <Form.Item label="助力封面图2">
+          <img src={detailData.bannerListImg} height="125px" width="375px" />
+        </Form.Item>
+        <Form.Item label="助力邀请人数">
+          <span>{detailData.personNum}</span>
+        </Form.Item>
+        <Form.Item label="助力次数">
+          <span>{detailData.helpNum === 0 ? '不限' : detailData.helpNum}</span>
+        </Form.Item>
+        <Form.Item label="活动时间">
+          <span>{`${moment(detailData.startDate).format('YYYY-MM-DD HH:mm:ss')} —— ${moment(detailData.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>
+        </Form.Item>
+        <Form.Item label="活动说明">
+          <img src={detailData.activityInstructions} height="300px" width="375px" />
+        </Form.Item>
+        <Form.Item label="权重">
+          <span>{detailData.heavy}</span>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic')
+  const { helpActivityId } = props.location.query
+  const [detailData, setDetailData] = useState(false)
+
+  const getDynamicData = helpActivityId => {
+    
+    request({ ...apis.helpActivity.details, params: { helpActivityId } }).then((data) => {
+      console.log(data)
+      data.activityTime = [moment(data.startDate), moment(data.endDate)]
+      data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)]
+
+      setDetailData(data)
+    })
+  }
+
+  useEffect(() => {
+    
+    if (helpActivityId) {
+      
+      getDynamicData(helpActivityId);
+    }
+  }, [])
+
+  const Poster = (props) => {
+    const [inputValue, changeInput] = useState('')
+    const [textAreaValue, changeTextArea] = useState('')
+    const [imgValue, changeImg] = useState('')
+    const [posterId, setPosterId] = useState('')
+
+    if (helpActivityId) {
+      console.log(helpActivityId, 'helpActivityId')
+      useEffect(() => {
+        request({ ...apis.activity.poster, params: { targetId: helpActivityId, targetType: 'helpActivity' } }).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 (helpActivityId) {
+        if (posterId) {
+          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: helpActivityId, targetType: 'helpActivity', 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: helpActivityId, targetType: 'helpActivity', 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' }}>活动海报图</p>
+            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+          </div>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报</p>
+          <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</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' }}>海报描述</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={() => cancelPage()}>
+        取消
+      </Button> */}
+    </div>
+
+  }
+
+
+
+  const Share = (props) => {
+    const [inputValue, changeInput] = useState('')
+    const [imgValue, changeImg] = useState('')
+    const [shareContentId, setShareContentId] = useState('')
+
+    if (helpActivityId) {
+      useEffect(() => {
+        request({ ...apis.activity.shareContent, params: { targetId: helpActivityId, targetType: 'helpActivity' }, }).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 (helpActivityId) {
+        if (shareContentId) {
+          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: helpActivityId, shareContentType: 'helpActivity', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+        } else {
+          request({ ...apis.activity.addShareContent, data: { targetId: helpActivityId, shareContentType: 'helpActivity', 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' }}>分享模板</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: '160px' }} 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' }}>分享标题</p>
+        {inputValue === '' ? '无' : <span>{inputValue}</span>}
+      </div>
+      <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动分享图</p>
+        {imgValue === '' ? '无':<img src={imgValue} height="120px" height="150px" />}
+      </div>
+      {/* <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+      <Button onClick={() => cancelPage()}>
+        取消
+      </Button> */}
+    </div>
+  }
+
+  return (
+    <div>
+      <div>
+        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button>
+        </Radio.Group>
+      </div>
+      <div>
+        {tab === 'basic' && <Basic helpActivityId={helpActivityId} detailData={detailData}/>}
+        {tab === 'poster' && <Poster />}
+        {tab === 'share' && <Share />}
+      </div>
+      <div style={{textAlign: 'center'}}>
+        <AuthButton name="admin.help.record" noRight={null}>
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && 
+            <span 
+              style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} 
+              onClick={getSignList.bind(this, detailData.helpActivityId)}>
+              <Button>助力记录</Button>
+            </span>}
+          </AuthButton>
+          <Button onClick={() => cancelPage()}>
+            取消
+          </Button>
+      </div>
+
+    </div>
+  );
+}
+
+export default Edit

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -165,7 +165,7 @@ const header = props => {
         })(<Input />)}
         </Form.Item>
 
-        <Form.Item label="助力详情主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于助力活动详情">
+        <Form.Item label="助力详情主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：助力活动详情">
           {getFieldDecorator('img', {
           rules: [
             {
@@ -176,7 +176,7 @@ const header = props => {
         })(<ImageUploader />)}
         </Form.Item>
 
-        <Form.Item label="助力封面图1" help="建议图片尺寸：750*420px，比例16:9,格式：jpg，用于活动列表">
+        <Form.Item label="助力封面图1" help="建议图片尺寸：750*420px，比例16:9,格式：jpg，用于：活动列表/首页推荐">
           {getFieldDecorator('listImg', {
           rules: [
             {
@@ -187,7 +187,7 @@ const header = props => {
         })(<ImageUploader />)}
         </Form.Item>
 
-        <Form.Item label="助力封面图2" help="建议图片尺寸：750*250px，比例3:1,格式：jpg，用于首页底部活动轮播">
+        <Form.Item label="助力封面图2" help="建议图片尺寸：750*250px，比例3:1,格式：jpg，用于：项目详情页">
           {getFieldDecorator('bannerListImg', {
           rules: [
             {
@@ -423,7 +423,7 @@ const Edit = props => {
           </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' }}>海报描述</p>
-            <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+            <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
           </div>
 
         </div>
@@ -483,7 +483,7 @@ const Edit = props => {
         <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="" />
+          <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
         </div>
       </div>
       <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>

src/pages/activity/helpActivity/helpRecord.jsx

@@ -525,13 +525,11 @@ function helpRecord(row) {
       </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="helpSucceed">助力成功</Radio.Button>
             <Radio.Button value="helpUnderway">进行中</Radio.Button>
             <Radio.Button value="helpUnfinished">助力失败</Radio.Button>
           </Radio.Group>
-        </AuthButton>
       </div>
       {customerType === 'helpSucceed' ?
         <Table dataSource={dataSource.list} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :

src/pages/activity/helpActivity/list.jsx

@@ -40,6 +40,25 @@ const toEditGoods = (helpActivityId) => () => {
     });
   }
   
+const getActivityDetail = (helpActivityId) => () => {
+  router.push({
+    pathname: '/activity/helpActivity/detailActivity',
+    query: {
+      helpActivityId,
+    },
+  });
+}
+
+const getJoinPeople = (helpActivityId) => () => {
+  router.push({
+    pathname: '/activity/helpActivity/helpRecord',
+    query: {
+      helpActivityId,
+    },
+  });
+}
+  
+  
   /**
    *
    *
@@ -53,6 +72,8 @@ const toEditGoods = (helpActivityId) => () => {
       dataIndex: 'title',
       key: 'title',
       align: 'center',
+      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
+                              <span style={{color: 'blue',cursor: 'pointer'}} onClick={getActivityDetail(row.helpActivityId)}>{row.title}</span></div></>,
     },
     {
       title: '活动时间',
@@ -66,6 +87,8 @@ const toEditGoods = (helpActivityId) => () => {
       dataIndex: 'enlistNum',
       key: 'enlistNum',
       align: 'center',
+      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
+                              <span style={{color: 'blue',cursor: 'pointer'}} onClick={getJoinPeople(row.helpActivityId)}>{row.enlistNum}</span></div></>,
     },
     {
       title: '助力成功数',
@@ -97,22 +120,20 @@ const toEditGoods = (helpActivityId) => () => {
       align: 'center',
       render: (x, row) => (
         <>
-          {(row.activityStatus === 0 || row.activityStatus === 2) &&
-          <AuthButton name="admin.helpRecord.get">
-             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" style={{color:'#bebebe'}}   className={styles.shoppingCart} /></span>
-          </AuthButton>}
           {
-            <AuthButton name="admin.top.update.post" noRight={null}>
+            <AuthButton name="admin.help.publish" noRight={null}>
               <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>
             </AuthButton>
           }
           {row.activityStatus === 0 &&
-            <AuthButton name="admin.top.update.post" noRight={null}>
+            <AuthButton name="admin.help.finish" noRight={null}>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" style={{color:'#bebebe'}} className={styles.edit} /></span> </AuthButton>
           }
           {
-          <AuthButton name="admin.top.update.post" noRight={null}>
+          <AuthButton name="admin.help.tag" noRight={null}>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消标签' : '添加标签' }<Icon type="vertical-align-top"  style={{color:'#bebebe'}} className={styles.edit} /></span>
+          </AuthButton>}{
+          <AuthButton name="admin.help.top" noRight={null}>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
           </AuthButton> }
 
@@ -285,18 +306,26 @@ const handleSubmit = (e, props) => {
           )}
         </Form.Item>
         <Form.Item>
+        <AuthButton name="admin.help.search" noRight={null}>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
+          </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
+      <AuthButton name="admin.help.add.post" noRight={null}>
         <Button name="admin.helpActivity.add.post" noRight={null} type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="activityList"/>
+      <Table 
+        // onRow={record => {
+        //   return {
+        //     onClick: getActivityDetail(record.helpActivityId),
+        //   };
+        // }}
+      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} current={data.current}/>
       </div>

src/pages/activity/helpActivity/signList.jsx

@@ -0,0 +1,546 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions, message } 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;
+
+/**
+ * 助力者弹框
+ */
+class InviteTable extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      dataSource: { records: [] },
+      visibleData: { visible: false, helpId: '', realtyConsultant: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount () {
+    const { helpId } = this.state.visibleData
+    this.getList({ helpRecordInitiateId: helpId, pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate (preProps, preState) {
+    const { helpId } = this.state.visibleData
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      this.getList({ helpRecordInitiateId: helpId, pageNumber: 1, pageSize: 5 })
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk () {
+    this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
+    this.props.onCancel()
+  }
+
+  // 弹框取消按钮
+  handleCancel () {
+    this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
+    this.props.onCancel()
+  }
+
+  getList (params) {
+    if (params.helpRecordInitiateId === '') {
+      return
+    }
+    request({ ...apis.helpActivity.helpPeopleDetails, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  exportHelp() {
+    request({ ...apis.helpActivity.gethelpRecordExport, responseType: 'blob', params: { helpRecordInitiateId: this.state.visibleData.helpId } })
+      .then(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()
+      }).catch(() => {
+
+      })
+  }
+
+
+  // 分页
+  // eslint-disable-next-line react/sort-comp
+  onChange (pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5 })
+  }
+
+  render () {
+    const columns = [
+      {
+        title: '用户姓名',
+        dataIndex: 'name',
+        key: 'name',
+        align: 'center',
+      },
+      {
+        title: '手机号',
+        dataIndex: 'phone',
+        key: 'phone',
+        align: 'center',
+        render: text => <a>{text}</a>,
+      },
+      {
+        title: '助力时间',
+        dataIndex: 'createDate',
+        key: 'createDate',
+        align: 'center',
+        render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+      },
+    ]
+    return (
+      <>
+        <Modal
+          title="助力者"
+          destroyOnClose="true"
+          width={900}
+          footer={null}
+          visible={this.state.visibleData.visible}
+          // onOk={() => this.handleOk()}
+          onCancel={e => this.handleCancel(e)}
+        >
+
+      <Button name="admin.HelpInitiateRecordSucceed.export.get" noRight={null} type="primary" onClick={() => this.exportHelp()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+        导出
+      </Button>
+          <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+        </Modal>
+      </>
+    );
+  }
+}
+
+
+/**
+ * 核销弹框
+ */
+class Verifier extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      verification: { verificationCode: '' },
+      visibleData: { visible: false, helpId: '', helpActivityId: '', helpRecordInitiateId: '', verificationCode: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount () {
+    const { helpId } = this.state.visibleData
+  }
+
+  componentDidUpdate (preProps, preState) {
+    const { helpId } = this.state.visibleData
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      // eslint-disable-next-line react/no-did-update-set-state
+      this.setState({ visibleData: { ...this.props.visibleData } })
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk () {
+    this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
+  }
+
+  // 弹框取消按钮
+  handleCancel () {
+    console.log('核销关闭');
+    // this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
+    this.props.onCancel()
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  audit (params) {
+    request({ ...apis.helpActivity.verification, params: { ...params } }).then(res => {
+      // eslint-disable-next-line no-undef
+      message.info('核销成功')
+      this.props.onSuccess({ pageNumber: 1, pageSize: 10, helpActivityId: this.props.visibleData.helpActivityId, status: 'helpSucceed' })
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  verify(e) {
+    this.setState({ visibleData: { visible: true, helpId: this.props.visibleData.helpId, verificationCode: e.target.value } })
+  }
+
+  // eslint-disable-next-line class-methods-use-this
+  verification(e) {
+    this.audit({ helpRecordInitiateId: this.state.visibleData.helpId, verifyCode: this.state.visibleData.verificationCode })
+  }
+
+  render () {
+    return (
+      <>
+        <Modal
+          title="核销"
+          destroyOnClose="true"
+          width={300}
+          footer={null}
+          visible={this.state.visibleData.visible}
+          // onOk={() => this.handleOk()}
+          onCancel={e => this.handleCancel(e)}
+        >
+          <div><span>核销码:<input style={{marginLeft: '10px'}} onChange={this.verify.bind(this)}/></span>
+           <Button name="admin.helpInitiateRecordVerify.post" noRight={null} onClick={e => this.verification(e)} style={{ marginLeft: '80px', marginTop:'10px', backgroundColor:'red' }}><span style={{color:'white'}}>立即核销</span></Button>
+          </div>
+        </Modal>
+      </>
+    );
+  }
+}
+
+/**
+ *主体列表
+ *
+ * @param {*} props
+ * @returns
+ */
+function body(props) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [gInviteData, setGInviteData] = useState({ visible: false, helpId: '', realtyConsultant: '' })
+
+  // 核销码弹框
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [gVerifierData, setVerifierData] = useState({ visible: false, helpId: '', helpActivityId: '', helpRecordInitiateId: '', verificationCode: '' })
+
+  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('helpSucceed')
+
+  // 调整归属 ============  start
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [gVisibleData, setGVisibleData] = useState({ visible: false, helpId: '', realtyConsultant: '' })
+
+
+  // 变更状态 ============= end
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const { helpActivityId } = props.location.query
+  useEffect(() => {
+    console.log('customerType', customerType)
+    getList({ pageNumber: 1, pageSize: 10, status: customerType, helpActivityId })
+  }, [])
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.helpActivity.record, 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() {
+    setGVisibleData({ visible: false, helpId: '', realtyConsultant: '' })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    // displayNone()
+
+
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, status: customerType, ...values, helpActivityId })
+      }
+    });
+  }
+
+  // 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) {
+    setGInviteData({ visible: false, helpId: '', realtyConsultant: '' })
+    setVerifierData({ visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' })
+    // displayNone()
+
+    const { value } = e.target
+    setCustomerType(value)
+    // setColumns(value === 'helpSucceed' ? privateColumns : publicColumns)
+    getList({ pageNumber: 1, pageSize: 10, status: value, helpActivityId })
+  }
+
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10, status: customerType, helpActivityId })
+  }
+
+  function toCustomerDateil(record) {
+    router.push({
+      pathname: '/customer/customerlist/customerDetail',
+      query: {
+        id: record.customerId,
+      },
+    });
+  }
+
+  function exportCustomer () {
+    const fieldsValue = getFieldsValue()
+    request({ ...apis.helpActivity.HelpInitiateRecordSucceed, responseType: 'blob', params: { ...fieldsValue, customerType, helpActivityId, condition: 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()
+  }
+
+// 助力记录弹框
+function helpRecord(row) {
+  setVerifierData({ visible: false, helpId: row.helpRecordInitiateId, elpRecordInitiateId: '', verificationCode: '' })
+  setGInviteData({ visible: true, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+}
+ // 核销
+ function helpInitiateRecordVerify(row) {
+// 关闭助力记录弹框
+  setGInviteData({ visible: false, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
+
+  // 核销
+  setVerifierData({ visible: true, helpId: row.helpRecordInitiateId, helpActivityId: row.helpActivityId, elpRecordInitiateId: '', verificationCode: '' })
+ }
+ // 核销回调
+ function onSuccess(e) {
+   console.log('回调：', e)
+   getList(e)
+    
+   // 关闭
+   onCancel()
+ }
+
+ function onCancel(e) {
+  // 核销
+  setVerifierData({ visible: false, helpId: '', helpActivityId: '', elpRecordInitiateId: '', verificationCode: '' })
+  // 助力者
+  setGInviteData({ visible: false, helpId: '', realtyConsultant: '' })
+ }
+
+ // 返回到首页
+ function returList(params) {
+  router.push({
+      pathname: '/activity/helpActivity/list',
+    });
+}
+
+  const publicColumns = [
+    {
+      title: '发起者',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+      width: '15%',
+    },
+    {
+      title: '发起者手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+      width: '10%',
+    },
+    {
+      title: '发起时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      width: '15%',
+      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    },
+    {
+      title: '助力者',
+      dataIndex: 'helpCount',
+      key: 'helpCount',
+      align: 'center',
+      width: '15%',
+      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick={() => helpRecord(record)}>{record.helpCount}/{record.persionNumCount}</a>,
+    },
+  ]
+
+  const privateColumns = [
+    {
+      title: '发起者',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+      width: '15%',
+      // render: (_, record) => <Avatar shape="square" src={customerType === 'helpSucceed' ? record.picture : record.avatarurl} size={64} icon="user" />,
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      // render: (_, record) => <><span>{customerType === 'helpSucceed' ? record.name : record.nickname}</span></>,
+    },
+    {
+      title: '发起时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      width: '10%',
+      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+      // eslint-disable-next-line no-nested-ternary
+    },
+    {
+      title: '助力者',
+      dataIndex: 'helpCount',
+      key: 'helpCount',
+      align: 'center',
+      width: '15%',
+      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick={() => helpRecord(record)}>{record.helpCount}人</a>,
+    },
+    {
+      title: '核销状态',
+      dataIndex: 'reportRecommendStatus',
+      key: 'reportRecommendStatus',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (text, records) => {
+        if (records.verificationStatus === 0 || records.verificationStatus === null) { return '未核销' }
+        if (records.verificationStatus === 1) { return '已核销' }
+      },
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '25%',
+      render: (x, row) => (
+        <>
+          {row.verificationStatus === 0 &&
+          <AuthButton name="admin.SignList.get" noRight={null}>
+           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={() => helpInitiateRecordVerify(row)}>核销</span>
+          </AuthButton>
+        }
+        </>
+      ),
+    },
+  ]
+
+  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={returList}>
+              返回
+            </Button>
+        </Form.Item>
+      </Form>
+      <Button name="admin.helpRecord.export.get" noRight={null} type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+        导出
+      </Button>
+
+      <div style={{ margin: '20px 0' }}>
+          <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
+            <Radio.Button value="helpSucceed">助力成功</Radio.Button>
+            <Radio.Button value="helpUnderway">进行中</Radio.Button>
+            <Radio.Button value="helpUnfinished">助力失败</Radio.Button>
+          </Radio.Group>
+      </div>
+      {customerType === 'helpSucceed' ?
+        <Table dataSource={dataSource.list} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
+        <Table dataSource={dataSource.list} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" />
+      }
+        <Verifier visibleData={gVerifierData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)} />
+       <InviteTable visibleData={gInviteData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)}/>
+    </>
+  );
+}
+
+const WrappedBody = Form.create({ name: 'body' })(body);
+
+export default WrappedBody

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

@@ -184,6 +184,7 @@ function AddBuilding(props) {
       data.buildingTransport = tagFilter(data.buildingTransport, 'Transport')
     }
     if (data.buildingMall) {
+      debugger
       data.buildingMall = tagFilter(data.buildingMall, 'Mall')
     }
     if (data.buildingEdu) {
@@ -199,6 +200,7 @@ function AddBuilding(props) {
       data.buildingRestaurant = tagFilter(data.buildingRestaurant, 'Restaurant')
     }
 
+    debugger
     const api = data.buildingId === undefined ? apis.building.addBuilding : apis.building.updateBuilding
     request({ ...api, data: { ...data } }).then(res => {
       openNotificationWithIcon('success', '操作成功')
@@ -226,7 +228,9 @@ function AddBuilding(props) {
     const determineTag = poi.map(p => {
       if (p.key === keyType) {
         if (typeof p.data === 'string') {
-          p.data = JSON.parse(p.data).filter(f => automaticTag.includes(f.name))
+          p.data = JSON.parse(p.data).filter(f => automaticTag.includes(f.name)) || []
+        } else {
+          p.data = p.data.filter(x => tags.some(t => !t.automatic || t.tagName === x.name))
         }
       }
       return p
@@ -441,7 +445,7 @@ function AddBuilding(props) {
               <ImageUpload />,
             )}
           </Form.Item> */}
-          <Form.Item label="排序" >
+          <Form.Item label="排序" help="数值越大，楼盘在列表页中展示越靠前">
             {getFieldDecorator('orderNo')(<Input />)}
           </Form.Item>
           {/* <Form.Item label="优惠信息" >

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

@@ -4,6 +4,7 @@ import ImageListUpload from '../../../../../components/XForm/ImageListUpload';
 import moment from 'moment';
 import request from '../../../../../utils/request';
 import apis from '../../../../../services/apis';
+import router from 'umi/router';
 
 const { Header, Footer, Sider, Content } = Layout;
 
@@ -221,6 +222,7 @@ function BuildingImageModel(props) {
 
   return (
     <>
+      <Button type="danger" style={{ marginLeft: '18px', float: 'right' }} onClick={() => router.go(-1)}>返回</Button>
       <span style={{ marginTop: '10px', marginBottom: '10px' }}>{props.apartment.apartmentName}({imageList.length})</span>
       <Button type="link" style={{ color: 'blue' }} onClick={() => edi()}>重命名</Button>
       <Button type="link" style={{ color: 'blue' }} onClick={() => deletePhoto()}>删除相册</Button>

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

@@ -40,7 +40,7 @@ class TypeForm extends React.Component {
         }
         
         values.buildingTypeName = this.props.type.buildingTypeName
-        console.log('values: ', values)
+        console.log('valuesvaluesvaluesvalues: ', values)
         this.props.onSuccess(values)
       }
     });
@@ -144,13 +144,17 @@ class ProjectTypeBody extends React.Component {
   }
 
   onClose = e => {
+    console.log(2)
     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)
+    console.log('onClose——data111: ', buildingType)
     this.setState({ data: buildingType })
     this.setState({ defaultCheckboxValue: buildingType.map(item => item.buildingTypeId) })
+    if (typeof this.props.onChange === 'function') {
+      this.props.onChange(buildingType)
+    }
   }
 
   getNewProjectType = values => {
@@ -237,8 +241,14 @@ class ProjectTypeBody extends React.Component {
         <Modal
           title="项目类型"
           visible={this.state.visible}
-          onOk={this.handleOk}
+          // onOk={this.handleOk}
           onCancel={this.handleCancel}
+          footer={
+            [
+            <Button key="submit" type="primary" onClick={this.handleOk}>
+             确定  
+            </Button>] 
+          }
         >
           <Checkbox.Group options={this.state.projectType.map(item => ({ label: item.buildingTypeName, value: item.buildingTypeId }))} onChange={e => this.onCheckboxChange(e)} value={this.state.defaultCheckboxValue}/>
         </Modal>

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

@@ -119,13 +119,13 @@ function imageSet(props) {
       title: '面积',
       dataIndex: 'buildingArea',
       key: 'buildingArea',
-      render: (buildingArea, _) => <span>{ `${buildingArea}m²` }</span>,
+      render: (buildingArea, _) => <span>{ `${buildingArea === 0 || buildingArea === null ? "-" : buildingArea + "m²"}` }</span>,
     },
     {
       title: '套内面积',
       dataIndex: 'insideArea',
       key: 'insideArea',
-      render: (insideArea, _) => <span>{ `${insideArea === 0 ? "-" : insideArea + "m²"}` }</span>,
+      render: (insideArea, _) => <span>{ `${insideArea === 0 || insideArea === null ? "-" : insideArea + "m²"}` }</span>,
     },
     {
       title: '创建时间',
@@ -149,6 +149,7 @@ function imageSet(props) {
   return (
     <>
       <Button type="primary" onClick={() => showEdi()}>新增户型</Button>
+      <Button type="danger" style={{ marginLeft: '18px'}} onClick={() => router.go(-1)}>返回</Button>
       <Table dataSource={data} columns={columns} pagination={false} rowKey="imageSet" />
 
       {/* 编辑页 */}

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

@@ -196,9 +196,9 @@ class ModalImage extends React.Component {
               </Form.Item>
               <Form.Item label="面积" help="单位 ㎡">
                 {getFieldDecorator('buildingArea', {
-                  rules: [{ required: true, message: '请填写面积' },
+                  rules: [{ message: '请填写面积' },
                           {
-                            pattern: new RegExp('^[0-9]*$'),
+                            pattern: new RegExp('^[1-9][0-9]*(\.[0-9]{1,2})?$'),
                             message: '只允许输入数字',
                           },
                   ],
@@ -209,7 +209,7 @@ class ModalImage extends React.Component {
                   rules: [
                     // { required: true, message: '请填写套内面积' },
                           {
-                            pattern: new RegExp('^[0-9]*$'),
+                            pattern: new RegExp('^[1-9][0-9]*(\.[0-9]{1,2})?$'),
                             message: '只允许输入数字',
                           },
                   ],

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

@@ -106,7 +106,7 @@ const Poster = props => {
     <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 || (building.buildingImg[0].url || poster1)} alt="" />
+          <img style={{ width: '100%', height: '300px' }} src={imgValue ? imgValue : poster1} alt="" />
 
           <p className={Styles.tagLabel}>
             {
@@ -151,7 +151,7 @@ const Poster = props => {
         </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' }}>海报描述</p>
-          <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+          <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
         </div>
 
       </div>

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

@@ -76,7 +76,7 @@ const Share = props => {
           知与行互动
         </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="" />
+        <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
       </div>
     </div>
     <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>

src/pages/building/list/index.jsx

@@ -96,68 +96,69 @@ function CartBody(props) {
       },
     });
   }
-// src={((data.buildingImg && data.buildingImg[0]) || {}).url}background: `url(${item.caseCoverImg})` style={{ background: `url(((data.buildingImg && data.buildingImg[0]) || {}).url)` }}
+  // src={((data.buildingImg && data.buildingImg[0]) || {}).url}background: `url(${item.caseCoverImg})` style={{ background: `url(((data.buildingImg && data.buildingImg[0]) || {}).url)` }}
   const { buildingImg } = data
   console.log("buildingImg1: ", data.buildingImg)
   return (
     <Card
       hoverable
       style={{ minWidth: '330px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
-      // cover={}
-      // bodyStyle={{ padding: '10px 20px' }}
+    // cover={}
+    // bodyStyle={{ padding: '10px 20px' }}
     >
       {/* 因为 background 方式设置图片背景，如果 图片url 存在空格或者其他特殊字符，导致显示不出来，需要进行 encodeURI(xxx) 转码 */}
-    <img className={Styles.cover} style={{ backgroundImage: `url('${encodeURI( ((data.buildingListImg && data.buildingListImg[0]) || {}).url )}')` }}   ></img>
-    <div style={{ padding: '10px 20px' }}>
-      <p className={Styles.cardText}>
-        <span className={Styles.title}>楼盘编号</span>
-        <span style={{textOverflow: 'ellipsis',  whiteSpace: 'nowrap',  overflow: 'hidden'}}>：{data.code}</span>
-        <AuthButton name="admin.building.update.put" noRight={null}>
-          <span className={Styles.ediText} onClick={() => toEdi(data)}>
-            编辑
+        <span className={Styles.recommderTag}>{data.isMain === 1 ? '首页推荐':''}</span>
+        <img className={Styles.cover} style={{ backgroundImage: `url('${encodeURI(((data.buildingListImg && data.buildingListImg[0]) || {}).url)}')` }}   ></img>
+      <div style={{ padding: '10px 20px' }}>
+        <p className={Styles.cardText}>
+          <span className={Styles.title}>楼盘编号</span>
+          <span style={{ textOverflow: 'ellipsis', whiteSpace: 'nowrap', overflow: 'hidden' }}>：{data.code}</span>
+          <AuthButton name="admin.building.update" noRight={null}>
+            <span className={Styles.ediText} onClick={() => toEdi(data)}>
+              编辑
                   <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
-          </span>
-        </AuthButton>
-      </p>
-      <p className={Styles.cardText}>
-        <span className={Styles.title}>楼盘名称</span>
-        <span style={{textOverflow: 'ellipsis',  whiteSpace: 'nowrap',  overflow: 'hidden'}}>：{data.buildingName || data.name}</span>
-      </p>
-      <p className={Styles.cardItem}>
-        <span className={Styles.title}>均价</span>
-        <span >
-          ：约<span style={{ color: '#FF0707', fontSize: '20px' }}> {data.price || '待定'} </span>元/m²
+            </span>
+          </AuthButton>
+        </p>
+        <p className={Styles.cardText}>
+          <span className={Styles.title}>楼盘名称</span>
+          <span style={{ textOverflow: 'ellipsis', whiteSpace: 'nowrap', overflow: 'hidden' }}>：{data.buildingName || data.name}</span>
+        </p>
+        <p className={Styles.cardItem}>
+          <span className={Styles.title}>均价</span>
+          <span >
+            ：约<span style={{ color: '#FF0707', fontSize: '20px' }}> {data.price || '待定'} </span>元/m²
         </span>
-      </p>
-      <p className={Styles.cardItem}>
-        <span className={Styles.title}>项目地址</span>
-        <span className={Styles.address}>：{data.address}</span>
-      </p>
-      <p className={Styles.cardItem}>
-        <span className={Styles.title}>发布状态</span>
-        <span >：{data.status === 1 ? '已发布' : '未发布'}</span>
-      </p>
-      <p className={Styles.cardItem}>
-        <span className={Styles.title}>录入时间</span>
-        <span >：{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>
-      </p>
-      <p style={{ margin: '15px 0', position: 'relative', fontSize: '0.106rem' }}>
-      <AuthButton name="admin.building.update.status.put" noRight={null}>
-        <span style={{ color: '#FF4A4A' }} onClick={() => pulicAndUnPulic(data)}>
-          {/* 已发布的时候，需要显示取消发布的字样 */}
-          {data.status === 1 ? '取消发布' : '发布'}
-          <Icon type={data.status === 1 ? 'close-circle' : 'form'} style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-        </span>
-      </AuthButton>
-      <AuthButton name="admin.building.delete.id.delete" noRight={null}>
-        <span style={{
-          color: '#FF4A4A', position: 'absolute', right: '0',
-        }} onClick={() => deleteBuilding(data)}>
-          删除
+        </p>
+        <p className={Styles.cardItem}>
+          <span className={Styles.title}>项目地址</span>
+          <span className={Styles.address}>：{data.address}</span>
+        </p>
+        <p className={Styles.cardItem}>
+          <span className={Styles.title}>发布状态</span>
+          <span >：{data.status === 1 ? '已发布' : '未发布'}</span>
+        </p>
+        <p className={Styles.cardItem}>
+          <span className={Styles.title}>录入时间</span>
+          <span >：{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>
+        </p>
+        <p style={{ margin: '20px 0', position: 'relative', fontSize: '0.106rem' }}>
+          <AuthButton name="admin.building.public" noRight={null}>
+            <span style={{ color: '#FF4A4A' }} onClick={() => pulicAndUnPulic(data)}>
+              {/* 已发布的时候，需要显示取消发布的字样 */}
+              {data.status === 1 ? '取消发布' : '发布'}
+              <Icon type={data.status === 1 ? 'close-circle' : 'form'} style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+            </span>
+          </AuthButton>
+          <AuthButton name="admin.building.delete" noRight={null}>
+            <span style={{
+              color: '#FF4A4A', position: 'absolute', right: '0',bottom:'0'
+            }} onClick={() => deleteBuilding(data)}>
+              删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-        </span>
-      </AuthButton>
-      </p>
+            </span>
+          </AuthButton>
+        </p>
       </div>
     </Card>
   )
@@ -184,7 +185,7 @@ function body(props) {
     // 网路请求
     request({ ...apis.building.getList, params: { ...params } }).then(res => {
       setDataSource(res)
-      console.log("res:",res)
+      console.log("res:", res)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
       <Alert
@@ -207,7 +208,7 @@ function body(props) {
         console.log('提交数据: ', values)
         const { startDate } = values
         if (values.startDate !== undefined) {
-         
+
           values.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00.000')}Z`
         }
         getList({ pageNum: 1, pageSize: 9, ...values })
@@ -235,7 +236,7 @@ function body(props) {
 
   function toAdd() {
     // 判断楼盘是否最可以添加
-    request({ ...apis.building.verifyMax}).then(res => {
+    request({ ...apis.building.verifyMax }).then(res => {
       router.push({ pathname: '/building/list/add' })
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
@@ -299,15 +300,15 @@ function body(props) {
         <Form.Item>
           {getFieldDecorator('marketStatus')(
             <Select style={{ width: '180px' }} placeholder="销售状态" onChange={handleSelectChange}>
-                <Option value="待定">待定</Option>
-                <Option value="在售">在售</Option>
-                <Option value="售完">售完</Option>
+              <Option value="待定">待定</Option>
+              <Option value="在售">在售</Option>
+              <Option value="售完">售完</Option>
             </Select>,
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('cityId')(
-             <SelectCity />,
+            <SelectCity />,
           )}
         </Form.Item>
         <Form.Item>
@@ -319,16 +320,16 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-            <Button type="primary" htmlType="submit">
-              搜索
+          <Button type="primary" htmlType="submit">
+            搜索
             </Button>
-            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
             </Button>
         </Form.Item>
       </Form>
 
-      <AuthButton name="admin.building.add.post" noRight={null}>
+      <AuthButton name="admin.building.add" noRight={null}>
         <Button type="danger" className={Styles.addButton} onClick={() => toAdd()}>
           新增楼盘
         </Button>

src/pages/building/list/style.less

@@ -20,8 +20,18 @@
   display: flex;
   align-items: center;
   position: relative;
-  margin-bottom: 0.08rem;
-  
+  margin-bottom: 0.08rem; 
+}
+
+.recommderTag{
+  position: absolute;
+  color: #fff;
+  line-height: 0.28rem;
+  width: 0.54rem;
+  background-color: rgba(0,0,0,0.4);
+  text-align: center;
+  border-radius: 12px 0 12px 0;
+  font-size: 0.09rem;
 }
 .cardItem{
   font-size: 0.106rem;

src/pages/building/type/index.jsx

@@ -37,18 +37,22 @@ function body() {
       key: 'row',
       render: (_, record) => (
         <span >
-          <Button type="link" style={{
-            color: '#FF4A4A', right: '0',
-          }} onClick={() => deleteType(record)}>
-            删除
-            <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-          </Button>
-          <Button type="link" style={{
-            color: '#FF4A4A', right: '0',
-          }} onClick={() => toEdi(record.buildingTypeId)}>
-            编辑
-            <Icon type="copy" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-          </Button>
+          <AuthButton name="admin.tdBuildingType.delete" noRight={null}>
+            <Button type="link" style={{
+              color: '#FF4A4A', right: '0',
+            }} onClick={() => deleteType(record)}>
+              删除
+              <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+            </Button>
+          </AuthButton>
+          <AuthButton name="admin.tdBuildingType.update" noRight={null}>
+            <Button type="link" style={{
+              color: '#FF4A4A', right: '0',
+            }} onClick={() => toEdi(record.buildingTypeId)}>
+              编辑
+              <Icon type="copy" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+            </Button>
+          </AuthButton>
         </span>
       ),
     },
@@ -119,7 +123,7 @@ function body() {
 
   return (
     <>
-      <AuthButton name="admin.tdBuildingType.post" noRight={null}>
+      <AuthButton name="admin.tdBuildingType.add" noRight={null}>
         <Button type="danger" onClick={() => toEdi()}>新增类型</Button>
       </AuthButton>
       <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="buildingType"/>

src/pages/carouselFigure/SelectActivity.jsx

@@ -1,8 +1,9 @@
 import React, { useState, useEffect } from 'react';
-import{ Select, Modal } from 'antd';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
 import { apis, fetch } from '../../utils/request';
 
-const getActivities = fetch(apis.activity.list)
+const getActivities = fetch(apis.activity.listSelected)
+const { Search } = Input;
 
 export default (props) => {
   const {
@@ -13,18 +14,19 @@ export default (props) => {
 
   const [list, setList] = useState([]);
   const [visible, setVisible] = useState(false);
-  const [ activity, setActivity ] = useState({ dynamicId: undefined, title: '请选择活动' })
+  const [activity, setActivity] = useState({ dynamicId: undefined, title: '请选择活动' })
   const getActTitle = val => ((list.filter(x => x.dynamicId === val)[0]) || {}).title || '请选择活动'
   const setAct = val => setActivity({ dynamicId: val, title: getActTitle(val) })
 
   const buildingId = props.buildingId()
-  
+
   useEffect(() => {
     getActivities({
       params: {
         buildingId,
         pageNum: 1,
         pageSize: 999,
+        activityStatus: 2,
       }
     }).then((data) => {
       setList(data.list || [])
@@ -38,37 +40,76 @@ export default (props) => {
   if (value !== activity.dynamicId) {
     setAct(value);
   }
+  const searchActivity =(e)=>{
+    getActivities({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        activityStatus: 2,
+        name:e
+      }
+    }).then((data) => {
+      setList(data.list || [])
+
+      console.log('----', buildingId, value)
+
+      // setAct(buildingId ? undefined : value);
+    })
+  }
 
   let chooseVal = value
 
   const handleChange = val => chooseVal = val
 
+  const setData = val => {
+    setAct(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'title',
+      key: 'dynamicId',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'name',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <span>
+          <a onClick={() => setData(record.dynamicId)} style={{ color: 'blue' }}>选择</a>
+        </span>
+      ),
+    },
+  ];
+
   return (
+
     <div>
       <div onClick={() => setVisible(true)}>{activity.title}</div>
       <Modal
-        title="请选择活动"
+        title="请选择"
         visible={visible}
-        onOk={() => {
-          setAct(chooseVal)
-          onChange(chooseVal)
-          setVisible(false)
-        }}
         onCancel={() => setVisible(false)}
+        footer={[]}
       >
-        <Select
-        showSearch
-        filterOption={(input, option) =>
-          option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        }
-        defaultValue={chooseVal} 
-        onChange={handleChange} 
-        style={{ width: '90%' }}>
-          {
-            list.map(x => (<Select.Option key={x.dynamicId} value={x.dynamicId}>{x.title}</Select.Option>))
-          }
-        </Select>
+        <Search
+          placeholder="请输入标题"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchActivity(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.dynamicId} columns={columns} dataSource={list} />
       </Modal>
     </div>
+
   );
 }

src/pages/carouselFigure/SelectGroup.jsx

@@ -1,7 +1,9 @@
 import React, { useState, useEffect } from 'react';
-import { Select, Modal } from 'antd';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
 import { apis, fetch } from '../../utils/request';
 
+const { Search } = Input;
+
 const getGroupList = fetch(apis.groupActivity.EffectiveList)
 
 export default props => {
@@ -27,6 +29,7 @@ export default props => {
         buildingId,
         pageNum: 1,
         pageSize: 999,
+        status: 1,
       },
     }).then(data => {
       setList(data.records || [])
@@ -34,40 +37,74 @@ export default props => {
       updateGroup(buildingId ? undefined : value);
     })
   }, [buildingId]);
+  const searchGroup = (e) => {
+    getGroupList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1,
+        name: e
+      }
+    }).then((data) => {
+      setList(data.records || [])
 
+      updateGroup(buildingId ? undefined : value);
+      // setAct(buildingId ? undefined : value);
+    })
+  }
   if (value !== group.groupId) {
     updateGroup(value);
   }
 
   const handleChange = val => {
-      onChange(val)
+    onChange(val)
   }
 
+  const setData = val => {
+    updateGroup(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'activityName',
+      key: 'groupActivityId',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <span>
+          <a onClick={() => setData(record.groupActivityId)} style={{ color: 'blue' }}>选择</a>
+        </span>
+      ),
+    },
+  ];
+
   return (
     <div>
       <div onClick={() => setVisible(true)}>{group.groupName}</div>
       <Modal
-        title="请选择拼团"
+        title="请选择"
         visible={visible}
-        onOk={() => {
-          updateGroup(value)
-          onChange(value)
-          setVisible(false)
-        }}
         onCancel={() => setVisible(false)}
+        footer={[]}
       >
-        <Select
-          showSearch
-          value={value ? parseInt(value) : undefined}
-          onChange={handleChange}
-          style={{ width: '90%' }}
-          filterOption={(input, option) =>
-            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-          }>
-          {
-            list.map(x => (<Select.Option key={x.groupActivityId} value={x.groupActivityId}>{x.activityName}</Select.Option>))
-          }
-        </Select>
+        <Search
+          placeholder="请输入标题"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchGroup(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.groupActivityId} columns={columns} dataSource={list} />
       </Modal>
     </div>
   );

src/pages/carouselFigure/SelectH5.1.jsx

@@ -0,0 +1,111 @@
+import React, { useState, useEffect } from 'react';
+import { Select, Modal, Button, Input } from 'antd';
+import { apis, fetch } from '../../utils/request';
+
+const getH5List = fetch(apis.h5Activity.EffectiveList)
+const { Search } = Input;
+
+export default props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '请选择' })
+  const getGroupTitle = val => {
+    return (list.filter(x => x.drainageId == val)[0] || {}).name || '请选择'
+  }
+  const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+  useEffect(() => {
+    getH5List({
+      params: {
+        pageNum: 1,
+        pageSize: 999,
+        isMiniapp: 1,
+        status: 1,
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateGroup(value ? undefined : value);
+    })
+  }, []);
+  const searchH5 = (e) => {
+    getH5List({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        activityStatus: 2,
+        name: e
+      }
+    }).then((data) => {
+      setList(data.records || [])
+
+      updateGroup(value ? undefined : value);
+    })
+  }
+
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  const setData = val => {
+    updateGroup('')
+    onChange('')
+  }
+
+  return (
+    <div>
+      <div onClick={() => setVisible(true)}>{group.groupName}</div>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[
+          <Button key="back" onClick={() => setVisible(false)}>
+            取消
+            </Button>,
+          <Button key="cancel" onClick={() => setData(value)}>
+            清空
+            </Button>,
+          <Button key="submit" type="primary" onClick={() => {
+            updateGroup(value)
+            onChange(value)
+            setVisible(false)
+          }}>
+            提交
+            </Button>
+        ]}
+      >
+        <Search
+          placeholder="请输入标题"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchH5(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Select
+          showSearch
+          value={value ? parseInt(value) : undefined}
+          onChange={handleChange}
+          style={{ width: '90%' }}
+          filterOption={(input, option) =>
+            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }>
+          {
+            list.map(x => (<Select.Option key={x.drainageId} value={x.drainageId}>{x.name}</Select.Option>))
+          }
+        </Select>
+      </Modal>
+    </div>
+  );
+}

src/pages/carouselFigure/SelectH5.jsx

@@ -0,0 +1,123 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col } from 'antd';
+import { apis, fetch } from '../../utils/request';
+
+const { Column, ColumnGroup } = Table;
+const getH5List = fetch(apis.h5Activity.EffectiveList)
+const { Search } = Input;
+export default props => {
+  const {
+    value,
+    onChange,
+    ...rest
+  } = props;
+
+  const [list, setList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '请选择' })
+  const getGroupTitle = val => {
+    return (list.filter(x => x.drainageId == val)[0] || {}).name || '请选择'
+  }
+  const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
+
+  useEffect(() => {
+    getH5List({
+      params: {
+        pageNum: 1,
+        pageSize: 999,
+        isMiniapp: 1,
+        status: 1,
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateGroup(value ? undefined : value);
+    })
+  }, []);
+  const searchH5 = (e) => {
+    getH5List({
+      params: {
+        pageNum: 1,
+        pageSize: 999,
+        isMiniapp: 1,
+        status: 1,
+        name: e
+      },
+    }).then(data => {
+      setList(data.records || [])
+
+      updateGroup(value ? undefined : value);
+    })
+  }
+
+  if (value !== group.groupId) {
+    updateGroup(value);
+  }
+
+  const handleChange = val => {
+    onChange(val)
+  }
+
+  const setData = val => {
+    updateGroup(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const clearVal = val => {
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'name',
+      key: 'drainageId',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <span>
+          <a onClick={() => setData(record.drainageId)} style={{ color: 'blue' }}>选择</a>
+        </span>
+      ),
+    },
+  ];
+
+  return (
+    <div>
+      <div onClick={() => setVisible(true)}>{group.groupName}</div>
+      <Modal
+        title="请选择"
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        footer={[]}
+      >
+        <Row>
+          <Col span={18}>
+            <Search
+              placeholder="请输入标题"
+              enterButton="搜索"
+              size="default"
+              allowClear="true"
+              onSearch={value => searchH5(value)}
+              style={{ marginBottom: '16px' }}
+            />
+          </Col>
+          <Col span={4} offset={1}>
+            <Button type="primary" onClick={()=>clearVal('')}>清除选择</Button>
+          </Col>
+        </Row>
+
+        <Table rowKey={list => list.drainageId} columns={columns} dataSource={list} />
+
+      </Modal>
+    </div>
+  )
+}

src/pages/carouselFigure/SelectHelp.jsx

@@ -1,6 +1,8 @@
 import React, { useState, useEffect } from 'react';
-import { Select, Modal } from 'antd';
+
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
 import { apis, fetch } from '../../utils/request';
+const { Search } = Input;
 
 const getHelpList = fetch(apis.helpActivity.effectiveList)
 
@@ -28,6 +30,7 @@ export default props => {
         buildingId,
         pageNum: 1,
         pageSize: 999,
+        status: 1
       },
     }).then(data => {
       setList(data.records || [])
@@ -35,7 +38,21 @@ export default props => {
       updateHelp(value ? undefined : value);
     })
   }, [buildingId]);
+  const searchHelp = (e) => {
+    getHelpList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        status: 1,
+        name: e
+      },
+    }).then(data => {
+      setList(data.records || [])
 
+      updateHelp(value ? undefined : value);
+    })
+  }
   if (value !== help.helpId) {
     updateHelp(value);
   }
@@ -44,32 +61,50 @@ export default props => {
     onChange(val)
   }
 
+  const setData = val => {
+    updateHelp(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'title',
+      key: 'helpActivityId',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <span>
+          <a onClick={() => setData(record.helpActivityId)} style={{ color: 'blue' }}>选择</a>
+        </span>
+      ),
+    },
+  ];
+
   return (
     <div>
       <div onClick={() => setVisible(true)}>{help.helpName}</div>
       <Modal
-        title="请选择助力"
+        title="请选择"
         visible={visible}
-        onOk={() => {
-          updateHelp(value)
-          onChange(value)
-          setVisible(false)
-        }}
         onCancel={() => setVisible(false)}
+        footer={[]}
       >
-        <Select
-          placeholder="请选择助力"
-          showSearch
-          value={value ? parseInt(value) : undefined}
-          onChange={handleChange}
-          style={{ width: '90%' }}
-          filterOption={(input, option) =>
-            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-          }>
-          {
-            list.map(x => (<Select.Option key={x.helpActivityId} value={x.helpActivityId}>{x.title}</Select.Option>))
-          }
-        </Select>
+        <Search
+          placeholder="请输入标题"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchHelp(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.helpActivityId} columns={columns} dataSource={list} />
       </Modal>
     </div>
   );

src/pages/carouselFigure/SelectNews.jsx

@@ -1,8 +1,9 @@
 import React, { useState, useEffect } from 'react';
-import { Select, Modal } from 'antd';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input } from 'antd';
 import { apis, fetch } from '../../utils/request';
 
 const getNewsList = fetch(apis.news.getList)
+const { Search } = Input;
 
 export default props => {
   const {
@@ -25,6 +26,7 @@ export default props => {
         buildingId,
         pageNum: 1,
         pageSize: 999,
+        newsStatus: 0,
       },
     }).then(data => {
       setList(data.records || [])
@@ -32,7 +34,21 @@ export default props => {
       updateNews(buildingId ? undefined : value);
     })
   }, [buildingId]);
+  const searchActivity = (e) => {
+    getNewsList({
+      params: {
+        buildingId,
+        pageNum: 1,
+        pageSize: 999,
+        newsStatus: 0,
+        title: e
+      },
+    }).then(data => {
+      setList(data.records || [])
 
+      updateNews(buildingId ? undefined : value);
+    })
+  }
   if (value !== news.newsId) {
     updateNews(value);
   }
@@ -41,33 +57,50 @@ export default props => {
     onChange(val)
   }
 
-  console.log(value, typeof value)
+  const setData = val => {
+    updateNews(val)
+    onChange(val)
+    setVisible(false)
+  }
+
+  const columns = [
+    {
+      title: '标题',
+      dataIndex: 'newsName',
+      key: 'newsId',
+      align: 'center',
+      ellipsis: true,
+      render: text => <a>{text}</a>,
+    },
+    {
+      title: '操作',
+      align: 'center',
+      width: '20%',
+      render: (text, record) => (
+        <span>
+          <a onClick={() => setData(record.newsId)} style={{ color: 'blue' }}>选择</a>
+        </span>
+      ),
+    },
+  ];
+
   return (
     <div>
       <div onClick={() => setVisible(true)}>{news.newsName}</div>
       <Modal
-        title="请选择资讯"
+        title="请选择"
         visible={visible}
-        onOk={() => {
-          updateNews(value)
-          onChange(value)
-          setVisible(false)
-        }}
         onCancel={() => setVisible(false)}
+        footer={[]}
       >
-        <Select
-          showSearch
-          value={value ? parseInt(value) : undefined}
-          onChange={handleChange}
-          style={{ width: '90%' }}
-          filterOption={(input, option) =>
-            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-          }
-        >
-          {
-            list.map(x => (<Select.Option key={x.newsId} value={x.newsId}>{x.newsName}</Select.Option>))
-          }
-        </Select>
+        <Search
+          placeholder="请输入标题"
+          enterButton="搜索"
+          size="large"
+          onSearch={value => searchActivity(value)}
+          style={{ marginBottom: '16px' }}
+        />
+        <Table rowKey={list => list.newsId} columns={columns} dataSource={list} />
       </Modal>
     </div>
   );

src/pages/carouselFigure/advertisingList.jsx

@@ -49,11 +49,24 @@ const toEdit = (contentId) => () => {
       render: (image) => <img src={image} className={styles.imgSmall} />,
     },
     {
-      title: '类型',
+      title: '发布城市',
+      dataIndex: 'cityName',
+      key: 'cityName',
+      align: 'center',
+    },
+    {
+      title: '关联项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      render: (buildingName) => <span>{ buildingName === null ? '无' : buildingName }</span>
+    },
+    {
+      title: '关联内容类型',
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : '' }</span>
+      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : '无' }</span>
     },
     // {
     //   title: '发布位置',
@@ -74,7 +87,7 @@ const toEdit = (contentId) => () => {
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (status)=> <><span>{status == 1 ? '启用' : '停用'}</span></>
+      render: (status)=> <><span>{status == 1 ? '上架' : '下架'}</span></>
     },
     {
       title: '操作',
@@ -83,9 +96,14 @@ const toEdit = (contentId) => () => {
       align: 'center',
       render: (x,row) => (
         <>
-          <AuthButton name="admin.extendContent.id.put" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px',cursor: 'pointer' }} onClick={changeStatus(row)}>{ row.status === 1 ? '禁用' : '启用' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#FF925C',cursor: 'pointer' }} onClick={toEdit(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
+          <AuthButton name="admin.advert.publish" noRight={null}>
+            <span style={{ color: '#1990FF', marginRight: '20px',cursor: 'pointer' }} onClick={changeStatus(row)}>{ row.status === 1 ? '下架' : '上架' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+          </AuthButton>
+          <AuthButton name="admin.advert.put" noRight={null}>
+            <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEdit(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
+          </AuthButton>
+          <AuthButton name="admin.advert.delete" noRight={null}>
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={deleteCarouse(row.contentId)}>删除<Icon type="vertical-align-top" className={styles.edit} /></span>
           </AuthButton>
         </>
       )
@@ -110,16 +128,35 @@ const toEdit = (contentId) => () => {
         });
   }
   
+  //删除
+const deleteCarouse = (contentId) => () =>{
+  Modal.confirm({
+    title: '确认删除此数据?',
+    okText: '确定',
+    cancelText: '取消',
+    onOk() {
+      request({ ...apis.carsuseFigure.deleteExtendContent,urlData:{id: contentId}}).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+        }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+        })
+    },
+  });
+}
+
 //   停用启用
   const changeStatus = (row) => () => {
       console.log(row)
       if(row.status === 0) {
-        row.status = 1
+        
         Modal.confirm({
           title: '确认发布此数据?',
           okText: '确定',
           cancelText: '取消',
           onOk() {
+            row.status = 1
               request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
@@ -130,12 +167,13 @@ const toEdit = (contentId) => () => {
           },
         });
       }else if(row.status === 1){
-        row.status = 0
+        
         Modal.confirm({
           title: '停用后不会再显示在小程序端',
           okText: '确定',
           cancelText: '取消',
           onOk() {
+            row.status = 0
               request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
@@ -149,8 +187,12 @@ const toEdit = (contentId) => () => {
 
   }
   
-  const changePageNum = (pageNumber) => {
-      getList({ pageNum: pageNumber, pageSize: 10, showType: 'screen' })
+  const changePageNum = (pageNumber, props) => {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: pageNumber, pageSize: 10, ...values, showType: 'screen' })
+      }
+    });
   }
 
   // 提交事件
@@ -175,6 +217,11 @@ const handleSubmit = (e, props) => {
 
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      <Form.Item>
+          {getFieldDecorator('cityId')(
+             <SelectCity />,
+          )}
+        </Form.Item>
         <Form.Item>
           {getFieldDecorator('buildingId')(
             <BuildSelect />,
@@ -186,7 +233,10 @@ const handleSubmit = (e, props) => {
               <Option value="activity">活动</Option>
               <Option value="project">项目</Option>
               <Option value="news">资讯</Option>
-              <Option value="other">其他</Option>
+              <Option value="help">助力</Option>
+              <Option value="group">拼团</Option>
+              <Option value="h5">H5</Option>
+              <Option value="nothing">无</Option>
             </Select>,
           )}
         </Form.Item>
@@ -201,26 +251,28 @@ const handleSubmit = (e, props) => {
         <Form.Item>
           {getFieldDecorator('status')(
             <Select style={{ width: '180px' }} placeholder="状态">
-              <Option value="1">启用</Option>
-              <Option value="0">停用</Option>
+              <Option value="1">已上架</Option>
+              <Option value="0">已下架</Option>
             </Select>,
           )}
         </Form.Item>
         <Form.Item>
+        <AuthButton name="admin.advert.search" noRight={null}>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
+          </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.extendContent.post" noRight={null}>
+      <AuthButton name="admin.advert.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEdit()}>新增</Button>
       </AuthButton>
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="advertisingList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e,props)} current={data.current}/>
       </div>
     </>
   )

src/pages/carouselFigure/carouselFigureList.jsx

@@ -49,11 +49,24 @@ const toEditCarouse = (contentId) => () => {
       render: (x, row) => <img src={row.image} className={row.showPosition === 'index' ? styles.imgIndex : row.showPosition === 'mall' ? styles.imgPerfect : ''} />,
     },
     {
-      title: '类型',
+      title: '发布城市',
+      dataIndex: 'cityName',
+      key: 'cityName',
+      align: 'center',
+    },
+    {
+      title: '关联项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      render: (buildingName) => <span>{ buildingName === null ? '无' : buildingName }</span>
+    },
+    {
+      title: '关联内容类型',
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : '' }</span>
+      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : '无' }</span>
     },
     {
       title: '发布位置',
@@ -74,7 +87,7 @@ const toEditCarouse = (contentId) => () => {
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (status)=> <><span>{status == 1 ? '启用' : '停用'}</span></>
+      render: (status)=> <><span>{status == 1 ? '已上架' : '已下架'}</span></>
     },
     {
       title: '操作',
@@ -83,9 +96,14 @@ const toEditCarouse = (contentId) => () => {
       align: 'center',
       render: (x,row) => (
         <>
+          <AuthButton name="admin.extendContent.publish" noRight={null}>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer'}} onClick={changeStatus(row)}>{ row.status === 1 ? '下架' : '上架' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+          </AuthButton>
           <AuthButton name="admin.extendContent.id.put" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px',cursor: 'pointer' }} onClick={changeStatus(row)}>{ row.status === 1 ? '禁用' : '启用' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#FF925C',cursor: 'pointer' }} onClick={toEditCarouse(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
+            <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditCarouse(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
+          </AuthButton>
+          <AuthButton name="admin.extendContent.delete" noRight={null}>
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={deleteCarouse(row.contentId)}>删除<Icon type="vertical-align-top" className={styles.edit} /></span>
           </AuthButton>
         </>
       )
@@ -110,37 +128,59 @@ const toEditCarouse = (contentId) => () => {
         });
   }
   
+//删除
+const deleteCarouse = (contentId) => () =>{
+  Modal.confirm({
+    title: '确认删除此数据?',
+    okText: '确定',
+    cancelText: '取消',
+    onOk() {
+      request({ ...apis.carsuseFigure.deleteExtendContent,urlData:{id: contentId}}).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+        }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+        })
+    },
+  });
+}
+
 //   停用启用
   const changeStatus = (row) => () => {
       console.log(row)
       if(row.status === 0) {
-        row.status = 1
+        
         Modal.confirm({
           title: '确认发布此数据?',
           okText: '确定',
           cancelText: '取消',
           onOk() {
+            row.status = 1
             request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
               }).catch((err) => {
                   console.log(err)
+                  row.status = 0
                   message.info(err.msg || err.message)
               })
           },
         });
       }else if(row.status === 1){
-        row.status = 0
+        
         Modal.confirm({
           title: '停用后不会再显示在小程序端',
           okText: '确定',
           cancelText: '取消',
           onOk() {
+            row.status = 0
             request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
               }).catch((err) => {
                   console.log(err)
+                  row.status = 1
                   message.info(err.msg || err.message)
               })
           },
@@ -150,7 +190,7 @@ const toEditCarouse = (contentId) => () => {
   }
   
   const changePageNum = (pageNumber) => {
-      getList({ pageNum: pageNumber, pageSize: 10, showType: 'banner' })
+      getList({ pageNum: pageNumber, pageSize: 10, showType: 'banner', ...props.form.getFieldsValue() })
   }
 
   // 提交事件
@@ -174,6 +214,11 @@ const handleSubmit = (e, props) => {
 
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+             <SelectCity />,
+          )}
+        </Form.Item>
         <Form.Item>
           {getFieldDecorator('buildingId')(
             <BuildSelect />,
@@ -185,6 +230,10 @@ const handleSubmit = (e, props) => {
               <Option value="activity">活动</Option>
               <Option value="project">项目</Option>
               <Option value="news">资讯</Option>
+              <Option value="help">助力</Option>
+              <Option value="group">拼团</Option>
+              <Option value="h5">H5</Option>
+              <Option value="nothing">无</Option>
               {/* <Option value="other">其他</Option> */}
             </Select>,
           )}
@@ -200,15 +249,17 @@ const handleSubmit = (e, props) => {
         <Form.Item>
           {getFieldDecorator('status')(
             <Select style={{ width: '180px' }} placeholder="状态">
-              <Option value="1">启用</Option>
-              <Option value="0">停用</Option>
+              <Option value="1">已上架</Option>
+              <Option value="0">已下架</Option>
             </Select>,
           )}
         </Form.Item>
         <Form.Item>
+        <AuthButton name="admin.extendContent.search" noRight={null}>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
+          </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>

src/pages/carouselFigure/customImg/edit.jsx

@@ -0,0 +1,128 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import channels from '../../channel/channelList.less';
+import { connect } from 'dva';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import { createForm, FieldTypes } from '../../../components/XForm';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import router from 'umi/router';
+import apis from '../../../services/apis';
+import request from '../../../utils/request'
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+let activityVisible = true
+
+const setExtraData = (data) => {
+    console.log(data, 'data');
+    activityVisible = data.imgType === 'index';
+  }
+
+const handleFormValueChange = (props, changedValues, allValues) => {
+    setExtraData(allValues)
+}
+
+const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+const header = props => {
+  const {
+    currentUser = {
+      avatar: '',
+      userName: '',
+    },
+    menu,
+  } = props;
+
+  const imgId = props.location.query.imgId
+  const [ data, setData ] = useState({'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg','imgType':'index','imgDesc':'小程序首页分享配图','imgDocument': currentUser.orgName+' 精准获客平台'})
+  if(imgId){
+    useEffect(() => {
+      getData(imgId);
+    },[])
+
+  // 查询列表
+  const getData = (imgId) => {
+    request({ ...apis.carsuseFigure.getCustomImg, urlData: { id: imgId} }).then((data) => {
+        console.log(data)
+        if (data.imgType === 'index'){
+            activityVisible = true;
+        }else{
+            activityVisible = false;
+        }
+        setData(data)
+    })
+  }
+  }
+
+  const fields = [
+    {
+      label: '图片',
+      name: 'imgUrl',
+      type: FieldTypes.ImageUploader,
+      value: data.imgUrl,
+      help: '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：首页分享',
+      rules: [
+        {required: true, message: '请选择图片'},
+      ]
+    },
+    {
+      label: '类型',
+      name: 'imgType',
+      type: FieldTypes.Select,
+      value: 'index',
+      dict: [{
+          label: '首页分享',
+          value: 'index',
+        },
+      ],
+      rules: [
+        { required: true, message: '请选择类型' },
+      ],
+    },
+    {
+      label: '分享文案',
+      name: 'imgDocument',
+      type: FieldTypes.Text,
+      value: data.imgDocument,
+      rules: [
+        { required: true, message: '请输入分享文案' },
+      ],
+    },
+  ]
+
+  const handleSubmit = values => {
+    
+    if (imgId) {
+      values.imgId = imgId
+      request({ ...apis.carsuseFigure.updateCustomImg, data: values,}).then((data) => {
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+      }else{
+      request({ ...apis.carsuseFigure.addCustomImg, data: values,}).then((data) => {
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+      }
+  }
+
+  const cancelPage = () => {
+    router.push({
+        pathname: '/carouselFigure/customImg/list',
+    });
+  }
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  )
+}
+
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+
+export default connect(({ user }) => ({
+  currentUser: user.currentUser,
+}))(WrappedNormalLoginForm);

src/pages/carouselFigure/customImg/list.jsx

@@ -0,0 +1,79 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal,Breadcrumb } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../../style/GoodsList.less';
+import router from 'umi/router';
+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 { Column } = Table;
+
+function header(props) {
+  // 获取初始化数据
+  const [ data, setData ] = useState([])
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.carsuseFigure.customImg, params: { ...params },}).then((data) => {
+        console.log(data,"datadata")
+        if(data.records.length > 0){
+          setData(data.records)
+        }else{
+          setData([{'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg','imgType':'index','imgDesc':'小程序首页分享配图'}])
+        }
+        
+    })
+  }
+  
+    // 跳转到编辑商品
+  const toEditCustom = (imgId) => () => {
+    router.push({
+      pathname: '/carouselFigure/customImg/edit',
+      query: {
+        imgId
+      },
+    });
+  }
+
+ 
+  // const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Table dataSource={data}>
+        <Column title="图片" dataIndex="imgUrl" key="imgUrl" 
+        render={(text, record) => (
+        <img src={record.imgUrl} height="120px" width="150px" />
+        )}/>
+        <Column title="类型" dataIndex="imgType" key="imgType" 
+        render={(text, record) => (
+          <span>
+            {record.imgType === 'index' ?'首页分享':'请编辑'}
+          </span>
+          )}
+        />
+        <Column title="说明" dataIndex="imgDesc" key="imgDesc" />
+        <Column title="操作" 
+        dataIndex="handle" 
+        key="handle" 
+        render={(text, record) => (
+          <AuthButton name="admin.custom.put" noRight={null}>
+            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditCustom(record.imgId)}>
+              编辑<Icon type="form" className={styles.edit} />
+            </span>
+          </AuthButton>
+          )}/>/>
+      </Table>,
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/carouselFigure/editAdvertising.jsx

@@ -5,6 +5,7 @@ import styles from '../style/GoodsList.less';
 import moment from 'moment';
 import router from 'umi/router';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
+import CitySelect from '../../components/SelectButton/CitySelect2'
 import { FieldTypes, createForm } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit';
 import SelectActivity from './SelectActivity';
@@ -13,7 +14,7 @@ import apis from '../../services/apis';
 import request from '../../utils/request'
 import SelectHelp from './SelectHelp';
 import SelectGroup from './SelectGroup';
-
+import SelectH5 from './SelectH5';
 /**
  *
  *
@@ -27,19 +28,45 @@ import SelectGroup from './SelectGroup';
   let helpVisible = false
   let groupVisible = false
   let buildingId = ''
+  let cityId = ''
+  let isHaveActive=false
+  let isCanChoose=true
 
   const setExtraData = (data) => {
+    if(data.isHaveActive!=undefined){
+      isHaveActive=data.isHaveActive
+      if(!isHaveActive) {
+        data.contentType=null
+        data.buildingId=null
+      }
+    }
+
     contentVisible = data.contentType === 'other';
     activityVisible = data.contentType === 'activity';
     newsVisible = data.contentType === 'news';
     helpVisible = data.contentType === 'help';
     groupVisible = data.contentType === 'group';
+    cityId=data.cityId
+    buildingId = data.buildingId
+  }
+
+  const setExtraData1 = (data) => {
+    if(data.contentType=='h5'||data.contentType==''||data.contentType=='nothing'){
+       isHaveActive=false
+    }else{
+       isHaveActive=true
+    }
 
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
     buildingId = data.buildingId
   }
-  
+
   const handleFormValueChange = (props, changedValues, allValues) => {
-    setExtraData(allValues)
+      setExtraData(allValues)
   }
 
   const XForm = createForm({ onValuesChange: handleFormValueChange })
@@ -48,37 +75,61 @@ import SelectGroup from './SelectGroup';
     const [ tab, changeTab ] = useState('basic')
     const contentId = props.location.query.contentId
     const [ data, setData ] = useState({})
-  
+
     if(contentId){
+      isCanChoose=false
       useEffect(() => {
         getDetail(contentId);
       },[])
-  
+
       // 查询列表
       const getDetail = (contentId) => {
         request({ ...apis.carsuseFigure.getExtendContent,urlData:{id: contentId}}).then((data) => {
-          setExtraData(data)
+          setExtraData1(data)
           setData(data)
         })
       }
+    }else{
+      isCanChoose=true
     }
-  
+
     const cancelPage = () =>{
       router.push({
         pathname: '/carouselFigure/advertisingList',
       });
     }
-   
+
     const fields = [
+      {
+        label: '是否关联项目',
+        name: 'isHaveActive',
+        type: FieldTypes.Switch,
+        value:isHaveActive,
+        hidden: () => !isCanChoose,
+        rules: [
+          { required: true,message: '是否城市活动' },
+        ],
+      },
       {
         label: '所属项目',
         name: 'buildingId',
         render: <BuildSelect />,
         value: data.buildingId,
+        hidden: () => !isHaveActive,
         rules: [
           { required: true, message: '请选择所属项目' },
         ],
       },
+      {
+        label: '展示城市',
+        name: 'cityId',
+        render: <CitySelect />,
+        hidden: () => isHaveActive,
+        value: data.cityId,
+        rules: [
+          { required: true, message: '请选择展示城市' },
+        ],
+      },
       {
         label: '开屏广告',
         name: 'image',
@@ -89,10 +140,21 @@ import SelectGroup from './SelectGroup';
           { required: true, message: '请上传图片' },
         ],
       },
+      {
+        label: '是否发布H5',
+        name: 'targetId',
+        render: <SelectH5/>,
+        hidden: () => isHaveActive,
+        value: data.targetId,
+        rules: [
+          { required: false, message: '请选择发布H5' },
+        ],
+      },
       {
         label: '标题',
         name: 'title',
         type: FieldTypes.Text,
+        hidden: true,
         value: data.title,
         rules: [
           { required: true, message: '请输入标题' },
@@ -101,6 +163,7 @@ import SelectGroup from './SelectGroup';
       {
         label: '类型',
         name: 'contentType',
+        hidden: () => !isHaveActive,
         type: FieldTypes.Select,
         dict: [{
           label: '常规活动',
@@ -114,10 +177,6 @@ import SelectGroup from './SelectGroup';
           label: '资讯',
           value: 'news'
         },
-        {
-          label: '其他',
-          value: 'other'
-        },
         {
           label: '拼团',
           value: 'group'
@@ -186,19 +245,27 @@ import SelectGroup from './SelectGroup';
         name: 'status',
         type: FieldTypes.Select,
         dict: [{
-          label: "启用",
+          label: "上架",
           value: 1
         },
         {
-          label: "停用",
+          label: "下架",
           value: 0
         },],
         value: data.status != null ? data.status : 1,
       },
     ]
-    
-    const handleSubmit = val => { 
+
+    const handleSubmit = val => {
       val.showType = 'screen'
+      if(!isHaveActive&&val.targetId) {
+          if(!val.contentType){
+            val.contentType='h5'
+          }
+      }
+      if(!isHaveActive&&!val.targetId){
+        val.contentType=''
+      }
       if(contentId){
         request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: contentId}, data: val,}).then((data) => {
           cancelPage()
@@ -213,12 +280,12 @@ import SelectGroup from './SelectGroup';
         })
       }
     }
-  
-  
+
+
     return (
       <XForm onSubmit={handleSubmit} onCancel={cancelPage} onValuesChange={handleFormValueChange} fields={fields}></XForm>
     );
    }
  }
- 
+
 export default createEditor()

src/pages/carouselFigure/editCarousel.jsx

@@ -5,6 +5,7 @@ import moment from 'moment';
 import router from 'umi/router';
 import styles from '../style/GoodsList.less';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
+import CitySelect from '../../components/SelectButton/CitySelect2'
 import { createForm, FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
 import apis from '../../services/apis';
@@ -13,6 +14,7 @@ import SelectHelp from './SelectHelp';
 import SelectGroup from './SelectGroup';
 import SelectNews from './SelectNews';
 import SelectActivity from './SelectActivity';
+import SelectH5 from './SelectH5';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 /**
@@ -28,16 +30,45 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
   let helpVisible = false
   let groupVisible = false
   let buildingId = ''
+  let cityId=''
   let locationType = false
+  let isHaveActive=false
+  let isCanChoose=true
 
-  const setExtraData = data => {
+  const setExtraData = (data) => {
     console.log(data, 'data');
+    if(data.isHaveActive!=undefined){
+      isHaveActive=data.isHaveActive
+      if(!isHaveActive) {
+        data.contentType=null
+        data.buildingId=null
+      }
+    }
+
     contentVisible = data.contentType === 'other';
     activityVisible = data.contentType === 'activity';
     newsVisible = data.contentType === 'news';
     helpVisible = data.contentType === 'help';
     groupVisible = data.contentType === 'group';
 
+    cityId=data.cityId
+    buildingId = data.buildingId
+    locationType = data.showPosition === 'mall';
+    console.log(locationType, 'locationType');
+  }
+
+  const setExtraData1 = (data) => {
+     if(data.contentType=='h5'||data.contentType==''||data.contentType=='nothing'){
+        isHaveActive=false
+     }else{
+        isHaveActive=true
+     }
+
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
     buildingId = data.buildingId
     locationType = data.showPosition === 'mall';
     console.log(locationType, 'locationType');
@@ -45,7 +76,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 
   const handleFormValueChange = (props, changedValues, allValues) => {
-    setExtraData(allValues)
+      setExtraData(allValues)
   }
 
   const XForm = createForm({ onValuesChange: handleFormValueChange })
@@ -54,20 +85,24 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     const [tab, changeTab] = useState('basic')
     const { contentId } = props.location.query
     const [data, setData] = useState({})
+
     if (contentId) {
+      isCanChoose=false
       // eslint-disable-next-line react-hooks/rules-of-hooks
       useEffect(() => {
         getDetail(contentId);
       }, [])
 
-    // 查询列表
-    const getDetail = contentId => {
-      request({ ...apis.carsuseFigure.getExtendContent, urlData: { id: contentId } }).then(data => {
-          console.log(data)
-          setExtraData(data)
-          setData(data)
-      })
-    }
+      // 查询列表
+      const getDetail = contentId => {
+        request({ ...apis.carsuseFigure.getExtendContent, urlData: { id: contentId } }).then(data => {
+            console.log(data)
+            setExtraData1(data)
+            setData(data)
+        })
+      }
+    }else{
+      isCanChoose=true
     }
 
     const cancelPage = () => {
@@ -77,15 +112,36 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     }
 
       const fields = [
+        {
+          label: '是否关联项目',
+          name: 'isHaveActive',
+          type: FieldTypes.Switch,
+          value:isHaveActive,
+          hidden: () => !isCanChoose,
+          rules: [
+            { required: true,message: '是否城市活动' },
+          ],
+        },
         {
           label: '所属项目',
           name: 'buildingId',
           render: <BuildSelect />,
+          hidden: () => !isHaveActive,
           value: data.buildingId,
           rules: [
             { required: true, message: '请选择所属项目' },
           ],
         },
+        {
+          label: '展示城市',
+          name: 'cityId',
+          render: <CitySelect />,
+          hidden: () => isHaveActive,
+          value: data.cityId,
+          rules: [
+            { required: true, message: '请选择展示城市' },
+          ],
+        },
         {
           label: '发布位置',
           name: 'showPosition',
@@ -108,16 +164,27 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
           name: 'image',
           type: FieldTypes.ImageUploader,
           value: data.image,
-          help: () => (locationType ? '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于积分商城banner轮播' : '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于首页顶部banner轮播'),
+          help: () => (locationType ? '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于积分商城banner轮播' : '建议图片尺寸：750*464px，比例1.:0.618,格式：jpg，用于：首页顶部banner轮播'),
           rules: [
             { required: true, message: '请上传轮播图' },
           ],
         },
+        {
+          label: '是否发布H5',
+          name: 'targetId',
+          render: <SelectH5/>,
+          hidden: () => isHaveActive,
+          value: data.targetId,
+          rules: [
+            { required: false, message: '请选择发布H5' },
+          ],
+        },
         {
           label: '标题',
           name: 'title',
           type: FieldTypes.Text,
           value: data.title,
+          hidden: true,
           rules: [
             { required: true, message: '请输入标题' },
           ],
@@ -126,6 +193,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
           label: '类型',
           name: 'contentType',
           type: FieldTypes.Select,
+          hidden: () => !isHaveActive,
           dict: [{
             label: '常规活动',
             value: 'activity',
@@ -210,11 +278,11 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
           name: 'status',
           type: FieldTypes.Select,
           dict: [{
-            label: '启用',
+            label: '上架',
             value: 1,
           },
           {
-            label: '停用',
+            label: '下架',
             value: 0,
           }],
           value: data.status != null ? data.status : 1,
@@ -222,7 +290,16 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
       ]
 
       const handleSubmit = val => {
+        console.log(val,"232323")
         val.showType = 'banner'
+        if(!isHaveActive&&val.targetId) {
+          if(!val.contentType){
+            val.contentType='h5'
+          }
+        }
+        if(!isHaveActive&&!val.targetId){
+          val.contentType=''
+        }
         if (contentId) {
           request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: contentId }, data: val }).then(data => {
             cancelPage()

src/pages/carouselFigure/propaganda.jsx

@@ -0,0 +1,293 @@
+import React, { useState, useEffect } from 'react';
+import { Modal, message } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import CitySelect from '../../components/SelectButton/CitySelect2'
+import { FieldTypes, createForm } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit';
+import SelectActivity from './SelectActivity';
+import SelectNews from './SelectNews';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+import SelectHelp from './SelectHelp';
+import SelectGroup from './SelectGroup';
+import SelectH5 from './SelectH5';
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+ const createEditor = () => {
+  let contentVisible = false
+  let activityVisible = false
+  let newsVisible = false
+  let helpVisible = false
+  let groupVisible = false
+  let buildingId = ''
+  let cityId = ''
+  let isHaveActive=false
+  let isCanChoose=true
+
+  const setExtraData = (data) => {
+    if(data.isHaveActive!=undefined){
+      isHaveActive=data.isHaveActive
+      if(!isHaveActive) {
+        data.contentType=null
+        data.buildingId=null
+      }
+    }
+
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+    cityId=data.cityId
+    buildingId = data.buildingId
+  }
+
+  const setExtraData1 = (data) => {
+    console.log(data,"datadatadata")
+    if(data.contentType=='h5'||data.contentType==''||data.contentType=='nothing'){
+       isHaveActive=false
+    }else{
+       isHaveActive=true
+    }
+
+    contentVisible = data.contentType === 'other';
+    activityVisible = data.contentType === 'activity';
+    newsVisible = data.contentType === 'news';
+    helpVisible = data.contentType === 'help';
+    groupVisible = data.contentType === 'group';
+    buildingId = data.buildingId
+  }
+
+  const handleFormValueChange = (props, changedValues, allValues) => {
+      setExtraData(allValues)
+  }
+
+  const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+  return (props) => {
+    const [ tab, changeTab ] = useState('basic')
+    const contentId = props.location.query.contentId
+    const [ data, setData ] = useState({})
+
+    if(contentId){
+      isCanChoose=false
+      useEffect(() => {
+        getDetail(contentId);
+      },[])
+
+      // 查询列表
+      const getDetail = (contentId) => {
+        request({ ...apis.carsuseFigure.getExtendContent,urlData:{id: contentId}}).then((data) => {
+          setExtraData1(data)
+          setData(data)
+        })
+      }
+    }else{
+      isCanChoose=true
+    }
+
+    const cancelPage = () =>{
+      router.push({
+        pathname: '/carouselFigure/propagandaList',
+      });
+    }
+
+    const fields = [
+      {
+        label: '是否关联项目',
+        name: 'isHaveActive',
+        type: FieldTypes.Switch,
+        value:isHaveActive,
+        hidden: () => !isCanChoose,
+        rules: [
+          { required: true,message: '是否城市活动' },
+        ],
+      },
+      {
+        label: '所属项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: data.buildingId,
+        hidden: () => !isHaveActive,
+        rules: [
+          { required: true, message: '请选择所属项目' },
+        ],
+      },
+      {
+        label: '所属城市',
+        name: 'cityId',
+        render: <CitySelect />,
+        hidden: () => isHaveActive,
+        value: data.cityId,
+        rules: [
+          { required: true, message: '请选择展示城市' },
+        ],
+      },
+      {
+        label: '主图',
+        name: 'image',
+        type: FieldTypes.ImageUploader,
+        value: data.image,
+        help: '建议图片尺寸：750*188px，比例4:1,格式：jpg，用于：首页宣传位',
+        rules: [
+          { required: true, message: '请上传图片' },
+        ],
+      },
+      {
+        label: '是否发布H5',
+        name: 'targetId',
+        render: <SelectH5/>,
+        hidden: () => isHaveActive,
+        value: data.targetId,
+        rules: [
+          { required: false, message: '请选择发布H5' },
+        ],
+      },
+      {
+        label: '标题',
+        name: 'title',
+        type: FieldTypes.Text,
+        hidden: true,
+        value: data.title,
+        rules: [
+          { required: true, message: '请输入标题' },
+        ],
+      },
+      {
+        label: '类型',
+        name: 'contentType',
+        hidden: () => !isHaveActive,
+        type: FieldTypes.Select,
+        dict: [{
+          label: '常规活动',
+          value: 'activity'
+        },
+        {
+          label: '项目',
+          value: 'project'
+        },
+        {
+          label: '资讯',
+          value: 'news'
+        },
+        {
+          label: '拼团',
+          value: 'group'
+        },
+        {
+          label: '助力',
+          value: 'help'
+        }],
+        value: data.contentType,
+        rules: [
+          { required: true, message: '请选择类型' },
+        ],
+      },
+      {
+        label: '发布活动',
+        name: 'targetId',
+        render: <SelectActivity buildingId={() => buildingId} />,
+        hidden: () => !activityVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布活动' },
+        ],
+      },
+      {
+        label: '发布资讯',
+        name: 'targetId',
+        render: <SelectNews buildingId={() => buildingId} />,
+        hidden: () => !newsVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布资讯' },
+        ],
+      },
+      {
+        label: '发布内容',
+        name: 'content',
+        render: <Wangedit />,
+        value: data.content,
+        hidden: () => !contentVisible,
+        rules: [
+          { required: true, message: '请选择发布内容' },
+        ],
+      },
+      {
+        label: '发布助力',
+        name: 'targetId',
+        render: <SelectHelp buildingId={() => buildingId} />,
+        hidden: () => !helpVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布助力' },
+        ],
+      },
+      {
+        label: '发布拼团',
+        name: 'targetId',
+        render: <SelectGroup buildingId={() => buildingId} />,
+        hidden: () => !groupVisible,
+        value: data.targetId,
+        rules: [
+          { required: true, message: '请选择发布拼团' },
+        ],
+      },
+      {
+        label: '状态',
+        name: 'status',
+        type: FieldTypes.Select,
+        dict: [{
+          label: "上架",
+          value: 1
+        },
+        {
+          label: "下架",
+          value: 0
+        },],
+        value: data.status != null ? data.status : 1,
+      },
+    ]
+
+    const handleSubmit = val => {
+      console.log(val,"valvalval")
+      val.showType = 'propaganda'
+      if(!isHaveActive&&val.targetId) {
+          if(!val.contentType){
+            val.contentType='h5'
+          }
+      }
+      if(!isHaveActive&&!val.targetId){
+        val.contentType=''
+      }
+      if(contentId){
+        request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: contentId}, data: val,}).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }else{
+        request({ ...apis.carsuseFigure.addExtendContent, data: val,}).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+
+
+    return (
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} onValuesChange={handleFormValueChange} fields={fields}></XForm>
+    );
+   }
+ }
+
+export default createEditor()

src/pages/carouselFigure/propagandaList.jsx

@@ -0,0 +1,282 @@
+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, showType: 'propaganda' });
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params },}).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+
+  
+// 跳转到编辑商品
+const toEdit = (contentId) => () => {
+    router.push({
+      pathname: '/carouselFigure/propaganda',
+      query: {
+        contentId
+      },
+    });
+  }
+  
+  const columns = [
+    {
+      title: '主图',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center',
+      render: (image) => <img src={image} className={styles.propaganda} />,
+    },
+    {
+      title: '发布城市',
+      dataIndex: 'cityName',
+      key: 'cityName',
+      align: 'center',
+    },
+    {
+      title: '关联项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      render: (buildingName) => <span>{ buildingName === null ? '无' : buildingName }</span>
+    },
+    {
+      title: '关联内容类型',
+      dataIndex: 'contentType',
+      key: 'contentType',
+      align: 'center',
+      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : '无' }</span>
+    },
+    // {
+    //   title: '发布位置',
+    //   dataIndex: 'showPosition',
+    //   key: 'showPosition',
+    //   align: 'center',
+    //   render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : '' }</span>
+    // },
+    {
+      title: '发布时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD')}</span></>
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status)=> <><span>{status == 1 ? '上架' : '下架'}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: (x,row) => (
+        <>
+          <AuthButton name="admin.propaganda.publish" noRight={null}>
+            <span style={{ color: '#1990FF', marginRight: '20px',cursor: 'pointer' }} onClick={changeStatus(row)}>{ row.status === 1 ? '下架' : '上架' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+          </AuthButton>
+          <AuthButton name="admin.propaganda.put" noRight={null}>
+            <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEdit(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
+          </AuthButton>
+          <AuthButton name="admin.propaganda.delete" noRight={null}>
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={deleteCarouse(row.contentId)}>删除<Icon type="vertical-align-top" className={styles.edit} /></span>
+          </AuthButton>
+        </>
+      )
+    },
+  ];
+  
+  const finishDynamic = (row) => {
+      Modal.confirm({
+          title: '结束以后将无法编辑, 是否继续?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+              request({ ...apis.carsuseFigure.finish, data: {dynamicId: row.dynamicId, top: ""},}).then((data) => {
+                  console.log(data)
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+  }
+  
+  //删除
+const deleteCarouse = (contentId) => () =>{
+  Modal.confirm({
+    title: '确认删除此数据?',
+    okText: '确定',
+    cancelText: '取消',
+    onOk() {
+      request({ ...apis.carsuseFigure.deleteExtendContent,urlData:{id: contentId}}).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
+        }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+        })
+    },
+  });
+}
+
+//   停用启用
+  const changeStatus = (row) => () => {
+      console.log(row)
+      if(row.status === 0) {
+        
+        Modal.confirm({
+          title: '确认发布此数据?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+            row.status = 1
+              request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+      }else if(row.status === 1){
+        
+        Modal.confirm({
+          title: '停用后不会再显示在小程序端',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+            row.status = 0
+              request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10, showType: 'propaganda' })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+      }
+
+  }
+  
+  const changePageNum = (pageNumber, props) => {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: pageNumber, pageSize: 10, ...values, showType: 'propaganda' })
+      }
+    });
+  }
+
+  // 提交事件
+const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values, showType: 'propaganda' })
+      }
+    });
+  }
+
+   //重置搜索
+   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('contentType')(
+            <Select style={{ width: '180px' }} placeholder="类型">
+              <Option value="activity">活动</Option>
+              <Option value="project">项目</Option>
+              <Option value="news">资讯</Option>
+              <Option value="help">助力</Option>
+              <Option value="group">拼团</Option>
+              <Option value="h5">H5</Option>
+              <Option value="nothing">无</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        {/* <Form.Item>
+          {getFieldDecorator('showPosition')(
+            <Select style={{ width: '180px' }} placeholder="发布位置">
+              <Option value="mall">商城</Option>
+              <Option value="index">首页</Option>
+            </Select>,
+          )}
+        </Form.Item> */}
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="1">已上架</Option>
+              <Option value="0">已下架</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+        <AuthButton name="admin.advert.search" noRight={null}>
+          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+            搜索
+          </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.propaganda.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEdit()}>新增</Button>
+      </AuthButton>
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="advertisingList"/>
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e,props)} current={data.current}/>
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/channel/channelList.jsx

@@ -161,8 +161,11 @@ const header = props => {
 
   // 分页
   function onChange(pageNumber) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    getList({ pageNum: pageNumber, pageSize: 9 })
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: pageNumber, pageSize: 10, ...values })
+      }
+    });
   }
 
   return (
@@ -179,7 +182,9 @@ const header = props => {
           </Select>
         </div>
         <div >
+        <AuthButton name="admin.channel.search" noRight={null}>
           <Button type="primary" onClick={() => queryList()}>查询</Button>
+          </AuthButton>
           {/* <Button onClick={() => reset() }>重置</Button> */}
         </div>
       </div>

src/pages/customer/independentList/index.jsx → src/pages/channel/independentList/index.jsx

@@ -71,7 +71,11 @@ class ModalTable extends React.Component {
 
   // 分页
   onChange (pageNum) {
-    this.getList({ pageNumber: pageNum, pageSize: 5 })
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNumber: pageNum, pageSize: 5, ...values })
+      }
+    });
   }
 
   render () {
@@ -437,17 +441,21 @@ function body (props) {
           )}
         </Form.Item>
         <Form.Item style={{ position: 'absolute', right: '38px' }} >
-          <Button type="primary" htmlType="submit" >
-            搜索
-          </Button>
+          <AuthButton name="admin.major.search" noRight={null}>
+            <Button type="primary" htmlType="submit" >
+              搜索
+            </Button>
+          </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportIndependen()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
-        导出
-      </Button>
+      <AuthButton name="admin.major.import" noRight={null}>
+        <Button type="primary" onClick={() => exportIndependen()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+          导出
+        </Button>
+      </AuthButton>
       <Table rowKey="independentIndex" dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
       {/* 推荐客户 */}
       <ModalTable visibleData={gVisibleData} />

src/pages/customer/customerlist/components/integralRecord.jsx

@@ -86,6 +86,10 @@ class ModalIntegralRecord extends React.Component {
         return '分享'
       case 'signup-agent':
         return '授权手机号'
+      case 'activity_checkin':
+        return '活动签到'
+      case 'document_verify':
+          return '资料审核'  
       case 'recommend-customer':
         return '推荐客户'
         case 'group':
@@ -113,7 +117,8 @@ class ModalIntegralRecord extends React.Component {
         title: '序号',
         dataIndex: 'index',
         key: 'index',
-        render: (text, record, index) => <span>{(this.state.dataSource.result.total - this.state.dataSource.result.records.length) * 1 + index + 1}</span>,
+        render: (text, record, index) => <span>{index + 1}</span>,
+        // render: (text, record, index) => <span>{(this.state.dataSource.result.total - this.state.dataSource.result.records.length) * 1 + index + 1}</span>,
       },
       {
         title: '积分类型',
@@ -145,7 +150,7 @@ class ModalIntegralRecord extends React.Component {
             // onOk={() => this.handleOk()}
             onCancel={e => this.handleCancel(e)}
           >
-            <Table dataSource={this.state.dataSource.result.records} columns={columns} pagination={{ total: this.state.dataSource.result.total, onChange: e => this.onChange(e) }} />
+            <Table dataSource={this.state.dataSource.result.records} columns={columns} pagination={{pageSize: 5, total: this.state.dataSource.result.total, onChange: e => this.onChange(e) }} />
           </Modal>
       </>
     );

src/pages/customer/customerlist/customerDetail.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Table, Pagination } from 'antd';
+import { Form, Table, Pagination, Button } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from './style.less';
 import apis from '../../../services/apis';
@@ -15,8 +15,8 @@ function header(props) {
    * @returns
    */
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [data, setData] = useState([{ }])
-  const [tableData, setTableDataData] = useState([{ }])
+  const [data, setData] = useState([{}])
+  const [tableData, setTableDataData] = useState([{}])
   const [dataConsultant, setDataonsultant] = useState({})
   const [intentionData, setIntentionData] = useState([])
 
@@ -39,8 +39,8 @@ function header(props) {
         }]),
       )
       arr.push(a)
-   }
-   setIntentionData(arr)
+    }
+    setIntentionData(arr)
   }
 
   // 查询
@@ -59,11 +59,11 @@ function header(props) {
       setIntentionData(res.intentions)
     })
   }
-// 分页
-function onChange(number) {
-  if (id === '' || id === undefined) {
-    return
-  }
+  // 分页
+  function onChange(number) {
+    if (id === '' || id === undefined) {
+      return
+    }
     // eslint-disable-next-line max-len
     request({ ...apis.customer.CustomerRecommendGet, urlData: { id }, params: { pageNumber: number, pageSize: 10 } }).then(res => {
       setData(res)
@@ -78,19 +78,25 @@ function onChange(number) {
       key: 'activity',
       align: 'center',
     },
+    {
+      title: '访问内容',
+      dataIndex: 'activityName',
+      key: 'activityName',
+      align: 'center',
+    },
     {
       title: '访问时间',
       dataIndex: 'visitTime',
       key: 'visitTime',
       align: 'center',
-      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss') }</span>,
+      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss')}</span>,
     },
     {
       title: '停留时间',
       dataIndex: 'visitDuration',
       key: 'visitDuration',
       align: 'center',
-      render: (_, record) => <span>{record.visitDuration === null ? 0 : record.visitDuration }秒</span>,
+      render: (_, record) => <span>{record.visitDuration === null ? 0 : record.visitDuration}秒</span>,
     },
   ]
   // 意向
@@ -99,7 +105,7 @@ function onChange(number) {
       title: <span styles={{ color: '#222', fontSize: '24px' }}>项目名称</span>,
       dataIndex: 'name',
       width: '64%',
-    render: (_, record) => <span>{record.buildingName}</span>,
+      render: (_, record) => <span>{record.buildingName}</span>,
     },
     {
       title: <span styles={{ color: '#222', fontSize: '24px' }}>意向值</span>,
@@ -109,61 +115,64 @@ function onChange(number) {
   ];
   return (
     <>
+      <Button type="danger" style={{ marginBottom: '18px' }} onClick={() => router.go(-1)}>返回</Button>
       <div className={styles.cardBox}>
         <div className={styles.rightBox}>
           <p className={styles.tit}>客户信息</p>
-          <img className={styles.touxiang} src={ data.picture && data.picture } />
-          <div className={styles.right}>
-            <p className={styles.rightItem}>用户名称：{ data.name }</p>
-            <p className={styles.rightItem}>手机号码：{ data.phone }</p>
-            <p className={styles.rightItem}>首次访问时间：{data.visitTime && moment(data.visitTime).format('YYYY-MM-DD')}</p>
-          </div>
-          <div className={styles.Centered}>
-          <p>访问时长：{ data.duration }秒</p>
-          <p>访问次数：{ data.visitTimes }</p>
-          <p className={styles.rightItem}>客户描述：{ data.describe }</p>
-          {/* <p>预约人数：{ data.visiteNum }</p> */}
-          </div>
-          <div className={styles.rightCentered}>
-          <p >需求类型：{ data.demandType }</p>
-          <p >价格区间：{data.priceRange }</p>
-          <p >物业类型：{ data.realtyManageType }</p>
-          {/* <p>预约人数：{ data.visiteNum }</p> */}
-          </div>
-          {/* <p className={styles.rightItem}>预约到访时间：{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p> */}
-          <div className={styles.rightInfo}>
-            <p className={styles.rightItem}>国家：{ dataConsultant && dataConsultant.country }</p>
-            <p className={styles.rightItem}>省份：{ dataConsultant && dataConsultant.provience }</p>
-            <p className={styles.rightItem}>城市：{dataConsultant && dataConsultant.city }</p>
-            <p className={styles.rightItem}>来访渠道：活动分享</p>
-            {/* <p className={styles.rightItem}>详细信息：</p> */}
-            {/* <p className={styles.rightItem}>意向项目：{data.intention }</p> */} 
-            {/* <p className={styles.rightItem}>客户说明：{ data.verifyRemark }</p> */}
+          <div className={styles.flexBox}>
+            <img className={styles.touxiang} src={data.picture && data.picture} />
+            <div className={styles.right}>
+              <p className={styles.rightItem}>用户名称：{data.name}</p>
+              <p className={styles.rightItem}>手机号码：{data.phone}</p>
+              <p className={styles.rightItem}>首次访问时间：{data.visitTime && moment(data.visitTime).format('YYYY-MM-DD')}</p>
+            </div>
+            <div className={styles.Centered}>
+              <p>访问时长：{data.duration}秒</p>
+              <p>访问次数：{data.visitTimes}次</p>
+              <p className={styles.rightItem}>客户描述：{data.describe}</p>
+              {/* <p>预约人数：{ data.visiteNum }</p> */}
+            </div>
+            <div className={styles.rightCentered}>
+              <p >需求类型：{data.demandType}</p>
+              <p >价格区间：{data.priceRange}</p>
+              <p >物业类型：{data.realtyManageType}</p>
+              {/* <p>预约人数：{ data.visiteNum }</p> */}
+            </div>
+            {/* <p className={styles.rightItem}>预约到访时间：{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p> */}
+            <div className={styles.rightInfo}>
+              <p className={styles.rightItem}>国家：{dataConsultant && dataConsultant.country}</p>
+              <p className={styles.rightItem}>省份：{dataConsultant && dataConsultant.provience}</p>
+              <p className={styles.rightItem}>城市：{dataConsultant && dataConsultant.city}</p>
+              <p className={styles.rightItem}>来访渠道：{data.personFrom}</p>
+              {/* <p className={styles.rightItem}>详细信息：</p> */}
+              {/* <p className={styles.rightItem}>意向项目：{data.intention }</p> */}
+              {/* <p className={styles.rightItem}>客户说明：{ data.verifyRemark }</p> */}
+            </div>
           </div>
         </div>
       </div>
       <br></br>
       <div className={styles.cardBox}>
-          <div className={styles.rightBoxCentre}>
+        <div className={styles.rightBoxCentre}>
           <p className={styles.tit}>置业顾问信息</p>
           <div>
-          <img className={styles.touxiangphoto}  src={ data.consultant && data.consultant.photo }/>
-          <p >{data.consultant && data.consultant.userName}</p>
+            <img className={styles.touxiangphoto} src={data.consultant && data.consultant.photo} />
+            <p >{data.consultant && data.consultant.userName}</p>
           </div>
-          <div className={styles.right}>
-          {/* <p className={styles.infoItem}>姓名：{ data.consultant && data.consultant.name }</p>
+          <div className={styles.rightphone}>
+            {/* <p className={styles.infoItem}>姓名：{ data.consultant && data.consultant.name }</p>
           <p className={styles.infoItem}>部门：{ data.consultant && data.consultant.department }</p> */}
-          <p className={styles.infoItem}>号码：{ data.consultant && data.consultant.phone } </p>
-          <p className={styles.infoItem}>岗位：{ data.consultant && data.consultant.position }</p>
+            <p className={styles.infoItem}>号码：{data.consultant && data.consultant.phone} </p>
+            <p className={styles.infoItem}>岗位：{data.consultant && data.consultant.position}</p>
           </div>
           <div className={styles.left}>
-          <p className={styles.infoItem}>公司：{ data.consultant && data.consultant.orgName } </p>
-          <p className={styles.infoItem}>
-            所属项目：
+            <p className={styles.infoItem}>公司：{data.consultant && data.consultant.orgName} </p>
+            <p className={styles.infoItem}>
+              所属项目：
             {
-              data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)
-            }
-          </p>
+                data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)
+              }
+            </p>
           </div>
         </div>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -174,7 +183,7 @@ function onChange(number) {
           </div> */}
           {/* <img className={styles.touxiang} src={ data.picture && data.picture } /> */}
           {/* <div className={styles.infoItem}> */}
-          <Table bordered = { false } columnWidth={10} columns={intention} dataSource={intentionData} pagination={false} scroll={intentionData && intentionData.length >= 3 ? { y: 240 } : false} width={500}/>
+          <Table bordered={false} columnWidth={10} columns={intention} dataSource={intentionData} pagination={false} scroll={intentionData && intentionData.length >= 3 ? { y: 240 } : false} width={500} />
           {/* </div> */}
         </div>
 

src/pages/customer/customerlist/index.jsx

@@ -105,7 +105,11 @@ function body(props) {
   // 分页
   function onChange(pageNum) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    getList({ pageNumber: pageNum, pageSize: 10, customerType })
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNumber: pageNum, pageSize: 10, customerType, ...values })
+      }
+    });
   }
 
   // 私客/公客切换
@@ -217,7 +221,7 @@ function body(props) {
       key: 'picture',
       align: 'center',
       width: '15%',
-      render: (_, record) => <Avatar shape="square" src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
+      render: (_, record) => <Avatar shape="square" style={{color: 'blue',cursor: 'pointer'}} onClick={() => publicCustomerDetail(record)} src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
     },
     {
       title: '姓名',
@@ -226,7 +230,7 @@ function body(props) {
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{customerType === 'private' ? record.name : record.nickname}</span></>,
+      render: (_, record) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={() => publicCustomerDetail(record)} >{customerType === 'private' ? record.name : record.nickname}</span></>,
     },
     {
       title: '电话',
@@ -249,7 +253,7 @@ function body(props) {
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{record.gender === 1 ? '男' : record.gender === 2 ? '女' : '未知'}</span></>,
+      render: (_, record) => <><span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span></>,
     },
     {
       title: '操作',
@@ -260,11 +264,11 @@ function body(props) {
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => (
         <>
-          <AuthButton>
+          <AuthButton name="admin.customer.public.detail" noRight={null}>
             <Button className={customerType === 'private' ? Styles.displayS : Styles.text } type="link" onClick={() => publicCustomerDetail(record)}>查看详情</Button>
           </AuthButton>
           &nbsp;&nbsp;
-          <AuthButton>
+          <AuthButton name="admin.customer.recommend" noRight={null}>
             <Button className={customerType === 'private' ? Styles.displayS : Styles.text } type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
           </AuthButton>
         </>
@@ -279,7 +283,7 @@ function body(props) {
       key: 'picture',
       align: 'center',
       width: '15%',
-      render: (_, record) => <Avatar shape="square" src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
+      render: (_, record) => <Avatar shape="square" style={{color: 'blue',cursor: 'pointer'}} onClick={() => toCustomerDateil(record)} src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
     },
     {
       title: '姓名',
@@ -288,7 +292,7 @@ function body(props) {
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{customerType === 'private' ? record.name : record.nickname}</span></>,
+      render: (_, record) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={() => toCustomerDateil(record)}>{customerType === 'private' ? record.name : record.nickname}</span></>,
     },
     {
       title: '电话',
@@ -354,7 +358,9 @@ function body(props) {
             &nbsp;
           <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showStatus(record)}>变更状态</Button>
+            </AuthButton>
             &nbsp;&nbsp;
+          <AuthButton name="admin.customer.recommend.belong" noRight={null}>
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showGM(record)}>调整归属</Button>
           </AuthButton>
             &nbsp;&nbsp;
@@ -362,7 +368,7 @@ function body(props) {
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => toCustomerDateil(record)}>查看详情</Button>
           </AuthButton>
             &nbsp;&nbsp;
-          <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
+          <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecord(record)}>积分记录</Button>
           </AuthButton>
             &nbsp;
@@ -420,29 +426,43 @@ function body(props) {
           )}
         </Form.Item>}
         <Form.Item>
-            <Button type="primary" htmlType="submit" >
-              查询
-            </Button>
+            <AuthButton name="admin.customer.recommend.search" noRight={null}>
+              <Button type="primary" htmlType="submit" >
+                查询
+              </Button>
+            </AuthButton>
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
-        导出
-      </Button>
+      <AuthButton name="admin.customer.import" noRight={null}>
+        <Button type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+          导出
+        </Button>
+      </AuthButton>
 
       <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.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" /> 
+        <Table 
+        // onRow={record => {
+        //   return {
+        //     onClick: () => toCustomerDateil(record),
+        //   };
+        // }}
+        dataSource={dataSource.records} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
+        <Table 
+        // onRow={record => {
+        //   return {
+        //     onClick: () => publicCustomerDetail(record),
+        //   };
+        // }}
+        dataSource={dataSource.records} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> 
       }
       
       {/* 调整归属 */}

src/pages/customer/customerlist/publicCustomerDetail.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Table, Pagination } from 'antd';
+import { Form, Table, Pagination,Button } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import publicStyle from './publicStyle.less';
 import apis from '../../../services/apis';
@@ -79,6 +79,12 @@ function onChange(number) {
       key: 'activity',
       align: 'center',
     },
+    {
+      title: '访问内容',
+      dataIndex: 'activityName',
+      key: 'activityName',
+      align: 'center',
+    },
     {
       title: '访问时间',
       dataIndex: 'visitTime',
@@ -111,6 +117,7 @@ function onChange(number) {
 
   return (
     <>
+    <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px' }}>返回</Button>
       <div className={publicStyle.cardBox}>
      {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
         <div className={publicStyle.rightBox}>
@@ -123,8 +130,8 @@ function onChange(number) {
           </div>
           <div className={publicStyle.Centered}>
           <p>访问时长：{ data.duration }秒</p>
-          <p>访问次数：{ data.visitTimes }</p>
-          <p className={publicStyle.rightItem}>来访渠道：活动分享</p>
+          <p>访问次数：{ data.visitTimes }次</p>
+          <p className={publicStyle.rightItem}>来访渠道：{data.personFrom}</p>
           {/* <p>预约人数：{ data.visiteNum }</p> */}
           </div>
           {/* <p className={styles.rightItem}>预约到访时间：{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p> */}
@@ -141,7 +148,7 @@ function onChange(number) {
         <div className={publicStyle.leftBoxCentre}>
           <div className={publicStyle.tit}>
                 <span>项目名称</span>
-                <span style={{ marginLeft: '47%' }}>意向值</span>
+                <span style={{ float: 'right' }}>意向值</span>
           </div>
           {/* <img className={styles.touxiang} src={ data.picture && data.picture } /> */}
           <div className={publicStyle.infoItem}>

src/pages/customer/customerlist/publicStyle.less

@@ -136,7 +136,7 @@
     position: relative;
   }
   .tit{
-    font-size:24px;
+    font-size:0.15rem;
     font-weight:600;
     color:#222;
     margin: 10px 0 0 0;
@@ -149,13 +149,13 @@
   }
   .infoItem{
     color:#666;
-    font-size: 19px;
+    font-size: 0.1rem;
     margin: 0 0 10px 0;
     
   }
   .rightItem{
     color:#666;
-    font-size: 19px;
+    font-size: 0.1rem;
     margin: 0 0 15px 0;
   }
   .right{
@@ -177,10 +177,10 @@
   .Centered{
     position: absolute;
     top:108px;
-    left:40%;
+    left:50%;
     margin: 0 0 15px 0;
     color:#666;
-    font-size: 19px;
+    font-size: 0.1rem;
   }
 
   .rightCentered{
@@ -189,7 +189,7 @@
     left:55%;
     margin: 0 0 15px 0;
     color:#666;
-    font-size: 19px;
+    font-size: 0.1rem;
   }
   
 }

src/pages/customer/customerlist/style.less

@@ -136,11 +136,15 @@
     position: relative;
   }
   .tit{
-    font-size:24px;
+    font-size:0.15rem;
     font-weight:600;
     color:#222;
     margin: 10px 0 0 0;
   }
+  .flexBox{
+    display: flex;
+    align-items: end;
+  }
   .touxiang{
     width: 120px;
     width: 120px;
@@ -154,16 +158,26 @@
   }
   .infoItem{
     color:#666;
-    font-size: 19px;
+    font-size: 0.1rem;
     margin: 0 0 30px 0;
     
   }
   .rightItem{
     color:#666;
-    font-size: 19px;
+    font-size: 0.1rem;
     margin: 0 0 15px 0;
   }
   .right{
+    width: 25%;
+    min-width: 1.3rem;
+    margin-left: 0.1rem;
+    padding-top: 0.3rem;
+    // position: absolute;
+    // top:108px;
+    // left:170px;
+  }
+  .rightphone{
+  
     position: absolute;
     top:108px;
     left:170px;
@@ -172,29 +186,40 @@
     position: absolute;
     top:108px;
     left:60%;
+  
   }
   .rightInfo{
-    position: absolute;
-    top:108px;
-    left:80%;
+    width: 25%;
+    min-width: 1.3rem;
+    margin-right: 0.1rem;
+    padding-top: 0.3rem;
+    // position: absolute;
+    // top:108px;
+    // left:80%;
   }
 
   .Centered{
-    position: absolute;
-    top:108px;
-    left:30%;
+    width: 25%;
+    // position: absolute;
+    // top:108px;
+    // left:30%;
+    min-width: 1.3rem;
     margin: 0 0 15px 0;
     color:#666;
-    font-size: 19px;
+    font-size: 0.1rem;
+    padding-top: 0.3rem;
   }
 
   .rightCentered{
-    position: absolute;
-    top:108px;
-    left:55%;
+    // position: absolute;
+    // top:108px;
+    // left:55%;
+    width: 25%;
+    min-width: 1.3rem;
     margin: 0 0 15px 0;
+    padding-top: 0.3rem;
     color:#666;
-    font-size: 19px;
+    font-size: 0.1rem;
   }
   
 }

src/pages/customer/visiting/index.jsx

@@ -101,7 +101,11 @@ function body (props) {
 
   // 分页
   function onChange(pageNum) {
-   
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNumber: pageNum, pageSize: 5, ...values })
+      }
+    });
     // getList({ pageNumber: pageNum, pageSize: 9 })
   }
 
@@ -159,7 +163,7 @@ function body (props) {
         导出
       </Button>
 
-      <Table dataSource={data} columns={columns} pagination={{ total: 1, onChange }} />
+      <Table dataSource={data} columns={columns} pagination={{ total: data.total, onChange }} />
       {/* pagination={{ total: dataSource.total, onChange }} */}
     </>
   );

src/pages/indexEcharts/components/IntentionalCustomers.jsx

@@ -8,6 +8,7 @@ import apis from '../../../services/apis';
 
 const UserBehavior = (props) => {
   const [data, setData] = useState({ records: [] })
+  const [buildingId, setBuildingId] = useState('')
   useEffect(() => {
     IntentionUsers()
     // getUserBehaviorProfile(formatDate(props.startDate, props.endDate))
@@ -78,13 +79,14 @@ const UserBehavior = (props) => {
 
   function handleBuildingChange (e) {
     IntentionUsers({ buildingId: e })
+    setBuildingId(e)
   }
   return (
     <>
       <div>
       <p style={{fontSize:'0.12rem',fontWeight:'600'}}>意向客户</p>
 
-        <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))}></BuildSelect>
+        <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))} value={buildingId}></BuildSelect>
 
         <Table rowKey="IntentionalCustomers" dataSource={data.records} columns={columns} style={{marginTop:'15px'}} pagination={false} scroll={{ y: 500 }} />
 

src/pages/indexEcharts/components/UserBehavior.jsx

@@ -107,6 +107,7 @@ const formatDate = (start, end) => {
 const UserBehavior = props => {
   const [data, setData] = useState({ records: [] })
   const [visibleData, setVisibleData] = useState({ visible: false, row: {} })
+  const [buildingId, setBuildingId] = useState('')
 
   // 柱图
   useEffect(() => {
@@ -190,6 +191,7 @@ const UserBehavior = props => {
       eventType: props.eventType,
       buildingId: e,
     })
+    setBuildingId(e)
   }
 
   function showDetails(row) {
@@ -272,7 +274,7 @@ const UserBehavior = props => {
           {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}
         </p>
         <div style={{ float: 'right', marginTop: '-40px', marginBottom: '20px' }}>
-          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))}></BuildSelect>}
+          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))} value={buildingId}></BuildSelect>}
         </div>
         <EChart options={options} style={style} />
         {props.tableShow &&

src/pages/indexEcharts/newUsers.jsx

@@ -4,7 +4,7 @@ import { Row, Col, Menu, Dropdown } from 'antd';
 import NewUsers from './components/NewUsers'
 // import XForm, { FieldTypes } from '../../components/XForm';
 import moment from 'moment';
-
+import router from 'umi/router';
 import EChart from '../../components/EchartsTest/EChart';
 import request from '../../utils/request';
 import apis from '../../services/apis';
@@ -101,6 +101,7 @@ const header = props => {
       <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={datalist}>
         搜索
           </Button>
+          <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px', marginLeft: '30px' }}>返回</Button>  
       <div>
         <NewUsers BuildSelectHide={true} endDate={endDate} startDate={startDate}  dataZoom={true} ></NewUsers>
         {/* */}

src/pages/indexEcharts/userBehavior.jsx

@@ -8,6 +8,8 @@ import request from '../../utils/request';
 import apis from '../../services/apis';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import { func } from 'prop-types';
+import router from 'umi/router';
+
 
 // const formatDate = (start, end) => {
 //   const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
@@ -182,6 +184,8 @@ const header = props => {
               重置
             </Button>
 
+            <Button type="danger" style={{ marginLeft: '18px', float: 'right' }} onClick={() => router.go(-1)}>返回</Button>
+
           <div style={{ display: 'flex', margin: '24px 0' }}>
             <Form.Item>
               {getFieldDecorator('buildingId')(

src/pages/indexEcharts/userSource.jsx

@@ -7,7 +7,7 @@ import moment from 'moment';
 import EChart from '../../components/EchartsTest/EChart';
 import request from '../../utils/request';
 import apis from '../../services/apis';
-
+import router from 'umi/router';
 
 
 const { RangePicker } = DatePicker;
@@ -159,6 +159,7 @@ class Header extends React.Component {
         <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={() => this.datalist()}>
           查询
         </Button>
+        <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px', marginLeft: '30px' }}>返回</Button>
         <div>
   
           <div style={{ display: 'flex' }}>

src/pages/integralMall/GoodsList.jsx

@@ -38,7 +38,11 @@ function header(props) {
   }
 
   const changePageNum = (pageNumber) => {
-    getList({ pageNum: pageNumber, pageSize: 10 })
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNumber: pageNumber, pageSize: 10, ...values })
+      }
+    });
   }
 
   function handleReset() {
@@ -191,9 +195,11 @@ function header(props) {
           )}
         </Form.Item>
         <Form.Item>
-            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-              搜索
-            </Button>
+            <AuthButton name="admin.taGoods.search" noRight={null}>
+              <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+                搜索
+              </Button>
+            </AuthButton>
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>

src/pages/integralMall/exchangeRecords.jsx

@@ -72,7 +72,11 @@ function record(props) {
   }
 
   const changePageNum = (pageNumber) => {
-    getList({ pageNum: pageNumber, pageSize: 10 })
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: pageNumber, pageSize: 10, ...values })
+      }
+    });
   }
 
   const columns = [
@@ -180,9 +184,11 @@ function record(props) {
           </Form.Item>
           
           <Form.Item style={{position:'absolute',right:'38px'}}>
-            <Button type="primary" htmlType="submit">
-              搜索
-            </Button>
+            <AuthButton name="admin.taGoods.exchange" noRight={null}>
+              <Button type="primary" htmlType="submit">
+                搜索
+              </Button>
+            </AuthButton>
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>

src/pages/integralMall/verifyList.jsx

@@ -25,7 +25,7 @@ const header = (props) => {
   }
 
   const changePageNum = (pageNumber) => {
-    getVerifyList({ pageNum: 1, pageSize: 10, phone: props.location.query.telValue })
+    getVerifyList({ pageNum: pageNumber, pageSize: 10, phone: props.location.query.telValue })
   }
 
   const toBack = () => {
@@ -56,7 +56,7 @@ const header = (props) => {
       dataIndex: 'personType',
       key: 'personType',
       align: 'center',
-      render: (personType)=> <><span>{personType === 'Realty Consultant' ? '置业顾问' : personType === 'Sales Executive' ? '销售主管' : personType === 'estate agent' ? '经纪人' : ''}</span></>
+      render: (personType)=> <><span>{personType === 'Realty Consultant' ? '置业顾问' : personType === 'Sales Executive' ? '销售主管' : personType === 'estate agent' ? '经纪人' : personType === 'customer' ? '客户' : ''}</span></>
     },
     {
       title: '手机号',

src/pages/news/list/NewsList.jsx

@@ -180,7 +180,7 @@ function body(props) {
         cover={<img alt="example" src={data.newsImg} style={{ borderRadius: '12px 0 0 12px', width: '230px', height: '228px' }}></img>}
         bodyStyle={{ padding: '10px 20px' }}
       >
-        <AuthButton name="admin.taNews.id.put" noRight={null}>
+        <AuthButton name="admin.taNews.top" noRight={null}>
         <span style={{ position: 'absolute', right: '83px', top: '16px', fontSize: ' 0.106rem',zIndex:1, color: '#FF7E48', cursor: 'pointer' }} onClick={topNews(data.weight, data.newsId)}>{ data.weight === 1 ? '取消置顶' : '置顶' }</span>
         </AuthButton>
 
@@ -189,6 +189,8 @@ function body(props) {
             编辑
                   <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
           </span>
+          </AuthButton>
+          <AuthButton name="admin.taNews.publish" noRight={null}>
           {data.newsStatus === 0 ?
             <span style={{ position: 'absolute', left: '250px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', zIndex: 1, cursor: 'pointer' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
               取消发布
@@ -224,7 +226,7 @@ function body(props) {
           </p>
 
           <p style={{ fontSize: ' 0.106rem', color: '#555', marginBottom: '8px', display: 'flex', alignItems: 'center' }}>
-            <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>点赞数量：{data.favorNum}</span>
+            {/* <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>点赞数量：{data.favorNum}</span> */}
             <span>收藏数量：{data.saveNum}</span>
           </p>
 
@@ -243,8 +245,11 @@ function body(props) {
 
   // 分页
   function onChange(pageNumber) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    getList({ pageNum: pageNumber, pageSize: 6 })
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: pageNumber, pageSize: 6, ...values })
+      }
+    });
   }
 
   //重置搜索
@@ -293,9 +298,11 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit" >
-            搜索
-          </Button>
+          <AuthButton name="admin.news.search" noRight={null}>
+            <Button type="primary" htmlType="submit" >
+              搜索
+            </Button>
+          </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
             </Button>

src/pages/news/list/editNewsList.jsx

@@ -31,10 +31,12 @@ const { TextArea } = Input;
   const newsId = props.location.query.newsId
   const [ dynamicData, setDynamicData ] = useState({})
   
-  if(newsId){
+  
     useEffect(() => {
-      getDynamicData(newsId);
-    },[])
+      if(newsId){
+        getDynamicData(newsId);
+      }
+    },[newsId])
 
   // 查询列表
   const getDynamicData = (newsId) => {
@@ -45,7 +47,6 @@ const { TextArea } = Input;
       message.info(err.msg || err.message)
     })
     }
-  }
 
   
 
@@ -77,7 +78,7 @@ const { TextArea } = Input;
         name: 'newsImg',
         type: FieldTypes.ImageUploader,
         value: dynamicData.newsImg,
-        help: '建议图片尺寸：320*256px，比例5:4,格式：jpg，用于资讯列表',
+        help: '建议图片尺寸：320*240px，比例5:4,格式：jpg，用于资讯列表',
         rules: [
           {required: true, message: '请选择资讯列表'},
         ]
@@ -124,6 +125,12 @@ const { TextArea } = Input;
         request({ ...apis.news.post, data: { ...submitValue },}).then((data) => {
           // cancelPage();
           message.info("保存成功")
+          router.push({
+            pathname: '/news/list/editNewsList',
+            query: {
+              newsId:data.newsId
+            },
+          });
           console.log(data,'data2')
         }).catch((err) => {
           message.info(err.msg || err.message)
@@ -241,7 +248,7 @@ const { TextArea } = Input;
           </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' }}>海报描述</p>
-            <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+            <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
           </div>
 
         </div>
@@ -299,7 +306,7 @@ const { TextArea } = Input;
         <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="" />
+          <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
         </div>
       </div>
       <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>

src/pages/news/list/style.less

@@ -55,5 +55,65 @@
     white-space: nowrap;
     overflow: hidden;
   }
+
+  .SubmitButton {
+    background: rgba(239,39,58,1);
+    border-radius: 7px;
+    border: 0px;
+  }
+  .SelectFrom {
+    width: 180px;
+    background: #ffffff;
+    border-radius: 7px;
+    border: 1px solid #dbdbdb;
+  }
+  .addButton {
+    background: #50be00;
+    border-radius: 4px;
+    border: 0px;
+    margin: 10px 0px;
+  }
+  .cardText {
+    color: #333;
+    display: flex;
+    align-items: center;
+    position: relative;
+    line-height: 1.5;
+    font-size: 0.106rem;
+    margin-bottom: 0.08rem;
+  
+  }
+  .cardItem{
+    font-size: 0.106rem;
+    font-weight: 400;
+    color: #666;
+    line-height: 24px;
+    display: flex;
+    align-items: center;  
+  }
+  .ediText {
+    font-size:  0.106rem;
+    color: #ff925c;
+    line-height: 24px;
+    position: absolute;
+    right: 0;
+  }
+  .title{
+    display: inline-block;
+    width:  0.54rem;
+    justify-content: space-between;
+    text-align: justify;
+    text-align-last:justify
+  }
+  
+  .address { 
+    width: 400px;
+    height: 24px; 
+    text-overflow: ellipsis; 
+    white-space: nowrap;
+    overflow: hidden;
+  }
+  
+  
   
   

src/pages/news/type/NewsType.jsx

@@ -39,7 +39,11 @@ function header(props) {
   }
 
   const changePageNum = (pageNumber) => {
-    getList({ pageNum: pageNumber, pageSize: 10 })
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: pageNumber, pageSize: 10, ...values })
+      }
+    });
   }
 
 
@@ -84,7 +88,7 @@ function header(props) {
       dataIndex: 'newsTypeImg',
       key: 'newsTypeImg',
       align: 'center',
-      render: (text, record) => <img src={record.newsTypeImg} className={styles.touxiang} />,
+      render: (text, record) => <img src={record.newsTypeImg} style={{ width: '165px',height: '104px' }} className={styles.touxiang} />,
     },
     {
       title: '名称',
@@ -130,9 +134,11 @@ function header(props) {
           )}
         </Form.Item>
         <Form.Item>
-            <Button type="primary" htmlType="submit" >
-              查询
-            </Button>
+            <AuthButton name="admin.taNewsType.search" noRight={null}>
+              <Button type="primary" htmlType="submit" >
+                查询
+              </Button>
+            </AuthButton>
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>

src/pages/customer/recommendCustomer/index.jsx → src/pages/recommend/recommendCustomer/index.jsx

@@ -65,13 +65,16 @@ function body(props) {
 
   // 分页
   function onChange(pageNum) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-      getList({ pageNumber: pageNum, pageSize: 10 })
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNumber: pageNum, pageSize: 10, ...values })
+      }
+    });
   }
 
   function toAudit(cuurentId) {
     router.push({
-      pathname: '/customer/recommendCustomer/audit',
+      pathname: '/recommend/recommendCustomer/audit',
       query: {
         id: cuurentId,
       },
@@ -221,19 +224,23 @@ function body(props) {
             <BuildingSelect />,
           )}
         </Form.Item>
-        <Form.Item style={{ position:'absolute',right:'38px' }}>
-            <Button type="primary" htmlType="submit" >
-              搜索
-            </Button>
+        <Form.Item>
+            <AuthButton name="admin.recommend.search" noRight={null}>
+              <Button type="primary" htmlType="submit" >
+                搜索
+              </Button>
+            </AuthButton>
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>
         </Form.Item>
       </Form>
       {/* style={{float:'right',margin:'20px 0'}} */}
-      <Button type="primary" onClick={() => exportRecommendCustomer()}>
-        导出
-      </Button>
+      <AuthButton name="admin.recommend.import" noRight={null}>
+        <Button type="primary" onClick={() => exportRecommendCustomer()}>
+          导出
+        </Button>
+      </AuthButton>
       <Table rowKey="recommendCustomer" dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
     </>
   );

src/pages/record/drainage/DrainageVisitRecordList.jsx

@@ -0,0 +1,187 @@
+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) => {
+    console.log(params);
+    request({ ...apis.activity.taDrainageVisitRecord, params: { ...params } }).then((data) => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+
+  const columns = [
+    {
+      title: '活动名称',
+      dataIndex: 'activityName',
+      key: 'activityName',
+      align: 'center',
+      render: (text, record) => <span>{record.activityName != null ? record.activityName : 
+        record.drainageName != null ? record.drainageName : record.buildingName != null ? record.buildingName:record.newsName != null ? record.newsName : record.helpActivityName !=null ? record.helpActivityName :
+        record.groupActivityName!=null ? record.groupActivityName:''}</span>,
+    },
+    {
+      title: '用户名',
+      dataIndex: 'userName',
+      key: 'userName',
+      align: 'center',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'userTel',
+      key: 'userTel',
+      align: 'center',
+    },
+    {
+      title: '访问时间',
+      dataIndex: 'visitTime',
+      key: 'visitTime',
+      align: 'center',
+      render: (x, row) => <><span>{`${moment(row.visitTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    },
+    {
+      title: '分享者',
+      dataIndex: 'shareName',
+      key: 'shareName',
+      align: 'center',
+    },
+    {
+      title: '分享者手机号',
+      dataIndex: 'shareTel',
+      key: 'shareTel',
+      align: 'center',
+    },
+    {
+      title: '分享者类型',
+      dataIndex: 'personType',
+      key: 'personType',
+      align: 'center',
+      render: (text, record) => <span>{record.shareName ? record.consultantId === null || record.consultantId === '' ? '普通客户' : '置业顾问' : ''}</span>,
+    },
+  ];
+  
+
+  const changePageNum = (pageNumber, props) => {
+    getList({ pageNumber: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+
+  // 提交事件
+  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();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('eventType')(
+            <Select placeholder="分享类型" style={{ width: 150 }}>
+            <Option value="activity">报名活动</Option>
+            <Option value="help">助力活动</Option>
+            <Option value="group">拼团活动</Option>
+            <Option value="h5">H5活动</Option>
+            <Option value="building">项目</Option>
+            <Option value="news">资讯</Option>
+          </Select>
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('activityName')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="分享标题"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('shareName')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="分享者名称"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('personType')(
+             <Select placeholder="分享者类型" style={{ width: 150 }}>
+             <Option value="Realty Consultant">置业顾问</Option>
+             <Option value="customer">普通客户</Option>
+           </Select>
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('shareTel')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="分享者手机"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+        <AuthButton name="admin.visit.record.search" noRight={null}>
+          <Button type="primary" htmlType="submit" className={styles.searchBtn}> 
+            搜索
+          </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <Table style={{marginTop:'30px'}} 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={e => changePageNum(e,props)} current={data.current} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/customer/report/index.jsx → src/pages/record/report/index.jsx

@@ -67,7 +67,11 @@ function body(props) {
   // 分页
   function onChange(pageNum) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    getList({ pageNumber: pageNum, pageSize: 9 })
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNumber: pageNum, pageSize: 10, ...values })
+      }
+    });
   }
 
   /**
@@ -174,7 +178,7 @@ function body(props) {
               {getFieldDecorator('sex')(
                 <Select style={{ width: '180px' }} placeholder="性别" onChange={handleSelectChange}>
                   <Option value="1">男</Option>
-                  <Option value="0">女</Option>
+                  <Option value="2">女</Option>
                 </Select>,
               )}
             </Form.Item>
@@ -186,9 +190,11 @@ function body(props) {
           </Col>
           <div style={{minWidth:'150px',position: 'absolute', right: '-12px', }}>
             <Form.Item >
+            <AuthButton name="admin.report.search" noRight={null}>
               <Button type="primary" htmlType="submit">
                 搜索
             </Button>
+            </AuthButton>
               <Button style={{ marginLeft: 8 }} onClick={handleReset}>
                 重置
             </Button>
@@ -198,9 +204,11 @@ function body(props) {
         <div >
         </div>
       </Form>
+      <AuthButton name="admin.report.import" noRight={null}>
       <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
         导出
       </Button>
+      </AuthButton>
       <Table rowKey="report" style={{ marginTop: '40px' }} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
     </>
   );