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

config/routes.js

@@ -296,7 +296,7 @@ export default [
               },
               {
                 path: '/activity/helpActivity/signList',
-                name: '报名列表',
+                name: '助力记录',
                 hideInMenu: true,
                 component: './activity/helpActivity/signList',
               },

package.json

@@ -64,7 +64,7 @@
     "react-dom": "^16.8.6",
     "react-zmage": "^0.8.5",
     "redux": "^4.0.1",
-    "umi": "^2.8.7",
+    "umi": "^2.13.3",
     "umi-plugin-pro-block": "^1.3.2",
     "umi-plugin-react": "^1.9.5",
     "umi-request": "^1.0.8",

src/components/GlobalHeader/AvatarDropdown.jsx

@@ -79,7 +79,7 @@ class AvatarDropdown extends React.Component {
       <>
         <HeaderDropdown overlay={menuHeaderDropdown}>
             <span className={`${styles.action} ${styles.account}`}>
-              <Avatar size="small" className={styles.avatar} src={currentUser.avatar} alt="avatar" />
+              <Avatar size="small" className={styles.avatar} src={currentUser.avatar === null ? currentUser.photo:currentUser.avatar} alt="avatar" />
               <span className={styles.name}>{currentUser.userName}</span>
             </span>
         </HeaderDropdown>

src/components/SelectButton/WxDictSelect.jsx

@@ -0,0 +1,45 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { Select } from 'antd';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const WxDictSelect = props => {
+  const [data, setData] = useState([])
+  const [value, setValue] = useState([])
+  useEffect(() => {
+    getWxDictList();
+  }, [props.value])
+
+
+  const getWxDictList = e => {
+    request({ ...apis.wxDict.list, params: { pageNumber: 1, pageSize: 999 } }).then(data => {
+        setData(data.records)
+        // 默认选中第一个
+    })
+  }
+
+  return (
+      <Select
+      showSearch
+      value={props.value}
+      style={{ width: '250px' }}
+      placeholder="请选择用户来源"
+      onChange={props.onChange}
+      filterOption={(input, option) =>
+        option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }>
+          {data.map(wxDict => (
+            <Option key={wxDict.sceneType} value={wxDict.sceneType}>{wxDict.sceneAlias}</Option>
+          ))}
+      </Select>
+  )
+}
+export default WxDictSelect

src/pages/activity/SignList.jsx

@@ -121,7 +121,7 @@ const handleSubmit = (e, props) => {
         const link = document.createElement('a')
         link.style.display = 'none'
         link.href = url
-        link.setAttribute('download', '助力者记录.xlsx')
+        link.setAttribute('download', '报名列表.xlsx')
         document.body.append(link)
         link.click()
       }).catch(() => {

src/pages/activity/drainage/DrainageList.jsx

@@ -73,6 +73,23 @@ const header = (props) => {
     });
   }
 
+  const newQrcode = row => {
+    const x = new XMLHttpRequest();
+    const resourceUrl = row.qrCode
+    console.log(resourceUrl);
+    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 = 'H5二维码.png';
+      a.click();
+    }
+    x.send();
+  }
+
   const exchangeDrainage = drainage => () => {
     if(drainage.status === 1){
       if(drainage.isMiniapp){
@@ -206,6 +223,12 @@ const header = (props) => {
               数据
             </span>
           </AuthButton>
+          <AuthButton name="admin.taDrainage.id.delete" noRight={null}>
+            <span>{datas.isMiniapp === false ? "" : <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', marginLeft: 20 }} onClick={newQrcode.bind(this, datas)}>
+              下载二维码
+            </span>}</span>
+            
+          </AuthButton >
         </>
       ),
     },

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

@@ -45,6 +45,7 @@ function AddBuilding(props) {
 
   const [poi, setPoi] = useState([])
   const [videoImage, setVideoImage] = useState(false)
+  const [priceTypeList, setPriceTypeList] = useState([])
 
   // 存放所以 buildingData 基础信息
   const [buildingData, setBuildingData] = useState({})
@@ -83,9 +84,11 @@ function AddBuilding(props) {
    // 获取详情信息
    function getById(currentId) {
     request({ ...apis.building.buildingGetById, urlData: { id: currentId } }).then(res => {
-      if (res.openingDate !== null) {
-        res.openingDate = moment(res.openingDate)
-      }
+      // if (res.openingDate !== null) {
+      //   res.openingDate = moment(res.openingDate)
+      // }
+      //构造下拉框
+      setPriceTypeList(res.buildingProjectType)
       if (res.receivedDate !== null) {
         res.receivedDate = moment(res.receivedDate)
       }
@@ -161,7 +164,7 @@ function AddBuilding(props) {
       data.mapJson = poi
     }
 
-    data.openingDate = moment(data.openingDate, 'yyyy-MM-dd HH:mm:ss')
+    // data.openingDate = moment(data.openingDate, 'yyyy-MM-dd HH:mm:ss')
     data.receivedDate = moment(data.receivedDate, 'yyyy-MM-dd HH:mm:ss')
     // 项目主图
     data.img = data.avatarImage && data.avatarImage.map((item, index) => ({ imgType: 'banner', url: item, orderNo: index + 1 }))
@@ -304,6 +307,12 @@ function AddBuilding(props) {
     return newPoi
   }
 
+  //组装项目类型
+  function getBuildingProjectTypeList(e) {
+    console.log(e,"项目类型------")
+    setPriceTypeList(e)
+  }
+
   function setFormMapScopeTagValue(keyType, item) {
     const tag = item.data.map(t => ({ tagName: t.name, delete: true, automatic: true }))
     switch (keyType) {
@@ -357,13 +366,19 @@ function AddBuilding(props) {
           <Form.Item label="项目类型">
             {getFieldDecorator('buildingProjectType', {
               rules: [{ required: true, message: '请选择项目类型' }],
-            })(<BudildingProjectType />)}
+            })(<BudildingProjectType onChange={e => getBuildingProjectTypeList(e)}/>)}
           </Form.Item>
-          <Form.Item label="均价" >
-            {getFieldDecorator('price')(<Input type="number" style={{ width: '210px' }}/>)}元/m²
+          <Form.Item label="列表展示均价" >
+            {/* {getFieldDecorator('price')(<Input type="number" style={{ width: '210px' }}/>)}元/m² */}
+            {getFieldDecorator('buildingTypeId')(
+              <Select placeholder="请选择项目类型的价格">
+                    {
+                      priceTypeList.map((item, _) => <Option value={item.buildingTypeId}>{item.buildingTypeName}</Option>)
+                    }
+              </Select>)}
           </Form.Item>
           <Form.Item label="开盘时间" >
-            {getFieldDecorator('openingDate')(<DatePicker format="YYYY/MM/DD" />)}
+            {getFieldDecorator('openingDate')(<Input placeholder="预计xxxx年xx月开盘" maxLength = "15"/>)}
           </Form.Item>
           <Form.Item label="电话" >
             {getFieldDecorator('tel', {
@@ -549,6 +564,15 @@ function AddBuilding(props) {
           <Form.Item label="装修标准" >
             {getFieldDecorator('decoration')(<Input />)}
           </Form.Item>
+          <Form.Item label="开发商" >
+            {getFieldDecorator('propertyDeveloper')(<Input placeholder="不超过15个字" maxLength = "15"/>)}
+          </Form.Item>
+          <Form.Item label="备案名" >
+            {getFieldDecorator('recordName')(<Input placeholder="不超过15个字" maxLength = "15"/>)}
+          </Form.Item>
+          <Form.Item label="楼栋总数" >
+            {getFieldDecorator('buildingNum')(<Input min={0} type="number" style={{ width: 80}}/>)}
+          </Form.Item>
           {/* <Form.Item label="交房时间" >
             {getFieldDecorator('receivedDate')(<DatePicker />)}
           </Form.Item> */}

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

@@ -123,7 +123,7 @@ function ModalEdi(props) {
             })(<Input />)}
           </Form.Item>
           {
-            !props.noImage && <Form.Item label="选择图片">
+            !props.noImage && <Form.Item label="选择图片" help="建议图片尺寸256px*252px，比例4:3,格式：jpg">
             {getFieldDecorator('img', {
               rules: [
                 {

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

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { Button, Radio, Icon, Form, Input, Row, Col, Modal, notification, Checkbox, InputNumber } from 'antd';
+import { Button, Radio, Icon, Form, Input, Row, Col, Modal, notification, Checkbox, Select, InputNumber } from 'antd';
 import { render } from 'react-dom';
 import request from '../../../../../utils/request';
 import apis from '../../../../../services/apis';
@@ -28,11 +28,11 @@ class TypeForm extends React.Component {
   }
 
   onChange(e, name) {
-    // console.log(e.target.value)
+    // console.log(e)
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
         // console.log('Received values of form: ', values);
-        const currentValue = e.target.value
+        const currentValue = name === 'marketStatus' ? e : e.target.value
         if (currentValue === '') {
           values[name] = null
         } else {
@@ -54,7 +54,7 @@ class TypeForm extends React.Component {
     const { getFieldDecorator } = this.props.form;
 
     // this.props.form.setFieldsValue(this.props.type)
-    console.log(this.props.type)
+    // console.log(this.props.type,"33333333")
     return (
       <>
         <Col span={11} style={{
@@ -66,16 +66,34 @@ class TypeForm extends React.Component {
 
           <p style={{ padding: '20px', borderBottom: '1px solid #eee' }}>{this.props.type.buildingTypeName || ''}  <Button type="link" style={{ position: 'absolute', right: '16px' }} icon="close" onClick={() => this.close()} /></p>
 
-          <Form {...formItemLayout} style={{ padding: '10px 0px 10px 10px' }}>
+          <Form {...formItemLayout} style={{ padding: '5px 0px 5px 5px' }}>
             <Form.Item label="类型编号" style={{ display: 'none' }}>
               {getFieldDecorator('buildingTypeId')(<Input disabled />)}
             </Form.Item>
             <Form.Item label="状态" style={{ display: 'none' }}>
               {getFieldDecorator('status')(<Input disabled />)}
             </Form.Item>
-            <Form.Item label="价格">
-              {getFieldDecorator('price')(<Input type="number" placeholder="元/㎡" onChange={e => this.onChange(e, 'price')} />)}
+            <Form.Item label="价格类型">
+                {getFieldDecorator('priceType')(
+                  <Radio.Group onChange={e => this.onChange(e, 'priceType')} >
+                    <Radio value="average">均价</Radio>
+                    <Radio value="total">总价</Radio>
+                  </Radio.Group>
+                )}
+              </Form.Item>
+            <Form.Item label="价格区间" help='最高价与最低价一致时，只展示一个'>
+              {getFieldDecorator('startPrice')(<Input placeholder="最低价" style={{width: '60px'}} maxLength="9" onChange={e => this.onChange(e, 'startPrice')} />)} --
+              {getFieldDecorator('endPrice')(<Input placeholder="最高价" style={{width: '60px'}} maxLength="9" onChange={e => this.onChange(e, 'endPrice')} />)}{this.props.type.priceType === "average" ? "元/㎡" : "万元/套"}
             </Form.Item>
+            <Form.Item label="销售状态" >
+            {getFieldDecorator('marketStatus')(
+              <Select placeholder="销售状态" onChange={e => this.onChange(e, 'marketStatus')} >
+                <Option value="待售">待售</Option>
+                <Option value="在售">在售</Option>
+                <Option value="售罄">售罄</Option>
+              </Select>,
+            )}
+          </Form.Item>
             <Form.Item label="装修标准">
               {getFieldDecorator('decoration')(<Input onChange={e => this.onChange(e, 'decoration')} />)}
             </Form.Item>
@@ -136,7 +154,7 @@ class ProjectTypeBody extends React.Component {
     const { projectType } = this.state
     const buildingType = projectType.filter(item => checked.includes(`${item.buildingTypeId}`))
 
-    const tempDate = buildingType.map(item => ({ buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName, price: null, decoration: null, rightsYear: null, status: '1' }))
+    const tempDate = buildingType.map(item => ({ buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName, startPrice: null,endPrice: null,priceType: "average", decoration: null, rightsYear: null, status: '1' }))
     const updateProjectDate = this.updateProjectType(tempDate)
     console.log('updateProjectDate: ', updateProjectDate)
     this.setState({ data: updateProjectDate })

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

@@ -25,6 +25,29 @@ const saleType = [
   },
 ]
 
+const houseType = [
+  {
+    id: 1,
+    name: '1室',
+  },
+  {
+    id: 2,
+    name: '2室',
+  },
+  {
+    id: 3,
+    name: '3室',
+  },
+  {
+    id: 4,
+    name: '4室',
+  },
+  {
+    id: 5,
+    name: '5室及以上',
+  },
+]
+
 /**
  *图片设置
  *
@@ -115,6 +138,12 @@ function imageSet(props) {
       key: 'marketStatus',
       render: (_, record) => <span>{ (saleType.filter(x => x.id == record.marketStatus)[0] || {}).name }</span>,
     },
+    {
+      title: '户型',
+      dataIndex: 'houseType',
+      key: 'houseType',
+      render: (_, record) => <span>{ (houseType.filter(x => x.id == record.houseType)[0] || {}).name }</span>,
+    },
     {
       title: '面积',
       dataIndex: 'buildingArea',

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

@@ -42,6 +42,29 @@ const saleType = [
   },
 ]
 
+const houseType = [
+  {
+    id: '1',
+    name: '1室',
+  },
+  {
+    id: '2',
+    name: '2室',
+  },
+  {
+    id: '3',
+    name: '3室',
+  },
+  {
+    id: '4',
+    name: '4室',
+  },
+  {
+    id: '5',
+    name: '5室及以上',
+  },
+]
+
 /**
  * 图片信息
  *
@@ -186,7 +209,7 @@ class ModalImage extends React.Component {
                   </Select>,
                 )}
               </Form.Item>
-              <Form.Item label="图片">
+              <Form.Item label="图片" help="建议图片尺寸336px*336px，比例1:1,格式：jpg">
               {getFieldDecorator('img', {
                   rules: [{ required: true, message: '请上传户型图片' }],
               })(
@@ -194,26 +217,22 @@ class ModalImage extends React.Component {
                 <ImageUpload />,
               )}
               </Form.Item>
+              <Form.Item label="户型">
+                {getFieldDecorator('houseType', {
+                  rules: [{ required: true, message: '请选择户型' }],
+                })(
+                  <Select placeholder="户型">
+                    {
+                      houseType.map((item, _) => <Option value={item.id}>{item.name}</Option>)
+                    }
+                  </Select>,
+                )}
+              </Form.Item>
               <Form.Item label="面积" help="单位 ㎡">
-                {getFieldDecorator('buildingArea', {
-                  rules: [{ message: '请填写面积' },
-                          {
-                            pattern: new RegExp('^[1-9][0-9]*(\.[0-9]{1,2})?$'),
-                            message: '只允许输入数字',
-                          },
-                  ],
-                })(<Input type="number" />)}
+                {getFieldDecorator('buildingArea')(<Input type="number" precision = '2' min='0.00' step='0.01'/>)}
               </Form.Item>
               <Form.Item label="套内面积" help="单位 ㎡">
-                {getFieldDecorator('insideArea', {
-                  rules: [
-                    // { required: true, message: '请填写套内面积' },
-                          {
-                            pattern: new RegExp('^[1-9][0-9]*(\.[0-9]{1,2})?$'),
-                            message: '只允许输入数字',
-                          },
-                  ],
-                })(<Input type="number" />)}
+                {getFieldDecorator('insideArea')(<Input type="number" precision = '2' min='0.00' step='0.01'/>)}
               </Form.Item>
               <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
                 <Button type="primary" htmlType="submit">保存</Button>

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

@@ -0,0 +1,250 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions, notification } from 'antd';
+import moment from 'moment';
+import request from '../../../../../utils/request';
+import apis from '../../../../../services/apis';
+import Styles from '../style.less';
+import ImageUpload from '../../../../../components/XForm/ImageUpload'
+import ImageListUpload from '../../../../../components/XForm/ImageListUpload'
+import Wangedit from '../../../../../components/Wangedit/Wangedit'
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+const { TextArea } = Input;
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 2 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+
+const saleType = [
+  {
+    id: 1,
+    name: '待售',
+  },
+  {
+    id: 2,
+    name: '售罄',
+  },
+  {
+    id: 3,
+    name: '在售',
+  },
+]
+
+const houseType = [
+  {
+    id: '1',
+    name: '1室',
+  },
+  {
+    id: '2',
+    name: '2室',
+  },
+  {
+    id: '3',
+    name: '3室',
+  },
+  {
+    id: '4',
+    name: '4室',
+  },
+  {
+    id: '5',
+    name: '5室及以上',
+  },
+]
+  
+/**
+ * 图片信息
+ *
+ * @param {*} props
+ * @returns
+ */
+class ModalPanoramaImage extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+       visibleData: { visible: false, apartmentId: '', buildingId: '',panoramaType: "apartment" },
+    }
+  }
+
+  // 挂载之后
+  // componentDidMount() {
+  //
+  // }
+
+  componentDidUpdate(preProps, preState) {
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      console.log(this.props.visibleData)
+      this.getById()
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } })
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    // this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } })
+    this.props.onSuccess()
+  }
+
+  getById(params) {
+    const { apartmentId } = this.props.visibleData
+    if (apartmentId === '' || apartmentId === undefined) {
+      return
+    }
+
+    // 网路请求
+    request({ ...apis.building.buildingApartmentGetById, urlData: { id: apartmentId }, params: { ...params } }).then(res => {
+      // res.img = res.buildingImgList.map(item => item.url)
+      if (res.buildingImgList) {
+        res.img = res.buildingImgList[0].url
+      }
+      
+      this.props.form.setFieldsValue(res)
+    }).catch(err => {
+     this.openNotificationWithIcon('error', err)
+    })
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+  // 提交
+  handleSubmit(e) {
+    e.preventDefault();
+    this.props.form.validateFields((err, values) => {
+      if (!err) {
+        this.submitData(values)
+      }
+    });
+  }
+
+  submitData(data) {
+    data.buildingId = this.props.visibleData.buildingId;
+    const api = apis.paorama.add;
+
+    // 网路请求
+    request({ ...api, data: { ...data } }).then(() => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('success', '操作成功')
+
+      // 传递父组件事件
+      // onSuccess() 是自定义
+      this.props.onSuccess()
+
+      // this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } }, () => console.log('回调：', this.state.visibleData))
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('error', err)
+    })
+  }
+
+  radioOnChange(e) {
+    this.setState({ visibleData: { ...this.state.visibleData, panoramaType: e.target.value } })
+  }
+
+  /**
+   * 取消按钮
+   *
+   * @memberof ModalImage
+   */
+  closeModal() {
+    this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } })
+  }
+
+  render() {
+    const { getFieldDecorator } = this.props.form;
+    return (
+      <>
+        <Modal
+            title="新增全景图"
+            width={1100}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            onOk={() => this.handleOk()}
+            onCancel={e => this.handleCancel(e)}
+          >
+            <Form {...formItemLayout} onSubmit={e => this.handleSubmit(e)}>
+              <Form.Item label="全景类型">
+                {getFieldDecorator('panoramaType', {
+                  rules: [
+                    {
+                      required: true,
+                      message: '请选择全景类型',
+                    },
+                  ],
+                })(
+                  <Radio.Group onChange={(e) => this.radioOnChange(e)}>
+                    <Radio value="apartment">户型</Radio>
+                    <Radio value="building">项目</Radio>
+                  </Radio.Group>,
+                )}
+              </Form.Item>
+              { this.state.visibleData.panoramaType == "apartment" && <Form.Item label="全景内容">
+                {getFieldDecorator('apartmentId', {
+                  rules: [{ required: true, message: '请选择全景内容' }],
+                })(
+                  <Select placeholder="户型">
+                    {
+                      (this.state.visibleData.panoramaList || []).map((item, _) => <Option value={item.apartmentId}>{item.apartmentName}</Option>)
+                    }
+                  </Select>,
+                )}
+              </Form.Item>}
+              { this.state.visibleData.panoramaType == "building" && <Form.Item label="全景内容">
+                {getFieldDecorator('content', {
+                  rules: [{ required: true, message: '请输入全景内容' }],
+                })(
+                  <Input />,
+                )}
+              </Form.Item>}
+              <Form.Item label="选择封面" help="建议图片尺寸750px*600px，比例5:4,格式：jpg">
+              {getFieldDecorator('coverImg', {
+                  rules: [{ required: true, message: '请上传封面图片' }],
+              })(
+                // <ImageListUpload />,
+                <ImageUpload />,
+              )}
+              </Form.Item>
+              <Form.Item label="链接地址">
+                {getFieldDecorator('panoramaLink', {
+                  rules: [{ required: true, message: '请输入链接地址' }],
+                })(<Input />)}
+              </Form.Item>
+              <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
+                <Button type="primary" htmlType="submit">保存</Button>
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <Button onClick={() => this.handleCancel()}>取消</Button>
+              </Form.Item>
+            </Form>
+        </Modal>
+      </>
+    );
+  }
+}
+
+const WrappedModalPanoramaImageForm = Form.create({ name: 'modalPanoramaImage' })(ModalPanoramaImage);
+
+export default WrappedModalPanoramaImageForm

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

@@ -0,0 +1,182 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, Table, notification, Modal } from 'antd';
+import moment from 'moment';
+import request from '../../../../../utils/request';
+import apis from '../../../../../services/apis';
+import Styles from '../style.less';
+import { router } from 'umi';
+import ModalPanoramaImage from './modalPanoramaImage';
+
+const { confirm } = Modal;
+
+
+const saleType = [
+  {
+    id: 1,
+    name: '待售',
+  },
+  {
+    id: 2,
+    name: '售罄',
+  },
+  {
+    id: 3,
+    name: '在售',
+  },
+]
+
+const houseType = [
+  {
+    id: 1,
+    name: '1室',
+  },
+  {
+    id: 2,
+    name: '2室',
+  },
+  {
+    id: 3,
+    name: '3室',
+  },
+  {
+    id: 4,
+    name: '4室',
+  },
+  {
+    id: 5,
+    name: '5室及以上',
+  },
+]
+
+/**
+ *图片设置
+ *
+ * @param {*} props
+ * @returns
+ */
+function panoramaImage(props) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState([])
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [visibleData, setVisibleData] = useState({ visible: false, apartmentId: '', buildingId: '' })
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList()
+  }, [])
+
+  function openNotificationWithIcon(type, message) {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.paorama.list, urlData: { id: props.building.buildingId }, params: { ...params, apartmentType: 'apart' } }).then(res => {
+      setData(res)
+    }).catch(err => {
+      openNotificationWithIcon('error', err.message)
+    })
+  }
+
+  /**
+   *回调事件
+   *
+   */
+  function onModalChange() {
+    getList()
+    setVisibleData({ visible: false, apartmentId: '', buildingId: '' })
+  }
+
+  /**
+   *打开编辑页
+   *
+   * @param {*} record
+   */
+  function showEdi(record) {
+    // 网路请求
+    request({ ...apis.paorama.panoramaApartList, params: { buildingId:  props.building.buildingId } }).then(res => {
+      setVisibleData({ visible: true, apartmentId: record === undefined ? '' : record.apartmentId, buildingId: props.building.buildingId, panoramaType: "apartment", panoramaList: res })
+     }).catch(err => {
+      this.openNotificationWithIcon('error', err)
+     })
+  }
+
+  /**
+   * 删除
+   *
+   * @param {*} record
+   */
+  function deleteApartment(record) {
+    confirm({
+      title: '确认删除当前数据?',
+      content: '确定后成功删除，点击取消则放弃当前操作',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        // 网路请求
+        request({ ...apis.paorama.delete, urlData: { id: record.panoramaId } }).then(res => {
+          getList()
+          openNotificationWithIcon('success', '操作成功')
+        }).catch(err => {
+          // openNotificationWithIcon('error', err.message)
+        })
+      },
+      onCancel() {},
+    });
+  }
+
+
+  const columns = [
+    {
+      title: '封面图',
+      dataIndex: 'coverImg',
+      key: 'coverImg',
+      render: (x, record) =>  <img style={{ width: '150px', height: '120px' }} src={x} alt="" />,
+    },
+    {
+      title: '类型',
+      dataIndex: 'panoramaType',
+      key: 'panoramaType',
+      render: (x, record) => <span>{x === "apartment" ? "户型" : "项目"}</span>,
+    },
+    {
+      title: '内容',
+      dataIndex: 'content',
+      key: 'content',
+    },
+    {
+      title: '链接地址',
+      dataIndex: 'panoramaLink',
+      key: 'panoramaLink',
+    },
+    {
+      title: '操作',
+      dataIndex: 'apartmentId',
+      key: 'apartmentId',
+      render: (_, record) => (
+        <>
+          <Button type="link" style={{ color: 'red' }} onClick={() => deleteApartment(record)}>删除</Button>
+        </>
+      ),
+    },
+  ]
+
+  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" />
+
+      {/* 编辑页 */}
+      {/*  onSuccess是子组件传递事件信息  */}
+      <ModalPanoramaImage visibleData={visibleData} key="ModalImage" onSuccess={() => onModalChange()}/>
+    </>
+  )
+}
+
+export default panoramaImage

src/pages/building/list/add/index.jsx

@@ -12,6 +12,7 @@ import Wangedit from '../../../../components/Wangedit/Wangedit'
 import TagGroup from './components/tags'
 import Base from './components/base'
 import Apartment from './components/imageSet'
+import PanoramaImage from './components/panoramaImage'
 import Poster from './components/poster'
 import Share from './components/share'
 import BuildingImage from './components/buildingImage';
@@ -64,6 +65,7 @@ function AddBuilding(props) {
         <Radio.Button value="base">基本信息</Radio.Button>
         <Radio.Button value="apartment">户型库</Radio.Button>
         <Radio.Button value="image">项目相册</Radio.Button>
+        <Radio.Button value="panorama">全景图片</Radio.Button>
         <Radio.Button value="poster">海报图片</Radio.Button>
         <Radio.Button value="share">分享设置</Radio.Button>
       </Radio.Group>
@@ -71,6 +73,7 @@ function AddBuilding(props) {
         { tab === 'base' && <Base building={{ buildingId: buildingData.buildingId || (props.location.query && props.location.query.id) }} onSuccess={e => buildingOnSuccess(e)}/> }
         { (tab === 'apartment' && <Apartment building={buildingData} />)}
         { (tab === 'image' && <BuildingImage building={buildingData} />)}
+        { (tab === 'panorama' && <PanoramaImage building={buildingData} />)}
         { (tab === 'poster' && <Poster building={buildingData} />)}
         { (tab === 'share' && <Share building={buildingData} />)}
       </div>

src/pages/building/list/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, notification, Modal } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, message, Col, Pagination, Alert, notification, Modal } from 'antd';
 import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
@@ -59,7 +59,8 @@ function CartBody(props) {
           openNotificationWithIcon('success', '操作成功')
           props.onSuccess()
         }).catch(err => {
-          openNotificationWithIcon('error', err.message)
+          // openNotificationWithIcon('error', err.message)
+          message.info(err.msg || err.message)
         })
 
         modal.destroy();
@@ -174,7 +175,7 @@ function body(props) {
   const { getFieldDecorator } = props.form
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [dataSource, setDataSource] = useState({ records: [] })
+  const [dataSource, setDataSource] = useState({ records: [],size: 0 })
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {

src/pages/carouselFigure/editCarousel.jsx

@@ -164,7 +164,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
           name: 'image',
           type: FieldTypes.ImageUploader,
           value: data.image,
-          help: () => (locationType ? '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于积分商城banner轮播' : '建议图片尺寸：750*464px，比例1.:0.618,格式：jpg，用于：首页顶部banner轮播'),
+          help: () => (locationType ? '建议图片尺寸：750*250px，比例3:1,格式：jpg，用于积分商城banner轮播' : '建议图片尺寸：750*464px，比例1.:0.618,格式：jpg，用于：首页顶部banner轮播'),
           rules: [
             { required: true, message: '请上传轮播图' },
           ],

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

@@ -0,0 +1,158 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions, notification } from 'antd';
+import moment from 'moment';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import Styles from '../style.less';
+import BuildSelect from '../../../../components/SelectButton/BuildSelect'
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+/**
+ * 分配置业顾问
+ *
+ * @param {*} props
+ * @returns
+ */
+class ModalAttribution extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+       dataSource: { records: [] },
+       visibleData: { visible: false, customerId: '', buildingName: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+    // this.getList({ pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate(preProps, preState) {
+    console.log(this.props.visibleData)
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      this.getList({ pageNumber: 1, pageSize: 5, customerId: this.props.visibleData.customerId })
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.props.onCancel()
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    this.props.onCancel()
+  }
+
+  changBuilding(buildingId){
+    this.getUserList({ pageNumber: 1, pageSize: 5, buildingId: buildingId })
+    this.setState({ visibleData: { visible: this.props.visibleData.visible, customerId: this.props.visibleData.customerId, buildingName: buildingId } });
+  }
+
+  getUserList(params){
+    console.log('params: ', params)
+    if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
+      return
+    }
+    // 网路请求
+    request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      
+    })
+  }
+
+  getList(params) {
+    // 网路请求
+    request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      
+    })
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+   // 分页
+  onChange(pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.props.visibleData.buildingId })
+  }
+
+  // 提交
+  submitGm(record) {
+    // 网路请求
+    request({ ...apis.customer.consultantAssist, urlData: { id: this.state.visibleData.customerId }, data: { userId: record.userId } }).then(res => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('success', '操作成功')
+      this.handleCancel()
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('error', err)
+    })
+  }
+
+  render() {
+    const columns = [
+      // {
+      //   title: '编号',
+      //   dataIndex: 'userId',
+      //   key: 'userId',
+      // },
+      {
+        title: '姓名',
+        dataIndex: 'userName',
+        key: 'userName',
+      },
+      {
+        title: '电话',
+        dataIndex: 'phone',
+        key: 'phone',
+      },
+      {
+        title: '部门',
+        dataIndex: 'department',
+        key: 'department',
+      },
+      {
+        title: '岗位',
+        dataIndex: 'position',
+        key: 'position',
+      },
+      {
+        title: '操作',
+        dataIndex: 'personId',
+        key: 'personId',
+        // eslint-disable-next-line no-nested-ternary
+        render: (_, record) => <>{ <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>, },
+    ]
+    return (
+      <>
+        <Modal
+            title="分配置业顾问"
+            width={800}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            onCancel={(e) => this.handleCancel(e)}
+          >
+            <BuildSelect onChange={this.changBuilding.bind(this)} value={this.state.visibleData.buildingName} />
+            <Table rowKey="assistConsultant" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          </Modal>
+      </>
+    );
+  }
+}
+
+export default ModalAttribution

src/pages/customer/customerlist/customerDetail.jsx

@@ -5,6 +5,7 @@ import styles from './style.less';
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import moment from 'moment';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
 
 import router from 'umi/router';
 
@@ -19,6 +20,7 @@ function header(props) {
   const [tableData, setTableDataData] = useState([{}])
   const [dataConsultant, setDataonsultant] = useState({})
   const [intentionData, setIntentionData] = useState([])
+  const [buildingIdValue, setBuildingIdData] = useState()
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
@@ -71,6 +73,12 @@ function header(props) {
       setDataonsultant(res.geoInfo)
     })
   }
+
+  function changBuilding(buildingId) {
+    setBuildingIdData(buildingId)
+    getById({ pageNumber: 1, pageSize: 10, buildingId: buildingId })
+  }
+
   const columns = [
     {
       title: '访问事件',
@@ -190,7 +198,8 @@ function header(props) {
       </div>
       <div className={styles.recordBox}>
         <p className={styles.tableName}>访问记录</p>
-        <Table dataSource={tableData.records} columns={columns} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
+        <BuildSelect onChange={changBuilding} value={buildingIdValue} />
+        <Table dataSource={tableData.records} columns={columns} style={{marginTop: '15px'}} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
         {/* <Pagination showQuickJumper defaultCurrent={1} total={data.records} onChange={e => changePageNum(e)} current={data.visitRecords.total}/> */}
       </div>
 

src/pages/customer/customerlist/index.jsx

@@ -7,11 +7,13 @@ import Styles from './style.less';
 import router from 'umi/router';
 
 import Attribution from './components/attribution'
+import AssistConsultant from './components/assistConsultant'
 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';
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
 
 
 const { Option } = Select;
@@ -54,6 +56,8 @@ function body(props) {
   // 推荐客户
   const [recommendVisibleData, setRecommendVisibleData] = useState({ visible: false, customerId: '' })
 
+  const [assistVisibleData, setAssistVisibleData] = useState({visible: false, customerId: ''})
+
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getList({ pageNumber: 1, pageSize: 10, customerType })
@@ -159,6 +163,16 @@ function body(props) {
     setStatusVisibleData({ visible: false, customerId: '', status: '' })
     setRecommendVisibleData({ visible: true, customerId: personId })
   }
+
+  //分配置业顾问
+  function assistConsultant(personId) {
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setStatusVisibleData({ visible: false, customerId: '' })
+    setRecommendVisibleData({ visible: false, customerId: '' })
+    setAssistVisibleData({ visible: true, customerId: personId })
+  }
+
   function toCustomerDateil(record) {
     router.push({
       pathname: '/customer/customerlist/customerDetail',
@@ -211,6 +225,7 @@ function body(props) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '', status: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
+    setAssistVisibleData({ visible: false, customerId: ''})
     getList({ pageNum: 1, pageSize: 10, customerType, ...props.form.getFieldsValue() })
   }
 
@@ -271,6 +286,9 @@ function body(props) {
           <AuthButton name="admin.customer.recommend" noRight={null}>
             <Button className={customerType === 'private' ? Styles.displayS : Styles.text } type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
           </AuthButton>
+          <AuthButton name="admin.customer.assign" noRight={null}>
+            <Button className={customerType === 'private' ? Styles.displayS : Styles.text } type="link" onClick={() => assistConsultant(record.personId)}>分配置业顾问</Button>
+          </AuthButton>
         </>
       ),
     },
@@ -425,6 +443,11 @@ function body(props) {
             <Input placeholder="置业顾问电话" />,
           )}
         </Form.Item>}
+        <Form.Item>
+          {getFieldDecorator('sceneType')(
+            <WxDictSelect />,
+          )}
+        </Form.Item>
         <Form.Item>
             <AuthButton name="admin.customer.recommend.search" noRight={null}>
               <Button type="primary" htmlType="submit" >
@@ -476,6 +499,9 @@ function body(props) {
 
       {/* 推荐客户 */}
       <ModalRecommendRecord visibleData={recommendVisibleData} onCancel={() => closeAll()}/>
+
+      {/* 分配置业顾问 */}
+      <AssistConsultant visibleData={assistVisibleData} onCancel={() => closeAll()}/>
     </>
   );
 }

src/pages/customer/customerlist/publicCustomerDetail.jsx

@@ -5,6 +5,7 @@ import publicStyle from './publicStyle.less';
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import moment from 'moment';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
 
 import router from 'umi/router';
 
@@ -19,6 +20,7 @@ function header(props) {
   const [tableData, setTableDataData] = useState([{ }])
   const [dataConsultant, setDataonsultant] = useState({})
   const [intentionData, setIntentionData] = useState([])
+  const [buildingIdValue, setBuildingIdData] = useState()
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
@@ -72,6 +74,12 @@ function onChange(number) {
       setDataonsultant(res.geoInfo)
     })
   }
+
+  function changBuilding(buildingId) {
+    setBuildingIdData(buildingId)
+    getById({ pageNumber: 1, pageSize: 10, buildingId: buildingId })
+  }
+
   const columns = [
     {
       title: '访问事件',
@@ -158,7 +166,8 @@ function onChange(number) {
       </div>
       <div className={publicStyle.recordBox}>
         <p className={publicStyle.tableName}>访问记录</p>
-        <Table dataSource={tableData.records} columns={columns} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
+        <BuildSelect onChange={changBuilding} value={buildingIdValue} />
+        <Table dataSource={tableData.records} columns={columns} style={{marginTop: '15px'}} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
       </div>
     </>
   )

src/pages/customer/drift/index.jsx

@@ -1,11 +1,13 @@
 import React, { useState, useEffect } from 'react';
-import { Table, Avatar, Alert } from 'antd';
+import { Form, Table, Avatar, Alert, Select, Button } from 'antd';
 
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less'
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
 
-function costomerDrift() {
+function costomerDrift(props) {
+  const { getFieldDecorator } = props.form
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [dataSources, setDataSources] = useState({ records: [] })
 
@@ -37,6 +39,24 @@ function costomerDrift() {
     getList({ pageNumber: pageNum, pageSize: 10 })
   }
 
+  //重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNumber: '1', pageSize: '10' })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        const { startDate } = values
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
   const columns = [
     {
       title: '头像',
@@ -56,12 +76,40 @@ function costomerDrift() {
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => <><span>{ record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知' }</span></>,
     },
+    {
+      title: '用户来源',
+      dataIndex: 'sceneAlias',
+      key: 'sceneAlias',
+      render: (_, record) => <><span>{ record.sceneAlias ? record.sceneAlias : '其他'}</span></>,
+    },
   ];
-
+  
   return (
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('sceneType')(
+            <WxDictSelect />,
+          )}
+        </Form.Item>
+
+        <Form.Item>
+            {/* <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>
+      <Table dataSource={dataSources.records} rowKey="drift" columns={columns} pagination={{ total: dataSources.total, onChange }} />
+    </>
     // eslint-disable-next-line max-len
-    <Table dataSource={dataSources.records} rowKey="drift" columns={columns} pagination={{ total: dataSources.total, onChange }} />
+    
   )
 }
 
-export default costomerDrift
+const WrappedBody = Form.create()(costomerDrift);
+export default WrappedBody

src/pages/indexEcharts/components/IntentionalCustomers.jsx

@@ -10,19 +10,26 @@ const UserBehavior = (props) => {
   const [data, setData] = useState({ records: [] })
   const [buildingId, setBuildingId] = useState('')
   useEffect(() => {
-    IntentionUsers()
+    IntentionUsers({ pageNum: 1, pageSize: 5 })
     // getUserBehaviorProfile(formatDate(props.startDate, props.endDate))
 
   }, [])
   function IntentionUsers (params) {
     request({
       ...apis.indexEcharts.intentionUsers,
-      params: { pageSize: 9999, ...params }
+      params: { ...params }
     }).then((data) => {
+      console.log(data,"datadata")
       setData(data)
     })
   }
 
+  // 分页
+  function onChange(pageNum) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    IntentionUsers({ pageNum: pageNum, pageSize: 5, buildingId })
+  }
+
   // getIntentionUsers({ commit }, payload) {
   //   return new Promise((resolve, reject) => {
   //     request({
@@ -78,7 +85,7 @@ const UserBehavior = (props) => {
   ];
 
   function handleBuildingChange (e) {
-    IntentionUsers({ buildingId: e })
+    IntentionUsers({  pageNum: 1, pageSize: 5, buildingId: e })
     setBuildingId(e)
   }
   return (
@@ -88,7 +95,7 @@ const UserBehavior = (props) => {
 
         <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 }} />
+        <Table rowKey="IntentionalCustomers" dataSource={data.records} columns={columns} style={{marginTop:'15px'}} pagination={{ total: data.total, defaultPageSize: 5, onChange: e => onChange(e) }} scroll={{ y: 500 }} />
 
       </div>
 

src/pages/indexEcharts/components/UserBehaviorIndex.jsx

@@ -0,0 +1,289 @@
+import React, { Component, useState, useEffect } from 'react';
+import EChart from '../../../components/EchartsTest/EChart';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import 'echarts/lib/component/dataZoom'
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message, Modal } from 'antd';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+
+const { Option } = Select;
+
+
+const eventcolumns = [
+  {
+    title: '编号',
+    dataIndex: 'recordId',
+    key: 'recordId',
+    align: 'center',
+    width: '16%',
+  },
+  {
+    title: '访问时间',
+    dataIndex: 'visitTime',
+    key: 'visitTime',
+    align: 'center',
+    width: '18%',
+    render: (x, row) => (
+      <>
+        <span>{ moment(row.visitTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+      </>
+    ),
+  },
+  {
+    title: '离开时间',
+    dataIndex: 'leaveTime',
+    key: 'leaveTime',
+    align: 'center',
+    width: '18%',
+    render: (x, row) => (
+      <>
+        <span>{ row.leaveTime && moment(row.leaveTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+      </>
+    ),
+  },
+]
+
+
+class EventcoModal extends React.Component {
+  constructor(props) {
+    super(props)
+    this.state = {
+      eventList: [],
+      visibleData: { visible: false, row: {} },
+    }
+  }
+
+  componentDidUpdate(prevProps) {
+    if (this.props.visibleData.visible !== prevProps.visibleData.visible) {
+      // eslint-disable-next-line react/no-did-update-set-state
+      this.setState({ visibleData: this.props.visibleData }, () => {
+        this.showDetails(this.props.visibleData.row)
+      })
+    }
+  }
+
+  showDetails = row => {
+    request({
+      ...apis.indexEcharts.userBehavior.profile,
+      params: { event: row.event, personId: row.personId },
+    }).then(data => {
+        this.setState({ eventList: data })
+    })
+  }
+
+  handleOk = e => {
+    this.props.onSuccess()
+  };
+
+  handleCancel = e => {
+    this.props.onSuccess()
+  };
+
+  render() {
+    return (
+      <>
+        <Modal
+          title="访问详情"
+          visible={this.state.visibleData.visible}
+          onOk={() => this.handleOk()}
+          onCancel={() => this.handleCancel()}
+          footer={null}
+        >
+         <Table rowKey="UserBehavior" dataSource={this.state.eventList} columns={eventcolumns} pagination={false} rowKey="eventall" scroll={{ y: 400 }} />
+        </Modal>
+      </>
+    )
+  }
+}
+
+
+const formatDate = (start, end) => {
+  const startDate = `${moment(start).format('YYYY-MM-DDT00:00:00.000')}Z`
+  const endDate = `${moment(end).format('YYYY-MM-DDT23:59:59.999')}Z`
+  return { startDate, endDate }
+}
+const UserBehaviorIndex = props => {
+  const [data, setData] = useState({ records: [] })
+  const [visibleData, setVisibleData] = useState({ visible: false, row: {} })
+  const [buildingId, setBuildingId] = useState('')
+
+  // 柱图
+  useEffect(() => {
+    const date = formatDate(props.startDate, props.endDate)
+    getUserBehaviorSummary({
+      ...date,
+      activity: props.activity,
+      event: props.event,
+      eventType: props.eventType,
+      buildingId: props.buildingId,
+    })
+    // getUserBehaviorProfile(formatDate(props.startDate, props.endDate))
+  }, [props.startDate, props.endDate, props.activity, props.event, props.eventType, props.buildingId])
+
+  const [recordList, setList] = useState([])
+  function getUserBehaviorSummary(params) {
+    request({
+      ...apis.indexEcharts.userBehavior.tsUserBehavior,
+      params,
+    }).then(data => {
+      setData(data || {})
+      // setList((data.data.records || []).filter(e => e.activity !== '客户'))
+    })
+  }
+
+
+  const seriesMaker = (data.selectUserBehavior || []).filter(e => e.activity !== '客户' && e.activity !== '首页').reduce((series, item) => {
+    let { date, activityCount, activity } = item
+    date = moment(date).format('YYYY-MM-DD')
+    if (!activityCount) activityCount = 0
+
+    // 使用对象, 可以去重
+    series[`${activity}`] = (series[`${activity}`] || []).concat([[date, activityCount]])
+
+    return series;
+  }, {})
+
+
+  const dataZoom = props.dataZoom ? [
+    {
+      type: 'inside',
+      start: 0,
+      end: 100,
+    },
+    {
+      type: 'slider',
+      start: 0,
+      end: 100,
+    },
+  ] : undefined
+
+
+  const options = {
+    title: {},
+    icon: 'rect',
+    legend: {
+      show: true,
+      zlevel: 10,
+      itemGap: 100,
+    },
+    color: ['#F12B3E', '#FE929C', '#647CE1', '#A2B9FF', '#FF844F', '#FFBB9D'],
+    tooltip: {
+      trigger: 'axis',
+    },
+    xAxis: { type: 'category' },
+    yAxis: {},
+    dataZoom,
+    series: Object.keys(seriesMaker).map(x => ({
+        type: 'line',
+        smooth: true,
+        name: x,
+        data: seriesMaker[x],
+      })),
+  }
+  function handleBuildingChange(e) {
+    const date = formatDate(props.startDate, props.endDate)
+    getUserBehaviorSummary({
+      ...date,
+      activity: props.activity,
+      event: props.event,
+      eventType: props.eventType,
+      buildingId: e,
+    })
+    setBuildingId(e)
+  }
+
+  function showDetails(row) {
+    setVisibleData({ visible: true, row })
+  }
+
+  function onSuccess() {
+    setVisibleData({ visible: false, row: {} })
+  }
+
+
+  const style = {
+    width: '100%',
+    height: '400px',
+
+  }
+
+  const columns = [
+    {
+      title: '访问事件',
+      dataIndex: 'eventName',
+      key: 'eventName',
+      align: 'center',
+      width: '16%',
+
+    },
+    {
+      title: '访问用户',
+      dataIndex: 'userName',
+      key: 'userName',
+      align: 'center',
+      width: '15%',
+
+    },
+    {
+      title: '访问次数',
+      dataIndex: 'accessCount',
+      key: 'accessCount',
+      align: 'center',
+      width: '17%',
+
+      render: (x, row) => (
+        <>
+          <span style={{ color: '#EF273A', cursor: 'pointer' }} onClick={() => showDetails(row)}> {row.accessCount}</span>
+        </>
+      ),
+    },
+    {
+      title: '首次访问时间',
+      dataIndex: 'visitTime',
+      key: 'visitTime',
+      align: 'center',
+      width: '18%',
+      render: (x, row) => (
+        <>
+          <span>{ row.visitTime && moment(row.visitTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+        </>
+      ),
+    },
+    {
+      title: '离开时间',
+      dataIndex: 'leaveTime',
+      key: 'leaveTime',
+      width: '18%',
+      align: 'center',
+      render: (x, row) => (
+        <>
+          <span>{ row.leaveTime && moment(row.leaveTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+        </>
+      ),
+    },
+  ]
+
+
+  return (
+    <>
+      <div>
+        {/* <p onClick={() => router.push('/indexEcharts/userBehavior')} style={{cursor: 'pointer'}}> */}
+          <span style={{ borderBottom: '1px solid #f02d40', color: '#333', fontSize: '0.12rem', fontWeight: '600' }}>用户行为</span>
+          {!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))} value={buildingId}></BuildSelect>}
+        </div>
+        <EChart options={options} style={style} />
+        {false &&
+          <Table rowKey="UserBehaviorTwo" dataSource={recordList} columns={columns} pagination={false} rowKey="userbehavior" scroll={{ y: 500 }} />
+        }
+      </div>
+      <EventcoModal visibleData={visibleData} onSuccess={() => onSuccess()} />
+    </>
+  )
+}
+
+export default UserBehaviorIndex

src/pages/indexEcharts/components/UserConversion.jsx

@@ -79,13 +79,7 @@ const UserSource = props => {
       radius: ['34%', '52%'],
       avoidLabelOverlap: false,
       label: {
-        normal: {
-          show: false,
-          position: 'center',
-          color: '#666666',
-          fontSize: 22,
-          formatter: '{d}%'
-        },
+        formatter: '{b} {@value}',
         emphasis: {
           show: true,
           formatter: '{d}%',

src/pages/indexEcharts/components/UserSex.jsx

@@ -51,6 +51,9 @@ const UserSource = (props) => {
       name: '性别比例',
       center: ['44%', '65%'],
       radius: ['34%', '52%'],
+      label: {
+        formatter: '{b} {@value}',
+      },
       data:
         dataset,
     }

src/pages/indexEcharts/components/UserSource.jsx

@@ -16,7 +16,9 @@ const formatDate = (start, end) => {
 }
 
 const UserSource = (props) => {
-  const [data, setData] = useState({ records: [] })
+  const [xData, setxData] = useState([])
+  const [fromData, setFromData] = useState([])
+  const [registerData, setRegisterData] = useState([])
   //柱图
   useEffect(() => {
     userResource(formatDate(props.startDate, props.endDate))
@@ -24,21 +26,25 @@ const UserSource = (props) => {
 
   function userResource(params) {
     request({
-      ...apis.indexEcharts.userResource,
+      ...apis.indexEcharts.selectPersonFrom,
       params,
     }).then((data) => {
-      setData(data)
-      console.log(data,"datadatadatadatavvvdatadatav")
+      console.log(data,"222222")
+      setxData(data.tdWxDicts.map(x =>  x.sceneAlias))
+      setFromData(data.tdWxDicts.map(x => x.fromData))
+      setRegisterData(data.tdWxDicts.map(x => x.registerSum))
       props.onSuccess(data)
     })
   }
 
-  const dataset = data || {};
-  const source = dataset.columnar || [];
   const subtitle = '最近7天';
   const baroptions = {
     title: { },
-    xAxis: { type: 'category' },
+    xAxis: { 
+              type: 'category',
+              data: xData,
+              axisLabel: {rotate: 45}
+            },
     legend: {
       left: '20%',
       data: ['所有用户', '注册用户']
@@ -51,6 +57,7 @@ const UserSource = (props) => {
       {
         type: 'bar', name: '所有用户', datasetIndex: 0,
         barWidth: 20,
+        data: fromData,
         itemStyle: {
           normal: {
             barBorderRadius: [20, 20, 0, 0],
@@ -70,6 +77,7 @@ const UserSource = (props) => {
         type: 'bar',
         name: '注册用户',
         barWidth: 20,
+        data: registerData,
         itemStyle: {
           normal: {
             barBorderRadius: [20, 20, 0, 0],
@@ -87,11 +95,11 @@ const UserSource = (props) => {
 
       },
     ],
-    dataset: {
-      id: 'bar',
-      dimensions: ['fromName', 'userCount', 'registered'],
-      source: source,
-    },
+    // dataset: {
+    //   id: 'bar',
+    //   dimensions: ['fromName', 'userCount', 'registered'],
+    //   source: source,
+    // },
   }
 
 

src/pages/indexEcharts/components/UserSourceDetail.jsx

@@ -0,0 +1,139 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '../../../components/EchartsTest/EChart';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+
+import styles from '../styles.less'
+
+const formatDate = (start, end) => {
+  const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+  const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+  return { startDate, endDate }
+}
+
+const UserSourceDetail = (props) => {
+  const [xData, setxData] = useState([])
+  const [fromData, setFromData] = useState([])
+  const [registerData, setRegisterData] = useState([])
+  //柱图
+  useEffect(() => {
+    userResource(formatDate(props.startDate, props.endDate))
+  }, [props.startDate, props.endDate])
+
+  function userResource(params) {
+    request({
+      ...apis.indexEcharts.selectPersonFromGroupByDay,
+      params,
+    }).then((data) => {
+      setxData(data.map(x =>  x.createTime))
+      setFromData(data.map(x => x.fromNum))
+      setRegisterData(data.map(x => x.registeredNum))
+      props.onSuccess(data)
+    })
+  }
+
+  const subtitle = '最近7天';
+  const baroptions = {
+    title: {
+    },
+    tooltip: {
+        trigger: 'axis'
+    },
+    legend: {
+        data: ['新用户数', '授权注册']
+    },
+    toolbox: {
+        show: true,
+        feature: {
+            dataZoom: {
+                yAxisIndex: 'none'
+            },
+            dataView: {readOnly: false},
+            magicType: {type: ['line', 'bar']},
+            restore: {},
+            saveAsImage: {}
+        }
+    },
+    xAxis: {
+        type: 'category',
+        boundaryGap: false,
+        data: xData
+    },
+    yAxis: {
+        type: 'value',
+        axisLabel: {
+            formatter: '{value} °C'
+        }
+    },
+    series: [
+        {
+            name: '新用户数',
+            type: 'line',
+            data: fromData,
+            markPoint: {
+                data: [
+                    {type: 'max', name: '最大值'},
+                    {type: 'min', name: '最小值'}
+                ]
+            },
+            markLine: {
+                data: [
+                    {type: 'average', name: '平均值'}
+                ]
+            }
+        },
+        {
+            name: '授权注册',
+            type: 'line',
+            data: registerData,
+            markPoint: {
+                data: [
+                    {name: '周最低', value: -2, xAxis: 1, yAxis: -1.5}
+                ]
+            },
+            markLine: {
+                data: [
+                    {type: 'average', name: '平均值'},
+                    [{
+                        symbol: 'none',
+                        x: '90%',
+                        yAxis: 'max'
+                    }, {
+                        symbol: 'circle',
+                        label: {
+                            position: 'start',
+                            formatter: '最大值'
+                        },
+                        type: 'max',
+                        name: '最高点'
+                    }]
+                ]
+            }
+        }
+    ]
+}
+
+  const barstyle = {
+    width: '100%',
+    height: '480px',
+    minWidth: '400px'
+  }
+
+  return (
+    <>
+      <div>
+      <p onClick={()=>router.push('/indexEcharts/userSource')}><span style={{borderBottom:'1px solid #f02d40',cursor: 'pointer',color:'#333',fontSize:'0.12rem',fontWeight:'600'}}>用户来源</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p>
+
+        <EChart options={baroptions} style={barstyle} />
+
+      </div>
+
+    </>
+  )
+}
+
+export default UserSourceDetail;

src/pages/indexEcharts/components/UserSourcepie.jsx

@@ -45,7 +45,7 @@ const UserSource = (props) => {
     legend: {
       orient: 'vertical',
       x: 'left',
-      data: ['来源置业顾问', '来源全民经纪人', '自主进入'],
+      data: ['来源置业', '来源客户', '其他'],
     },
     tooltip: {
       // trigger: 'item',
@@ -53,17 +53,12 @@ const UserSource = (props) => {
     },
     series: [
       {
+        name: '用户来源',
         type: 'pie',
-        center: ['40%', '65%'],
-        radius: ['34%', '52%'],
+        center: ['50%', '65%'],
+        radius: ['25%', '40%'],
         label: {
-          normal: {
-            show: false,
-            position: 'center',
-            color: '#666666',
-            fontSize: 22,
-            formatter: '{d}%'
-          },
+          formatter: '{b} {@value}',
           emphasis: {
             show: true,
             formatter: '{d}%',
@@ -71,7 +66,7 @@ const UserSource = (props) => {
               fontSize: '22',
               fontWeight: 'bold'
             }
-          }
+          },
         },
       },
 
@@ -80,9 +75,9 @@ const UserSource = (props) => {
     dataset: {
       id: 'pie',
       source: [
-        { '用户来源': '来源置业顾问', value: person_realty_consultant, },
-        { '用户来源': '来源全民经纪人', value: person_estate_agent },
-        { '用户来源': '自主进入', value: person_null },
+        { '用户来源': '来源置业', value: person_realty_consultant, },
+        { '用户来源': '来源客户', value: person_estate_agent },
+        { '用户来源': '其他', value: person_null },
       ]
     },
   }

src/pages/indexEcharts/index.jsx

@@ -6,7 +6,7 @@ import request from '../../utils/request'
 import apis from '../../services/apis';
 import UserSource from './components/UserSource.jsx';
 import UserSourcepie from './components/UserSourcepie.jsx';
-import UserBehavior from './components/UserBehavior.jsx';
+import UserBehaviorIndex from './components/UserBehaviorIndex.jsx';
 import UserActive from './components/UserActive';
 import UserSex from './components/UserSex';
 import NewUsers from './components/NewUsers'
@@ -56,7 +56,7 @@ const indexEcharts = props => {
       }
       {checkData.includes('user_behavior') &&
         <div className={styles.behavior}>
-          <UserBehavior tableShow={false} endDate={endDate} startDate={startDate} dataZoom={false}></UserBehavior>
+          <UserBehaviorIndex tableShow={false} endDate={endDate} startDate={startDate} dataZoom={false}></UserBehaviorIndex>
         </div>
       }
       <div style={{ display: 'flex' }}>

src/pages/indexEcharts/userSource.jsx

@@ -21,40 +21,44 @@ const { Option } = Select
 // }
 
 let daterange = []
-let tableTitle = ['日期']
+let tableTitle = ['类型']
 
-const columns = [
+let columns = [
   {
     title: '日期',
-    dataIndex: 'label',
-    key: 'label',
-    width:'20%'
+    dataIndex: 'createTime',
+    key: 'createTime',
   },
-  {
-    title: '名片分享',
-    dataIndex: '名片分享',
-    key: '名片分享',
-  },
-  {
-    title: '生成海报',
-    dataIndex: '生成海报',
-    key: '生成海报',
-  },
-  {
-    title: '小程序搜索',
-    dataIndex: '小程序搜索',
-    key: '小程序搜索',
-  },
-  {
-    title: '好友分享',
-    dataIndex: '好友分享',
-    key: '好友分享',
-
-  },
-
-
+  // {
+  //   title: '名片分享',
+  //   dataIndex: '名片分享',
+  //   key: '名片分享',
+  // },
+  // {
+  //   title: '生成海报',
+  //   dataIndex: '生成海报',
+  //   key: '生成海报',
+  // },
+  // {
+  //   title: '小程序搜索',
+  //   dataIndex: '小程序搜索',
+  //   key: '小程序搜索',
+  // },
+  // {
+  //   title: '好友分享',
+  //   dataIndex: '好友分享',
+  //   key: '好友分享',
+  // },
 ]
 
+// let columns = [
+//   {
+//     title: '类型',
+//     dataIndex: 'value',
+//     key: 'value',
+//   }
+// ]
+
 class Header extends React.Component {
 
   constructor(props) {
@@ -72,8 +76,6 @@ class Header extends React.Component {
     this.setState({ endDate: new Date(), startDate: moment().subtract(7, 'day').toDate() })
   }
 
-
-
   formatDate = (start, end) => {
     const tempStartDate = `${moment(start).format('YYYY-MM-DDT00:00:00.000')}Z`
     const tempEndDate = `${moment(end).format('YYYY-MM-DDT23:59:59.999')}Z`
@@ -111,17 +113,32 @@ class Header extends React.Component {
 
   onTabledatas = (e) => {
     console.log('this.state.userType: ', this.state.userType)
-    const data = (e.data || []).reduce((acc, item) => {
-      const { date, fromName, count, registered } = item
-      const num = this.state.userType === 'registered' ? registered : count
+    e.tdWxDicts.map(x => {
+        columns = columns.filter(y => y.key != x.sceneType).concat({
+          title: x.sceneAlias,
+          dataIndex: x.sceneType,
+          key: x.sceneType,
+        })
+    })
+    const data = (e.list || []).reduce((acc, item) => {
+      const { sceneType, fromNum, registeredNum, createTime } = item
+      const num = this.state.userType === 'registered' ? registeredNum : fromNum
+      acc[createTime] = { ...acc[createTime], ...item, [`${sceneType}`]: !num ? 0 : num }
+      return acc
+    }, {})
 
-      tableTitle = tableTitle.indexOf(fromName) > -1 ? tableTitle : tableTitle.concat(fromName) // eslint-disable-line
-      acc[date] = { ...acc[date], [`${fromName}`]: !num ? 0 : num }
+    const dictData =  e.tdWxDicts.reduce((acc,item,index) => {
+      const { sceneType } = item
+      acc[sceneType] = 0
+      return acc
+    },{})
 
+    const tableData = Object.keys(data).map(k => data[k]).reduce((acc,item,index) => {
+      acc[index] = { ...dictData, ...item }
       return acc
-    }, {})
+    },[])
 
-    this.setState({ tableData: Object.keys(data).map(x => ({ label: x, ...data[x] })) })
+    this.setState({ tableData })
 
   }
 
@@ -152,7 +169,7 @@ class Header extends React.Component {
             Today: [moment(), moment()],
             'This Month': [moment().startOf('month'), moment().endOf('month')],
           }}
-          showTime
+          // showTime
           // format="YYYY/MM/DD HH:mm:ss"
           onChange={(_dates, dateStrings) => this.onChangetime(_dates, dateStrings)}
         />

src/pages/news/list/editNewsList.jsx

@@ -7,7 +7,7 @@ import moment from 'moment';
 import router from 'umi/router';
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
-import XForm, { FieldTypes } from '../../../components/XForm';
+import  { FieldTypes, createForm } from '../../../components/XForm';
 import Wangedit from '../../../components/Wangedit/Wangedit'
 import request from '../../../utils/request'
 import ImageUploader from '../../../components/XForm/ImageUpload';
@@ -20,6 +20,21 @@ import xiaochengxu from '../../../assets/xiaochengxu.png'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
+
+let detailVisible = false;
+let urlVisible = false;
+
+const setExtraData = (data) => {
+  detailVisible = data.newsDetailType == '1'
+  urlVisible = data.newsDetailType == '0'
+}
+
+const handleFormValueChange = (props, changedValues, allValues) => {
+    setExtraData(allValues)
+}
+
+const XForm = createForm({ onValuesChange: handleFormValueChange })
+
 /**
  *
  *
@@ -30,8 +45,7 @@ const { TextArea } = Input;
   const [ tab, changeTab ] = useState('basic')
   const newsId = props.location.query.newsId
   const [ dynamicData, setDynamicData ] = useState({})
-  
-  
+
     useEffect(() => {
       if(newsId){
         getDynamicData(newsId);
@@ -41,14 +55,26 @@ const { TextArea } = Input;
   // 查询列表
   const getDynamicData = (newsId) => {
     request({ ...apis.news.get, urlData: { id: newsId },}).then((data) => {
-        setDynamicData(data)
+      setDynamicData(data)
+      detailVisible = data.newsDetailType == '1'
+      urlVisible = data.newsDetailType == '0'
     }).catch((err) => {
       console.log(err)
       message.info(err.msg || err.message)
     })
     }
 
-  
+  // const changeRadio = (e) => {
+  //   console.log(e.target.value,'eeee')
+  //   if(e.target.value == "1"){
+  //     detailVisible = true
+  //     urlVisible = false
+  //   }
+  //   if(e.target.value == "0"){
+  //     detailVisible = false
+  //     urlVisible = true
+  //   }
+  // }
 
   const cancelPage = () =>{
     router.push({
@@ -103,9 +129,35 @@ const { TextArea } = Input;
       },
       {
         label: '资讯详情',
+        name: 'newsDetailType',
+        render: <Radio.Group> 
+                <Radio value={1}>自定义</Radio>
+                <Radio value={0}>公众号链接</Radio>
+                </Radio.Group>,
+        value: dynamicData.newsDetailType,
+        rules: [
+          {required: true, message: '请选择资讯类型'},
+        ]
+      },
+      {
+        label: '详情内容',
         name: 'newsDetail',
         render: <Wangedit />,
+        hidden: () => !detailVisible,
         value: dynamicData.newsDetail,
+        rules: [
+          {required: true, message: '请输入详情内容'},
+        ]
+      },
+      {
+        label: '公众号链接',
+        name: 'newsDetail',
+        type: FieldTypes.Text,
+        hidden: () => !urlVisible,
+        value: dynamicData.newsDetail,
+        rules: [
+          {required: true, message: '请输入公众号链接'},
+        ]
       },
     ]
   
@@ -138,7 +190,7 @@ const { TextArea } = Input;
       }
     }
     
-    return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+    return <XForm onSubmit={handleSubmit} onCancel={cancelPage}  fields={fields}></XForm>
   }
   
   const Poster = (props) => {

src/pages/record/drainage/DrainageVisitRecordList.jsx

@@ -83,7 +83,7 @@ const header = props => {
       dataIndex: 'personType',
       key: 'personType',
       align: 'center',
-      render: (text, record) => <span>{record.shareName ? record.consultantId === null || record.consultantId === '' ? '普通客户' : '置业顾问' : ''}</span>,
+      render: (text, record) => <span>{record.personType === 'Realty Consultant' ? '置业顾问' : '普通客户' }</span>,
     },
   ];
   

src/pages/staff/list/editStaff.jsx

@@ -256,6 +256,14 @@ const Edit = (props) => {
       </Radio.Group>,
       value: userData.status != null ? userData.status.toString() : "1"
     },
+    {
+      label: '权重',
+      name: 'weight',
+      type: FieldTypes.Number,
+      render: <Input type="number" style={{ width: 150}} />,
+      value: userData.weight,
+      help: '数字越大越靠前',
+    },
   ]
 
   console.log('--------->', fields)

src/pages/style/GoodsList.less

@@ -11,7 +11,7 @@
 
 .imgPerfect {
   width: 120px;
-  height: 67.5px;
+  height: 40px;
 }
 
 .imgIndex {

src/services/apis.js

@@ -253,6 +253,11 @@ export default {
       url: `${prefix}/customer/recommend/edit/:id`,
       action: 'admin.customer.recommend.edit.id.put',
     },
+    consultantAssist: {
+      method: 'POST',
+      url: `${prefix}/customer/consultant/assist/:id`,
+      action: 'admin.customer.consultant.assist.id.put',
+    },
     taPointsRecords: {
       method: 'GET',
       url: `${prefix}/mine/taPointsRecords/:id`,
@@ -320,6 +325,16 @@ export default {
       url: `${prefix}/selectUserResource`,
       action: 'userStatistics',
     },
+    selectPersonFrom: {
+      method: 'GET',
+      url: `${prefix}/selectPersonFrom`,
+      action: 'userStatistics',
+    },
+    selectPersonFromGroupByDay: {
+      method: 'GET',
+      url: `${prefix}/selectPersonFromGroupByDay`,
+      action: 'userStatistics',
+    },
     list:{
       method:'Get',
       url: `${prefix}/indexStatistical`,
@@ -336,6 +351,11 @@ export default {
         url: `${prefix}/selectEventAll`,
         action: 'behaviorIncident',
       },
+      tsUserBehavior: {
+        method: 'GET',
+        url: `${prefix}/tsUserBehavior`,
+        action: 'tsUserBehavior',
+      },
     },
     bizEvent: {
       dict: {
@@ -999,6 +1019,13 @@ export default {
     action: 'admin.thirdPartyMiniapp.id.get',
   },
  },
+ wxDict: {
+  list: {
+    url: `${prefix}/tdWxDict`,
+    method: 'GET',
+    action: 'admin.tdWxDict.get',
+  },
+ },
  poster: {
   posterTemplate: {
     url: `${prefix}/posterTemplate`,
@@ -1006,6 +1033,28 @@ export default {
     action: 'admin.posterTemplate.get',
   },
  },
+ paorama: {
+  panoramaApartList: {
+    url: `${prefix}/panorama/apartment`,
+    method: 'GET',
+    action: 'admin.panoramaApartList.get',
+  },
+  add: {
+    url: `${prefix}/panorama`,
+    method: 'POST',
+    action: 'admin.panorama.post',
+  },
+  list: {
+    url: `${prefix}/panorama/:id`,
+    method: 'GET',
+    action: 'admin.panorama.id.get',
+  },
+  delete: {
+    method: 'DELETE',
+    url: `${prefix}/panorama/:id`,
+    action: 'admin.panorama.id.delete',
+  }
+ },
  amap: { // 高德地图
    webService: { // Web服务Api ---- 周边搜索
      url: `${amapPrefix}/place/around`,

src/utils/request.js

@@ -89,11 +89,11 @@ request.interceptors.response.use(async (response, options) => {
       const { code, data, message } = await response.clone().json();
       if (code != 1000) {
         if (code === 1001) {
-          notification.error({
-            message: `请登录系统`,
-            // description: '请登录系统',
-          });
-          throw new Error('请登录系统');
+          // notification.error({
+          //   message: `请登录系统`,
+          //   // description: '请登录系统',
+          // });
+          // throw new Error('请登录系统');
         } else {
           notification.error({
             message: message || '请求错误',