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

src/pages/activity/editActivity.jsx

@@ -66,6 +66,7 @@ const Edit = (props) => {
         name: 'imgUrl',
         type: FieldTypes.ImageUploader,
         value: dynamicData.imgUrl,
+        help: '建议图片尺寸：750px*560px',
       },
       {
         label: '活动标题',
@@ -80,7 +81,8 @@ const Edit = (props) => {
         label: '活动时间',
         name: 'activityTime',
         type: FieldTypes.RangePicker,
-        value: dynamicData.startDate != null ? [moment(dynamicData.startDate, 'YYYY-MM-DD'), moment(dynamicData.endDate, 'YYYY-MM-DD')] : null,
+        value: dynamicData.startDate != null ? [moment(dynamicData.startDate, 'YYYY-MM-DD HH:mm'), moment(dynamicData.endDate, 'YYYY-MM-DD HH:mm')] : null,
+        props: {showTime:{ format: 'HH:mm' }},
         rules: [
           { required: true, message: '请选择活动时间' },
         ]
@@ -141,8 +143,8 @@ const Edit = (props) => {
     const handleSubmit = val => {
       let { activityTime, signupTime, ...submitValue } = val
       const [startDate, endDate] = activityTime
-      submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
-      submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
+      submitValue.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
+      submitValue.endDate = moment(endDate).format('YYYY-MM-DD HH:mm');
       const [enlistStart, enlistEnd] = signupTime
       submitValue.enlistStart = moment(enlistStart).format('YYYY-MM-DD');
       submitValue.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD');

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

@@ -157,17 +157,17 @@ function AddBuilding(props) {
               </Select>,
             )}
           </Form.Item>
-          <Form.Item label="项目主图" >
+          <Form.Item label="项目主图" help="建议图片尺寸：640px*360px">
             {getFieldDecorator('avatarImage')(
               <ImageListUpload />,
             )}
           </Form.Item>
-          <Form.Item label="地址图片" >
+          <Form.Item label="地址图片" help="建议图片尺寸：750px*455px">
             {getFieldDecorator('mapImg')(
               <ImageUpload />,
             )}
           </Form.Item>
-          <Form.Item label="海报底图" >
+          <Form.Item label="海报底图" help="建议图片尺寸：640px*1136px" >
             {getFieldDecorator('poster')(
               <ImageUpload />,
             )}

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

@@ -80,8 +80,8 @@ const Share = props => {
       </div>
     </div>
     <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
-      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
-      <Input placeholder="请输入海报标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
+      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
+      <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
     </div>
     <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
       <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>

src/pages/building/type/edi.jsx

@@ -66,10 +66,15 @@ function body(props) {
 
     // 修改
     function updateType(row) {
-      const { url, method } = apis.buildingType.update
-      const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(row.buildingTypeId)
+      // const { url, method } = apis.buildingType.update
+      // const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(row.buildingTypeId)
 
-      request({ url: tempUrl, method, data: { ...row } }).then(() => {
+      // request({ url: tempUrl, method, data: { ...row } }).then(() => {
+      //   router.go(-1)
+      // })
+      request({ ...apis.buildingType.update, urlData: { id: row.buildingTypeId }, data: { ...row } }).then(() => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('success', '操作成功')
         router.go(-1)
       })
     }

src/pages/carouselFigure/editAdvertising.jsx

@@ -74,6 +74,7 @@ import request from '../../utils/request'
         name: 'image',
         type: FieldTypes.ImageUploader,
         value: data.image,
+        help: '建议图片尺寸：640px*960px',
       },
       {
         label: '标题',

src/pages/carouselFigure/editCarousel.jsx

@@ -53,6 +53,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         name: 'image',
         type: FieldTypes.ImageUploader,
         value: data.image,
+        help: '建议图片尺寸：640px*330px',
       },
       {
         label: '标题',

src/pages/customer/customerlist/index.jsx

@@ -201,7 +201,12 @@ function body(props) {
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{record.reportRecommendStatus === 0 ? '未报备' : record.reportRecommendStatus === 1 ? '报备' : record.reportRecommendStatus === 2 ? '推荐' : ''}</span></>,
+      render: (text, records) => {
+        if (records.status === 1) { return '报备' }
+        if (records.status === 2) { return '到访' }
+        if (records.status === 3) { return '认筹' }
+        if (records.status === 4) { return '签约' }
+      },
     },
     {
       title: '操作',
@@ -232,21 +237,23 @@ function body(props) {
 
   return (
     <>
+    {console.log('customerType', customerType)}
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
+      {customerType === 'private' && <Form.Item>
           {getFieldDecorator('buildingId')(
             <BuildSelect />,
           )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('reportRecommendStatus')(
+        </Form.Item>}
+        {customerType === 'private' && <Form.Item>
+          {getFieldDecorator('status')(
             <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
-              <Option value={0}>未报备</Option>
               <Option value={1}>报备</Option>
-              <Option value={2}>推荐</Option>
+              <Option value={2}>到访</Option>
+              <Option value={3}>认筹</Option>
+              <Option value={4}>签约</Option>
             </Select>,
           )}
-        </Form.Item>
+        </Form.Item>}
         <Form.Item>
           {getFieldDecorator('name')(
             <Input
@@ -263,16 +270,16 @@ function body(props) {
             />,
           )}
         </Form.Item>
-        <Form.Item>
+        {customerType === 'private' && <Form.Item>
           {getFieldDecorator('consultName')(
             <Input placeholder="置业顾问" />,
           )}
-        </Form.Item>
-        <Form.Item>
+        </Form.Item>}
+        {customerType === 'private' && <Form.Item>
           {getFieldDecorator('consultTel')(
             <Input placeholder="置业顾问电话" />,
           )}
-        </Form.Item>
+        </Form.Item>}
         <Form.Item>
             <Button type="primary" htmlType="submit" >
               查询

src/pages/integralMall/editGoods.jsx

@@ -44,6 +44,7 @@ const header = props => {
       name: 'imgUrl',
       type: FieldTypes.ImageUploader,
       value: goodsData.imgUrl,
+      help: '建议图片尺寸：164px*164px',
     },
     {
       label: '商品名称',

src/pages/news/list/NewsList.jsx

@@ -253,14 +253,14 @@ function body(props) {
             <BuildSelect />,
           )}
         </Form.Item>
-        {/* <Form.Item>
+        <Form.Item>
           {getFieldDecorator('title')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
               placeholder="请输入标题"
             />,
           )}
-        </Form.Item> */}
+        </Form.Item>
         <Form.Item>
           {getFieldDecorator('newsTypeId')(
             <NewsTypeSelect />,

src/pages/news/list/editNewsList.jsx

@@ -68,6 +68,7 @@ const { TextArea } = Input;
         name: 'newsImg',
         type: FieldTypes.ImageUploader,
         value: dynamicData.newsImg,
+        help: '建议图片尺寸：660px*416px',
       },
       {
         label: '资讯标题',

src/pages/news/type/editNews.jsx

@@ -48,6 +48,7 @@ const header = props => {
       name: 'newsTypeImg',
       type: FieldTypes.ImageUploader,
       value: newsData.newsTypeImg,
+      help: '建议图片尺寸：660px*416px',
     },
     {
       label: '名称',

src/pages/system/editPolicy.jsx

@@ -52,6 +52,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         name: 'policyImg',
         type: FieldTypes.ImageUploader,
         value: policyData.policyImg,
+        help: '建议图片尺寸：660px*416px',
       },
       {
         label: '政策标题',