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

config/routes.js

@@ -128,6 +128,12 @@ export default [
                 name: '到访记录',
                 component: './customer/visiting/index',
               },
+              {
+                path: '/customer/customerlist/publicCustomerDetail',
+                name: '私客详情',
+                hideInMenu: true,
+                component: './customer/customerlist/publicCustomerDetail',
+              },
             ],
           },
           {

src/pages/activity/groupActivity/editGroupActivity.jsx

@@ -147,6 +147,17 @@ const Edit = props => {
         ],
         help: '建议宽度:335px,高度不限',
       },
+      {
+        label: '权重',
+        name: 'heavy',
+        type: FieldTypes.Number,
+        render: <Input type="number" style={{ width: 80}}/>,
+        value: dynamicData.heavy,
+        rules: [
+          { required: true, message: '请输入权重' },
+        ],
+        help: '数字越大越靠前',
+      },
     ]
 
     const handleSubmit = val => {

src/pages/activity/groupActivity/list.jsx

@@ -106,12 +106,12 @@ const header = props => {
               <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
             </AuthButton>
           }
-          {row.activityStatus === 0 &&
+          {
             <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>
           }
-          {row.activityStatus === 0 &&
+          {
             <AuthButton name="admin.taShareActivity.list.get" 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>
               <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
@@ -122,27 +122,6 @@ const header = props => {
               <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditActivity(row.groupActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
             </AuthButton>
           }
-          {row.activityStatus === 1 &&
-            <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 === 1 &&
-            <AuthButton name="admin.taShareActivity.weight.put" 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>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
-            </AuthButton>
-          }
-
-          {row.activityStatus === 2 &&
-            <AuthButton><span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span></AuthButton>
-          }
-          {row.activityStatus === 2 &&
-            <AuthButton name="admin.taShareActivity.weight.put" 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>
-              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
-            </AuthButton>
-          }
         </>
       ),
     },

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -22,6 +22,8 @@ const { TextArea } = Input;
 
 const header = props => {
   const [isEnlist, setIsEnlist] = useState(1)
+  const [activityStatus, setActivityStatus] = useState(1)  
+  const [disable, setDisable] = useState(false)
 
   const radioOnChange = e => {
     // console.log(e.target.value)
@@ -42,6 +44,8 @@ const header = props => {
           data.activityTime = [moment(data.startDate), moment(data.endDate)]
           const num = data.helpNum > 0 ? 1 : 0
           setIsEnlist(num)
+          setActivityStatus(data.activityStatus)
+          setDisable(data.activityStatus === 0 ? true : false)
           data.isEnlist = num
           props.form.setFieldsValue(data)
           setDynamicData(data)
@@ -140,7 +144,7 @@ const header = props => {
               message: '请选择所属项目',
             },
           ],
-        })(<BuildSelect />)}
+        })(<BuildSelect disabled={disable} />)}
         </Form.Item>
 
         <Form.Item label="活动标题">
@@ -165,6 +169,17 @@ const header = props => {
         })(<ImageUploader />)}
         </Form.Item>
 
+        <Form.Item label="活动列表图" help="建议尺寸375*312px">
+          {getFieldDecorator('detailImg', {
+          rules: [
+            {
+              required: true,
+              message: '活动主图不能为空',
+            },
+          ],
+        })(<ImageUploader />)}
+        </Form.Item>
+
         <Form.Item label="活动时间">
         {getFieldDecorator('activityTime', {
           rules: [
@@ -173,7 +188,7 @@ const header = props => {
               message: '请选择活动时间',
             },
           ],
-        })(<RangePicker format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+        })(<RangePicker format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }} disabled={activityStatus===0 ? true : false}/>)}
         </Form.Item>
 
         <Form.Item label="助力邀请人数" min={1} max={10}>
@@ -184,7 +199,7 @@ const header = props => {
               message: '请输入活动人数',
             },
           ],
-        })(<Input type="number" />)}
+        })(<Input type="number" disabled={activityStatus===0 ? true : false}/>)}
         </Form.Item>
 
         <Form.Item label="助力次数">
@@ -196,7 +211,7 @@ const header = props => {
             },
           ],
         })(
-          <Radio.Group onChange={(e) => radioOnChange(e)}>
+          <Radio.Group disabled={activityStatus===0 ? true : false} onChange={(e) => radioOnChange(e)}>
             <Radio value={0}>不限制</Radio>
             <Radio value={1}>限制</Radio>
           </Radio.Group>,
@@ -211,7 +226,7 @@ const header = props => {
                  message: '请输入助力人数',
                },
              ],
-           })(<Input type="number" placeholder="助力人数限制"/>)}
+           })(<Input type="number" placeholder="助力人数限制" disabled={activityStatus===0 ? true : false}/>)}
            </Form.Item>
          }
 
@@ -225,6 +240,16 @@ const header = props => {
           ],
         })(<ImageUploader />)}
         </Form.Item>
+        <Form.Item label="权重">
+        {getFieldDecorator('heavy', {
+          rules: [
+            {
+              required: true,
+              message: '请输入权重',
+            },
+          ],
+        })(<Input type="number" disabled={activityStatus===0 ? true : false} style={{ width: 80}}/>)}<span style={{ marginLeft: 30, color:'grey'}}>数字越大越靠前</span>
+        </Form.Item>
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
           <Button type="primary" htmlType="submit">
             确认

src/pages/activity/helpActivity/list.jsx

@@ -91,40 +91,30 @@ const toEditGoods = (helpActivityId) => () => {
       align: 'center',
       render: (x, row) => (
         <>
-          {row.activityStatus === 0 &&
+          {(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}>
+              <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}>
+            <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}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" style={{color:'#bebebe'}} className={styles.edit} /></span>
-            <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>
+            <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>
             <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> }
 
-          {row.activityStatus === 1 &&
+          {(row.activityStatus === 1 || row.activityStatus === 0) &&
           <AuthButton name="admin.helpActivity.update.put" noRight={null}>
             <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" style={{color:'#bebebe'}} className={styles.edit} /></span>
           </AuthButton>
           }
-          {row.activityStatus === 1 &&
-           <AuthButton name="admin.top.update.post" 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>
-            <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>
-          }
-
-          {row.activityStatus === 2 &&
-          <AuthButton name="admin.helpRecord.get" noRight={null}>
-            <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>
-          }
-           {row.activityStatus === 2 &&
-        <AuthButton name="admin.top.update.post" 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>
-            <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>
-          }
         </>
       ),
     },
@@ -168,13 +158,13 @@ const toEditGoods = (helpActivityId) => () => {
       })
   }
   
-  // const sendOrPublicDynamic = (row) => {
-  //     if (row.status === 1) {
-  //         cancelDynamic(row)
-  //     } else {
-  //         sendDynamic(row)
-  //     }
-  // }
+  const sendOrPublicDynamic = (row) => {
+      if (row.status === 1) {
+          cancelDynamic(row)
+      } else {
+          sendDynamic(row)
+      }
+  }
   
   // 取消活动
   const cancelDynamic = (row) => {

src/pages/channel/channelList.jsx

@@ -72,12 +72,6 @@ const columns = [
     key: 'recommendCount',
     align: 'center',
   },
-  {
-    title: '邀请经纪人',
-    dataIndex: 'inviteCount',
-    key: 'inviteCount',
-    align: 'center',
-  },
   {
     title: '操作',
     dataIndex: '',

src/pages/customer/customerlist/customerDetail.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Table } from 'antd';
+import { Form, Table, Pagination } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from './style.less';
 import apis from '../../../services/apis';
@@ -17,6 +17,7 @@ function header(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState([{ visitRecords: [] }])
   const [dataConsultant, setDataonsultant] = useState({})
+  const [intentionData, setIntentionData] = useState([])
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
@@ -35,7 +36,10 @@ function header(props) {
       setDataonsultant(res.geoInfo)
     })
   }
-
+// 分页
+  const changePageNum = pageNumber => {
+    // getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
   const columns = [
     {
       title: '访问事件',
@@ -58,55 +62,104 @@ function header(props) {
       render: (_, record) => <span>{record.visitDuration === null ? 0 : record.visitDuration }秒</span>,
     },
   ]
+  // 意向
+  const intention = [
+    {
+      title: 'Name',
+      dataIndex: 'name',
+      width: 150,
+      render: (_, record) => <span>香颂半岛</span>,
+    },
+    {
+      title: 'Address',
+      dataIndex: 'address',
+      render: (_, record) => <span style={{ marginLeft: '55%' }}>22</span>,
+    },
+  ];
+
+for (let i = 0; i < 100; i++) {
+  intentionData.push({
+    key: i,
+    name: `Edward King ${i}`,
+    age: 32,
+    address: `London, Park Lane no. ${i}`,
+  });
+}
   return (
     <>
       <div className={styles.cardBox}>
      {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
-        <div className={styles.leftBox}>
-          <p className={styles.tit}>置业顾问信息</p>
-          <img className={styles.touxiang} src={ data.consultant && data.consultant.picture } />
-          <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.post }</p>
-          <p className={styles.infoItem}>号码：{ data.consultant && data.consultant.phone } </p>
-          <p className={styles.infoItem}>公司：{ data.consultant && data.consultant.company } </p>
-          <p className={styles.infoItem}>
-            所属项目：
-            {
-              data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)
-            }
-          </p>
-        </div>
         <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}>来访渠道：活动分享</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.duration }秒</p>
-          <p className={styles.rightItem}>访问次数：{ data.visitTimes }</p>
-          <p className={styles.rightItem}>预约人数：{ data.visiteNum }</p>
-          <p className={styles.rightItem}>首次访问时间：{data.visitTime && moment(data.visitTime).format('YYYY-MM-DD')}</p>
-          <p className={styles.rightItem}>预约到访时间：{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p>
+          {/* <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}>意向项目：{data.intention }</p>
-            <p className={styles.rightItem}>价格区间：{data.priceRange }</p>
-            <p className={styles.rightItem}>客户说明：{ data.verifyRemark }</p>
-            <p className={styles.rightItem}>客户描述：{ data.describe }</p>
-            <p className={styles.rightItem}>需求类型：{ data.demandType }</p>
-            <p className={styles.rightItem}>物业类型：{ data.realtyManageType }</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>
         </div>
+        
+      </div>
+      <br></br>
+      <div className={styles.cardBox}>
+        <div className={styles.rightBoxCentre}>
+        <p className={styles.tit}>置业顾问信息</p>
+          <img className={styles.touxiang} src={ data.picture && data.picture } />
+          <p className={styles.infoItem}>曹玉文</p>
+          <div className={styles.right}>
+          {/* <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.post }</p>
+          </div>
+          <div className={styles.left}>
+          <p className={styles.infoItem}>公司：{ data.consultant && data.consultant.company } </p>
+          <p className={styles.infoItem}>
+            所属项目：
+            {
+              data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)
+            }
+          </p>
+          </div>
+        </div>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+        <div className={styles.leftBoxCentre}>
+          <div className={styles.tit}>
+                <span>项目名称</span>
+                <span style={{ marginLeft: '47%' }}>项目名称</span>
+          </div>
+          {/* <img className={styles.touxiang} src={ data.picture && data.picture } /> */}
+          <div className={styles.infoItem}>
+          <Table columnWidth={10} showHeader={false} columns={intention} dataSource={intentionData} pagination={{ pageSize: 50 }} scroll={{ y: 240 }}/>,
+          </div>
+        </div>
+
       </div>
       <div className={styles.recordBox}>
         <p className={styles.tableName}>访问记录</p>
-        <Table dataSource={data.visitRecords} columns={columns} pagination={false} rowKey="customerDetail" />
+        <Table showQuickJumper defaultCurrent={1} dataSource={data.visitRecords} columns={columns} current={50} />
       </div>
 
     </>

src/pages/customer/customerlist/index.jsx

@@ -8,6 +8,7 @@ import router from 'umi/router';
 
 import Attribution from './components/attribution'
 import IntegralRecord from './components/integralRecord'
+import ModalRecommendRecord from './components/recommend'
 import ChangeStatus from './components/changeStatus'
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import AuthButton from '@/components/AuthButton';
@@ -50,6 +51,9 @@ function body(props) {
   const [statusVisibleData, setStatusVisibleData] = useState({ visible: false, customerId: '', status: '' })
   // 变更状态 ============= end
 
+  // 推荐客户
+  const [recommendVisibleData, setRecommendVisibleData] = useState({ visible: false, customerId: '' })
+
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getList({ pageNumber: 1, pageSize: 10, customerType })
@@ -76,6 +80,7 @@ function body(props) {
     setRecordVisibleData({ visible: false, customerId: '' })
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
     setStatusVisibleData({ visible: false, customerId: '', status: '' })
+    setRecommendVisibleData({ visible: false, customerId: '' })
   }
 
   // 提交事件
@@ -126,19 +131,30 @@ function body(props) {
     setGVisibleData({ visible: true, customerId: record.customerId, realtyConsultant: record.realtyConsultant, buildingId: record.buildingId })
     setRecordVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
+    setRecommendVisibleData({ visible: false, customerId: '' })
   }
 
   function showRecord(record) {
     setRecordVisibleData({ visible: true, customerId: record.customerId })
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
+    setRecommendVisibleData({ visible: false, customerId: '' })
   }
 
   function showStatus(record) {
     setRecordVisibleData({ visible: false, customerId: '' })
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+    setRecommendVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: true, customerId: record.customerId, status: record.status })
   }
+
+  // 推荐客户
+  function showRecommend(personId) {
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+    setStatusVisibleData({ visible: false, customerId: '', status: '' })
+    setRecommendVisibleData({ visible: true, customerId: personId })
+  }
   function toCustomerDateil(record) {
     router.push({
       pathname: '/customer/customerlist/customerDetail',
@@ -147,6 +163,15 @@ function body(props) {
       },
     });
   }
+  // 私客详情
+  function publicCustomerDetail(record) {
+    router.push({
+      pathname: '/customer/customerlist/publicCustomerDetail',
+      query: {
+        id: record.customerId,
+      },
+    });
+  }
 
   function exportCustomer () {
     const fieldsValue = getFieldsValue()
@@ -173,9 +198,18 @@ function body(props) {
 
   // 关闭调整归属的窗口
   function closeAttribution() {
+    alert(1)
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     getList({ pageNum: 1, pageSize: 10, customerType, ...props.form.getFieldsValue() })
   }
+  // 回调关闭所有弹框
+  function closeAll() {
+    alert(1)
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+    setStatusVisibleData({ visible: false, customerId: '', status: '' })
+    setRecommendVisibleData({ visible: false, customerId: '' })
+  }
 
   const publicColumns = [
     {
@@ -209,6 +243,34 @@ function body(props) {
       align: 'center',
       width: '15%',
     },
+    {
+      title: '性别',
+      dataIndex: 'sex',
+      key: 'sex',
+      align: 'center',
+      width: '10%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'customerId',
+      key: 'customerId',
+      align: 'center',
+      width: '25%',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => (
+        <>
+          <AuthButton>
+            <Button className={customerType === 'private' ? Styles.displayS : Styles.text } type="link" onClick={() => publicCustomerDetail(record)}>查看详情</Button>
+          </AuthButton>
+          &nbsp;&nbsp;
+          <AuthButton>
+            <Button className={customerType === 'private' ? Styles.displayS : Styles.text } type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
+          </AuthButton>
+        </>
+      ),
+    },
   ]
 
   const privateColumns = [
@@ -290,12 +352,13 @@ function body(props) {
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => (
         <>
+            &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>
             &nbsp;&nbsp;
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showGM(record)}>调整归属</Button>
           </AuthButton>
-            <br />
+            &nbsp;&nbsp;
           <AuthButton name="admin.customer.recommend.get" noRight={null}>
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => toCustomerDateil(record)}>查看详情</Button>
           </AuthButton>
@@ -303,6 +366,10 @@ function body(props) {
           <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecord(record)}>积分记录</Button>
           </AuthButton>
+            &nbsp;
+          <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
+            <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecommend(record.customerId)}>推荐客户</Button>
+          </AuthButton>
         </>
       ),
     },
@@ -383,10 +450,13 @@ function body(props) {
       <Attribution visibleData={gVisibleData} onCancel={() => closeAttribution()}/>
 
       {/* 积分记录 */}
-      <IntegralRecord visibleData={recordVisibleData} />
+      <IntegralRecord visibleData={recordVisibleData} onCancel={() => closeAll()} />
 
       {/* 变更状态 */}
-      <ChangeStatus visibleData={statusVisibleData} />
+      <ChangeStatus visibleData={statusVisibleData} onCancel={() => closeAll()}/>
+
+      {/* 推荐客户 */}
+      <ModalRecommendRecord visibleData={recommendVisibleData} onCancel={() => closeAll()}/>
     </>
   );
 }

src/pages/customer/customerlist/style.less

@@ -77,9 +77,21 @@
 .cardBox{
   display: flex;
   .leftBox{
-    width:342px;
+    width:1000px;
     min-width:342px;
-    height:511px;
+    height:1000px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    margin-right: 30px;
+    padding: 30px;
+    overflow: hidden;
+  }
+  .rightBox{
+    width:865px;
+    min-width:342px;
+    height:290px;
     background:rgba(255,255,255,1);
     box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
     border-radius:8px;
@@ -90,8 +102,31 @@
   }
   .rightBox{
     width:-webkit-fill-available;
-    height:511px;
-    min-width: 800px;
+    height:315px;
+    min-width: 100%;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    padding: 30px;
+    overflow: hidden;
+    position: relative;
+  }
+  .rightBoxCentre{
+    width:865px;
+    height:315px;
+    min-width: 60%;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    padding: 30px;
+    overflow: hidden;
+    position: relative;
+  }
+  .leftBoxCentre{
+    width:100%;
+    height:315px;
     background:rgba(255,255,255,1);
     box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
     border-radius:8px;
@@ -128,10 +163,33 @@
     top:108px;
     left:170px;
   }
+  .left{
+    position: absolute;
+    top:108px;
+    left:60%;
+  }
   .rightInfo{
     position: absolute;
-    top:50px;
-    left:50%;
+    top:108px;
+    left:80%;
+  }
+
+  .Centered{
+    position: absolute;
+    top:108px;
+    left:30%;
+    margin: 0 0 15px 0;
+    color:#666;
+    font-size: 19px;
+  }
+
+  .rightCentered{
+    position: absolute;
+    top:108px;
+    left:55%;
+    margin: 0 0 15px 0;
+    color:#666;
+    font-size: 19px;
   }
   
 }

src/pages/news/list/editNewsList.jsx

@@ -64,7 +64,7 @@ const { TextArea } = Input;
         ]
       },
       {
-        label: '资讯图片',
+        label: '资讯列表图',
         name: 'newsImg',
         type: FieldTypes.ImageUploader,
         value: dynamicData.newsImg,

src/services/apis.js

@@ -288,6 +288,11 @@ export default {
       url: `${prefix}/customer/recommend/export`,
       action: 'admin.customer.recommend.export.get',
     },
+    recommendClient: {
+      method: 'GET',
+      url: `${prefix}/customer/recommend/:id`,
+      action: 'admin.customer.recommend.get',
+    },
   },
   indexEcharts: {
     list:{
@@ -772,6 +777,16 @@ export default {
     method: 'post',
     action: 'admin.top.update.post',
   },
+  cancel: {
+    method: 'PUT',
+    url: `${prefix}/helpActivity/cancel/:id`,
+    action: 'admin.helpActivity.update.put',
+  },
+  send: {
+    url: `${prefix}/helpActivity/send/:id`,
+    method: 'PUT',
+    action: 'admin.helpActivity.update.put',
+  },
   record: {
     url: `${prefix}/helpRecord`,
     method: 'get',