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

config/routes.js

@@ -499,7 +499,7 @@ export default [
               },
               {
                 path: '/record/drainage/DrainageVisitRecordList',
-                name: '客户访问记录',
+                name: '分享记录',
                 component: './record/drainage/DrainageVisitRecordList',
               },
             ],

src/pages/activity/ActivityList.jsx

@@ -67,7 +67,14 @@ const header = props => {
     });
   }
 
-
+  const getJoinPeople = (dynamicId) => () => {
+    router.push({
+      pathname: '/activity/SignList',
+      query: {
+        dynamicId,
+      },
+    });
+  }
   /**
    *
    *
@@ -102,6 +109,8 @@ const header = props => {
       dataIndex: 'count',
       key: 'count',
       align: 'center',
+      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
+                              <span style={{color: 'blue',cursor: 'pointer'}} onClick={getJoinPeople(row.dynamicId)}>{row.count}</span></div></>,
       // width: '10%',
       // width: '6%',
     },
@@ -347,11 +356,11 @@ const header = props => {
         <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       </AuthButton>
       <Table
-        onRow={record => {
-          return {
-            onClick: getActivityDetail(record.dynamicId),
-          };
-        }}
+        // onRow={record => {
+        //   return {
+        //     onClick: getActivityDetail(record.dynamicId),
+        //   };
+        // }}
        dataSource={data.list} columns={columns} pagination={false} rowKey="activityList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current}/>

src/pages/activity/drainage/DrainageList.jsx

@@ -523,11 +523,11 @@ const header = (props) => {
           <Formss formsDate={formsdate} />
         </Modal>
         <Table 
-        onRow={record => {
-          return {
-            onClick: toDrainageDetail(record.drainageId),
-          };
-        }}
+        // onRow={record => {
+        //   return {
+        //     onClick: toDrainageDetail(record.drainageId),
+        //   };
+        // }}
         columns={columns} dataSource={datas.records} pagination={false} rowKey="drainageList" />
         <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
           <Pagination showQuickJumper defaultCurrent={1} total={datas.total} onChange={(e) => changePageNum(e)} current={datas.current} />

src/pages/activity/groupActivity/list.jsx

@@ -48,7 +48,16 @@ const header = props => {
         groupActivityId,
       },
     });
-  }
+  } 
+
+  const getJoinPeople = (groupActivityId) => () => {
+    router.push({
+      pathname: '/activity/groupActivity/helpRecord',
+      query: {
+          groupActivityId,
+      },
+    });
+  } 
 
   /**
    *
@@ -84,6 +93,8 @@ const header = props => {
       dataIndex: 'participateNum',
       key: 'participateNum',
       align: 'center',
+      render: (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
+                            <span style={{color: 'blue',cursor: 'pointer'}} onClick={getJoinPeople(row.groupActivityId)}>{row.participateNum}</span></div></>,
     },
     {
       title: '成团数',
@@ -314,11 +325,12 @@ const header = props => {
       <AuthButton name="admin.taShareActivity.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditActivity()}>新增</Button>
       </AuthButton>
-      <Table onRow={record => {
-          return {
-            onClick: getActivityDetail(record.groupActivityId),
-          };
-        }}
+      <Table 
+      // onRow={record => {
+      //     return {
+      //       onClick: getActivityDetail(record.groupActivityId),
+      //     };
+      //   }}
         style={{marginTop:'30px'}} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />

src/pages/activity/helpActivity/list.jsx

@@ -48,6 +48,15 @@ const getActivityDetail = (helpActivityId) => () => {
     },
   });
 }
+
+const getJoinPeople = (helpActivityId) => () => {
+  router.push({
+    pathname: '/activity/helpActivity/helpRecord',
+    query: {
+      helpActivityId,
+    },
+  });
+}
   
   
   /**
@@ -78,6 +87,8 @@ const getActivityDetail = (helpActivityId) => () => {
       dataIndex: 'enlistNum',
       key: 'enlistNum',
       align: 'center',
+      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
+                              <span style={{color: 'blue',cursor: 'pointer'}} onClick={getJoinPeople(row.helpActivityId)}>{row.enlistNum}</span></div></>,
     },
     {
       title: '助力成功数',
@@ -309,11 +320,11 @@ const handleSubmit = (e, props) => {
         <Button name="admin.helpActivity.add.post" noRight={null} type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       </AuthButton>
       <Table 
-        onRow={record => {
-          return {
-            onClick: getActivityDetail(record.helpActivityId),
-          };
-        }}
+        // onRow={record => {
+        //   return {
+        //     onClick: getActivityDetail(record.helpActivityId),
+        //   };
+        // }}
       dataSource={data.records} columns={columns} pagination={false} rowKey="activityList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>

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

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

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

@@ -144,6 +144,7 @@ class ProjectTypeBody extends React.Component {
   }
 
   onClose = e => {
+    console.log(2)
     const { data } = this.state
     console.log('onClose——data: ', data)
     console.log('onClose: ', e.buildingTypeId)
@@ -240,8 +241,14 @@ class ProjectTypeBody extends React.Component {
         <Modal
           title="项目类型"
           visible={this.state.visible}
-          onOk={this.handleOk}
+          // onOk={this.handleOk}
           onCancel={this.handleCancel}
+          footer={
+            [
+            <Button key="submit" type="primary" onClick={this.handleOk}>
+             确定  
+            </Button>] 
+          }
         >
           <Checkbox.Group options={this.state.projectType.map(item => ({ label: item.buildingTypeName, value: item.buildingTypeId }))} onChange={e => this.onCheckboxChange(e)} value={this.state.defaultCheckboxValue}/>
         </Modal>

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

@@ -149,6 +149,7 @@ function imageSet(props) {
   return (
     <>
       <Button type="primary" onClick={() => showEdi()}>新增户型</Button>
+      <Button type="danger" style={{ marginLeft: '18px'}} onClick={() => router.go(-1)}>返回</Button>
       <Table dataSource={data} columns={columns} pagination={false} rowKey="imageSet" />
 
       {/* 编辑页 */}

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

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

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*250px，比例16:9,格式：jpg，用于积分商城banner轮播' : '建议图片尺寸：750*464px，比例1.:0.618,格式：jpg，用于：首页顶部banner轮播'),
+          help: () => (locationType ? '建议图片尺寸：750*420px，比例16:9,格式：jpg，用于积分商城banner轮播' : '建议图片尺寸：750*464px，比例1.:0.618,格式：jpg，用于：首页顶部banner轮播'),
           rules: [
             { required: true, message: '请上传轮播图' },
           ],

src/pages/customer/customerlist/index.jsx

@@ -449,18 +449,19 @@ function body(props) {
           </Radio.Group>
       </div>
       {customerType === 'private' ? 
-        <Table onRow={record => {
-          return {
-            onClick: () => toCustomerDateil(record),
-          };
-        }}
+        <Table 
+        // onRow={record => {
+        //   return {
+        //     onClick: () => toCustomerDateil(record),
+        //   };
+        // }}
         dataSource={dataSource.records} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
         <Table 
-        onRow={record => {
-          return {
-            onClick: () => publicCustomerDetail(record),
-          };
-        }}
+        // onRow={record => {
+        //   return {
+        //     onClick: () => publicCustomerDetail(record),
+        //   };
+        // }}
         dataSource={dataSource.records} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> 
       }
       

src/pages/indexEcharts/userBehavior.jsx

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

src/pages/news/list/editNewsList.jsx

@@ -78,7 +78,7 @@ const { TextArea } = Input;
         name: 'newsImg',
         type: FieldTypes.ImageUploader,
         value: dynamicData.newsImg,
-        help: '建议图片尺寸：320*256px，比例5:4,格式：jpg，用于资讯列表',
+        help: '建议图片尺寸：320*240px，比例5:4,格式：jpg，用于资讯列表',
         rules: [
           {required: true, message: '请选择资讯列表'},
         ]