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

src/pages/activity/editActivity.jsx

@@ -85,6 +85,12 @@ const BasicForm = props => {
         } else {
           request({ ...apis.activity.add, data: { ...values } }).then((data) => {
             message.info('保存成功')
+            router.push({
+              pathname: '/activity/editActivity',
+              query: {
+                dynamicId: data.dynamicId,
+              },
+            });
             // router.go(-1)
           }).catch((err) => {
             message.info(err.msg || err.message)
@@ -108,12 +114,12 @@ const BasicForm = props => {
           ],
         })(<BuildSelect disabled={disable}/>)}
         </Form.Item>
-        <Form.Item label="活动封面图" help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于活动列表">
+        <Form.Item label="活动封面图1" help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于活动列表">
           {getFieldDecorator('listImgUrl', {
           rules: [
             {
               required: true,
-              message: '请选择活动封面图',
+              message: '请选择活动封面图1',
             },
           ],
         })(<ImageUploader />)}
@@ -199,7 +205,7 @@ const BasicForm = props => {
               message: '请输入权重',
             },
           ],
-        })(<Input type="number" style={{ width: 80}}/>)}<span style={{ marginLeft: 30, color:'grey'}}>数字越大越靠前</span>
+        })(<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/building/list/add/components/base.jsx

@@ -67,8 +67,12 @@ function AddBuilding(props) {
    
       
       poi.map(x => {
+        const ty = Object.prototype.toString
         // console.log('x.data: ', JSON.parse(x.data))
-        setFormMapScopeTagValue(x.key, { data: JSON.parse(x.data) })
+        // console.log('x.data: ', typeof x.data, x.data instanceof String, ty.call(x.data))
+        if (ty.call(x.data) === '[object String]') {
+          setFormMapScopeTagValue(x.key, { data: JSON.parse(x.data) })
+        }
       })
     }
   }

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

@@ -13,7 +13,7 @@ const { confirm } = Modal;
 const saleType = [
   {
     id: 1,
-    name: '待定',
+    name: '待售',
   },
   {
     id: 2,

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

@@ -88,8 +88,11 @@ class ModalImage extends React.Component {
 
     // 网路请求
     request({ ...apis.building.buildingApartmentGetById, urlData: { id: apartmentId }, params: { ...params } }).then(res => {
-      // res.img = res.buildingImgList.map((item, _) => item.url)
-      res.img = res.buildingImgList.map(item => item.url)
+      // 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)
@@ -116,7 +119,8 @@ class ModalImage extends React.Component {
 
   submitData(data) {
     // TODO 这里应该是要支持多图，但是封装的控件没有
-    data.img = data.img.map((item, index) => ({ imgType: 'aparment', url: item, orderNo: index }))
+    // data.img = data.img.map((item, index) => ({ imgType: 'aparment', url: item, orderNo: index }))
+    data.img = [{ imgType: 'aparment', url: data.img, orderNo: 0 }]
     data.buildingId = this.props.visibleData.buildingId;
     data.apartmentType = 'apart'
     const api = data.apartmentId !== undefined ? apis.building.buildingApartmentUpdate : apis.building.buildingApartmentAdd;
@@ -186,17 +190,28 @@ class ModalImage extends React.Component {
               {getFieldDecorator('img', {
                   rules: [{ required: true, message: '请上传户型图片' }],
               })(
-                <ImageListUpload />,
+                // <ImageListUpload />,
+                <ImageUpload />,
               )}
               </Form.Item>
               <Form.Item label="面积" help="单位 ㎡">
                 {getFieldDecorator('buildingArea', {
-                  rules: [{ required: true, message: '请填写面积' }],
+                  rules: [{ required: true, message: '请填写面积' },
+                          {
+                            pattern: new RegExp('^[0-9]*$'),
+                            message: '只允许输入数字',
+                          },
+                  ],
                 })(<Input type="number" />)}
               </Form.Item>
               <Form.Item label="套内面积" help="单位 ㎡">
                 {getFieldDecorator('insideArea', {
-                  rules: [{ required: true, message: '请填写套内面积' }],
+                  rules: [{ required: true, message: '请填写套内面积' },
+                          {
+                            pattern: new RegExp('^[0-9]*$'),
+                            message: '只允许输入数字',
+                          },
+                  ],
                 })(<Input type="number" />)}
               </Form.Item>
               <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>

src/pages/building/list/index.jsx

@@ -230,7 +230,21 @@ function body(props) {
 
 
   function toAdd() {
-    router.push({ pathname: '/building/list/add' })
+    // 判断楼盘是否最可以添加
+    request({ ...apis.building.verifyMax}).then(res => {
+      router.push({ pathname: '/building/list/add' })
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+      return
+    })
   }
 
   /**

src/pages/carouselFigure/advertisingList.jsx

@@ -46,7 +46,7 @@ const toEdit = (contentId) => () => {
       dataIndex: 'image',
       key: 'image',
       align: 'center',
-      render: (image) => <img src={image} className={styles.touxiang} />,
+      render: (image) => <img src={image} className={styles.imgSmall} />,
     },
     {
       title: '类型',

src/pages/carouselFigure/carouselFigureList.jsx

@@ -46,7 +46,7 @@ const toEditCarouse = (contentId) => () => {
       dataIndex: 'image',
       key: 'image',
       align: 'center',
-      render: (image) => <img src={image} className={styles.touxiang} />,
+      render: (image) => <img src={image} className={styles.imgPerfect} />,
     },
     {
       title: '类型',

src/pages/channel/recommendClients.jsx

@@ -95,7 +95,7 @@ const columns = [
     // eslint-disable-next-line consistent-return
     render: (text, records) => {
       if (records.status === 1) { return '报备' }
-      if (records.status === 2) { return 'admin.taNews.weight' }
+      if (records.status === 2) { return '推荐' }
       if (records.status === 3) { return '认购' }
       if (records.status === 4) { return '签约' }
       if (records.verifyStatus === 1) { return '待审核' }

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

@@ -27,7 +27,7 @@ class ModalIntegralRecord extends React.Component {
 
   // 挂载之后
   componentDidMount() {
-    // this.getList({ pageNumber: 1, pageSize: 5 })
+    this.getList({ pageNumber: 1, pageSize: 5 })
   }
 
   componentDidUpdate(preProps, preState) {
@@ -76,8 +76,7 @@ class ModalIntegralRecord extends React.Component {
   }
 
   // 积分类型
-  showChangeType(str) { 
-
+  showChangeType(str) {
     switch (str) {
       case 'goods':
         return '兑换商品'
@@ -89,58 +88,64 @@ class ModalIntegralRecord extends React.Component {
         return '注册经纪人'
       case 'recommend-customer':
         return '推荐客户'
+        case 'group':
+        return '拼团'
+        case 'recommend-customer':
+        return '推荐客户'
       default:
         return '未知类型'
     }
   }
-  
+
   // 判断是否是 - 开头
-  subPoints(points) { 
-    let subStr = points.toString().substring(0, 1)
+  subPoints(points) {
+    const subStr = points.toString().substring(0, 1)
     if (subStr === '-') {
       return true
     }
     return false
   }
 
+// eslint-disable-next-line class-methods-use-this
   render() {
     const columns = [
       {
         title: '序号',
         dataIndex: 'index',
         key: 'index',
+        render: (text, record, index) => <span>{(this.state.dataSource.result.total - this.state.dataSource.result.records.length) * 1 + index + 1}</span>,
       },
       {
         title: '积分类型',
         dataIndex: 'changeType',
         key: 'changeType',
-        render: (_, record) => { this.showChangeType(record.changeType) },
+        render: (_, record) => <span>{this.showChangeType(record.changeType) }</span>,
       },
       {
         title: '积分变化',
         dataIndex: 'pointsAmount',
         key: 'pointsAmount',
-        render: (_, record) => { <span style={this.subPoints(record.pointsAmount) && {color: 'red'}}>{ record.pointsAmount }</span> },
+        // render: (pointsAmount, record) => { <span style={this.subPoints(pointsAmount) && {color: 'red'}}>{ pointsAmount }</span> },
       },
       {
         title: '发生时间',
         dataIndex: 'createDate',
         key: 'createDate',
-        render: (_, record) => { moment(record.createDate).format('YYYY-MM-DD') },
+        render: (createDate, records) => <span> {moment(createDate).format('YYYY-MM-DD')}</span>,
       },
     ]
     return (
       <>
         <Modal
-            title={ "当前可用积分：" + this.state.dataSource.totalPoints }
+            title={ '当前可用积分：' + this.state.dataSource.totalPoints }
             width={800}
             destroyOnClose="true"
             footer={null}
             visible={this.state.visibleData.visible}
             // onOk={() => this.handleOk()}
-            onCancel={(e) => this.handleCancel(e)}
+            onCancel={e => this.handleCancel(e)}
           >
-            <Table dataSource={this.state.dataSource.result.records} rowKey="integralrecord" columns={columns} pagination={{ total: this.state.dataSource.result.total, onChange: e => this.onChange(e) }} />
+            <Table dataSource={this.state.dataSource.result.records} columns={columns} pagination={{ total: this.state.dataSource.result.total, onChange: e => this.onChange(e) }} />
           </Modal>
       </>
     );

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

@@ -109,17 +109,18 @@ class ModalRecommendRecord extends React.Component {
         title: '推荐时间',
         dataIndex: 'createDate',
         key: 'createDate',
-        render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</span></>,
+        render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss') }</span></>,
       },
       {
         title: '状态',
         // eslint-disable-next-line consistent-return
         render: (text, records) => {
-          if (records.status === 1) { return '报备' }
-          if (records.status === 2) { return '到访' }
-          if (records.status === 3) { return '认筹' }
-          if (records.status === 4) { return '签约' }
-          // reportRecommendStatus
+          if (records.verifyStatus === 0) { return '未审核' }
+          if (records.verifyStatus === 1) {
+            if (records.reportRecommendStatus === 1) { return '报备' }
+            if (records.reportRecommendStatus === 2) { return '推荐' }
+           }
+          if (records.verifyStatus === 2) { return '审核不通过' }
         },
       },
     ]

src/pages/customer/customerlist/customerDetail.jsx

@@ -83,7 +83,7 @@ function onChange(number) {
       dataIndex: 'visitTime',
       key: 'visitTime',
       align: 'center',
-      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD hh:mm:ss') }</span>,
+      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss') }</span>,
     },
     {
       title: '停留时间',
@@ -98,8 +98,8 @@ function onChange(number) {
     {
       title: 'Name',
       dataIndex: 'name',
-      width:500,
-    render: (_, record) => <span stytle={{width:'450px'}} >{record.buildingName}</span>,
+      width: 500,
+    render: (_, record) => <span>{record.buildingName}</span>,
     },
     {
       title: 'Address',
@@ -169,7 +169,7 @@ function onChange(number) {
         <div className={styles.leftBoxCentre}>
           <div className={styles.tit}>
                 <span>项目名称</span>
-                <span style={{ marginLeft: '47%' }}>意向值</span>
+                <span style={{ marginLeft: '50%' }}>意向值</span>
           </div>
           {/* <img className={styles.touxiang} src={ data.picture && data.picture } /> */}
           <div className={styles.infoItem}>

src/pages/customer/customerlist/index.jsx

@@ -135,7 +135,7 @@ function body(props) {
   }
 
   function showRecord(record) {
-    setRecordVisibleData({ visible: true, customerId: record.customerId })
+    setRecordVisibleData({ visible: true, customerId: record.personId })
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
@@ -207,6 +207,7 @@ function body(props) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '', status: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
+    getList({ pageNum: 1, pageSize: 10, customerType, ...props.form.getFieldsValue() })
   }
 
   const publicColumns = [

src/pages/customer/customerlist/publicCustomerDetail.jsx

@@ -84,7 +84,7 @@ function onChange(number) {
       dataIndex: 'visitTime',
       key: 'visitTime',
       align: 'center',
-      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD hh:mm:ss') }</span>,
+      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss') }</span>,
     },
     {
       title: '停留时间',

src/pages/style/GoodsList.less

@@ -9,6 +9,16 @@
   height: 93px;
 }
 
+.imgPerfect {
+  width: 120px;
+  height: 67.5px;
+}
+
+.imgSmall {
+  width: 90px;
+  height: 135px;
+}
+
 .ant-table-column-title {
   font-weight: 600;
 }

src/pages/system/editPolicy.jsx

@@ -46,6 +46,12 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         name: 'cityId',
         render: <SelectCity />,
         value: policyData.cityId,
+        rules: [
+          {
+            required: true,
+            message: '请选择城市',
+          },
+        ],
       },
       {
         label: '购房政策封面图',
@@ -53,18 +59,36 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         type: FieldTypes.ImageUploader,
         value: policyData.policyImg,
         help: '建议图片尺寸：220*176px，比例5:4,格式：jpg，用于购房百科列表',
+        rules: [
+          {
+            required: true,
+            message: '请选择购房政策封面图',
+          },
+        ],
       },
       {
         label: '政策标题',
         name: 'title',
         type: FieldTypes.Text,
         value: policyData.title,
+        rules: [
+          {
+            required: true,
+            message: '请输入政策标题',
+          },
+        ],
       },
       {
         label: '政策详情',
         name: 'body',
         render: <Wangedit />,
         value: policyData.body,
+        rules: [
+          {
+            required: true,
+            message: '请输入政策标题',
+          },
+        ],
       },
       {
         label: '状态',
@@ -77,6 +101,12 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
   
     const handleSubmit = val => { 
       console.log('submit data --->', val)
+      console.log(val.body, 'val.body')
+      if (val.body == '<p><br></p>'){
+        message.info("政策详情必填")
+        return
+      }
+      
       if(policyId){
         val.policyId = policyId
         request({ ...apis.system.updateTaPolicy, urlData: {id: policyId},data: val, }).then((data) => {

src/services/apis.js

@@ -45,6 +45,11 @@ export default {
       url: `${prefix}/buildinglist`,
       action: 'admin.buildinglist.get',
     },
+    verifyMax: {
+      method: 'GET',
+      url: `${prefix}/verifyMax`,
+      action: 'admin.verifyMax.get',
+    },
     updateStatus: {
       method: 'PUT',
       url: `${prefix}/building/update/status`,