fix

src/pages/activity/lookHouseActivity/index.jsx

@@ -328,4 +328,4 @@ const LookHouseActivity = props => {
   );
 };
 
-export default SignupActivity;
+export default LookHouseActivity;

src/pages/building/Edit/Apartment/Form.jsx

@@ -1,112 +1,173 @@
-import React, { useEffect, useState } from 'react'
-import { Button, Form, Input, message, Select } from 'antd'
-import ImageUpload from '@/components/XForm/ImageUpload'
-import { fetch, apis } from '@/utils/request'
-import ModalForm from '../components/ModalForm'
-import InputNumber from '../components/InputNumber'
-import { validMinNum } from '../utils'
+import React, { useEffect, useState } from 'react';
+import { Button, Form, Input, message, Select } from 'antd';
+import ImageUpload from '@/components/XForm/ImageUpload';
+import { fetch, apis } from '@/utils/request';
+import ModalForm from '../components/ModalForm';
+import InputNumber from '../components/InputNumber';
+import { validMinNum } from '../utils';
 
-const Option = Select.Option
-const fullWidth = { width: '100%' }
-const saveData = fetch(apis.building.buildingApartmentAdd)
-const updateData = fetch(apis.building.buildingApartmentUpdate)
+const Option = Select.Option;
+const fullWidth = { width: '100%' };
+const saveData = fetch(apis.building.buildingApartmentAdd);
+const updateData = fetch(apis.building.buildingApartmentUpdate);
 
-const AMForm = (props) => {
-  const { visible, onCancel, form, formData, onSuccess } = props
-  const { getFieldDecorator, setFieldsValue, resetFields, validateFields } = form
+const saleType = [
+  {
+    id: '1',
+    name: '待售',
+  },
+  {
+    id: '2',
+    name: '售罄',
+  },
+  {
+    id: '3',
+    name: '在售',
+  },
+  // {
+  //   id: '4',
+  //   name: '在租',
+  // },
+];
 
-  const [loading, setLoading] = useState(false)
+const houseType = [
+  {
+    id: '1',
+    name: '1室',
+  },
+  {
+    id: '2',
+    name: '2室',
+  },
+  {
+    id: '3',
+    name: '3室',
+  },
+  {
+    id: '4',
+    name: '4室',
+  },
+  {
+    id: '5',
+    name: '5室及以上',
+  },
+];
 
-  const handleSubmit = (e) => {
+const AMForm = props => {
+  const { visible, onCancel, form, formData, onSuccess,buildingId } = props;
+  const { getFieldDecorator, setFieldsValue, resetFields, validateFields } = form;
+
+  const [loading, setLoading] = useState(false);
+
+  const handleSubmit = e => {
     e.preventDefault();
     validateFields((err, values) => {
       if (err) {
-        console.error(err)
-        return
+        console.error(err);
+        return;
       }
 
-      const request = formData && formData.apartmentId ? updateData : saveData
+      const request = formData && formData.apartmentId ? updateData : saveData;
+
+      //  console.log(values)
+      // TODO 这里应该是要支持多图，但是封装的控件没有
+      // data.img = data.img.map((item, index) => ({ imgType: 'aparment', url: item, orderNo: index }))
+      console.log(formData, values, '--------------');
+      values.img = [{ imgType: 'aparment', url: values.img, orderNo: 0 }];
+      values.buildingId = buildingId;
+      values.apartmentType = 'apart';
+      // const api = data.apartmentId !== undefined ? apis.building.buildingApartmentUpdate : apis.building.buildingApartmentAdd;
+
       const data = {
         ...(formData || {}),
         ...values,
-      }
+      };
 
-      setLoading(true)
-      request({ data }).then((res) => {
-        setLoading(false)
-        message.success('操作成功')
-        onSuccess(res)
-      }).catch((err) => {
-        setLoading(false)
-        console.error(err)
-      })
-    })
-  }
+      setLoading(true);
+      request({ data })
+        .then(res => {
+          setLoading(false);
+          message.success('操作成功');
+          onSuccess(res);
+        })
+        .catch(err => {
+          setLoading(false);
+          console.error(err);
+        });
+    });
+  };
 
   useEffect(() => {
-    resetFields()
-    setFieldsValue(formData || {})
-  }, [formData])
+    resetFields();
+    if (formData?.buildingImgList) {
+      formData.img = formData.buildingImgList[0].url;
+    }
+    setFieldsValue(formData || {});
+    setFieldsValue(formData || {});
+  }, [formData]);
 
   return (
-    <ModalForm
-      title="户型设置"
-      visible={visible}
-      onCancel={onCancel}
-      onSubmit={handleSubmit}
-    >
+    <ModalForm title="户型设置" visible={visible} onCancel={onCancel} onSubmit={handleSubmit}>
       <Form.Item label="户型名称">
         {getFieldDecorator('apartmentName', {
           rules: [
             { required: true, message: '请填写户型名称' },
             { max: 10, message: '户型名称不超过10个字符' },
           ],
-        })(<Input placeholder="户型名称不超过10个字符"/>)}
+        })(<Input placeholder="户型名称不超过10个字符" />)}
       </Form.Item>
       <Form.Item label="销售状态">
         {getFieldDecorator('marketStatus', {
           rules: [{ required: true, message: '请选择销售状态' }],
         })(
           <Select placeholder="销售状态">
-            <Option value="未开盘">未开盘</Option>
-            <Option value="在售">在售</Option>
-            <Option value="售罄">售罄</Option>
-          </Select>
+            {saleType.map((item, _) => (
+              <Option value={item.id}>{item.name}</Option>
+            ))}
+          </Select>,
         )}
       </Form.Item>
       <Form.Item label="图片" help="建议图片尺寸336px*336px，比例1:1,格式：jpg">
-      {getFieldDecorator('img', {
+        {getFieldDecorator('img', {
           rules: [{ required: true, message: '请上传户型图片' }],
-      })(
-        <ImageUpload />,
-      )}
+        })(<ImageUpload />)}
       </Form.Item>
       <Form.Item label="厅室">
         {getFieldDecorator('houseType', {
           rules: [{ required: true, message: '请填写户型厅室' }],
-        })(<Input placeholder="例如: 三室一厅" />)}
+        })(
+          <Select placeholder="户型">
+            {houseType.map((item, _) => (
+              <Option value={item.id}>{item.name}</Option>
+            ))}
+          </Select>,
+        )}
       </Form.Item>
       <Form.Item label="面积">
         {getFieldDecorator('buildingArea', {
-            rules: [{ validator: validMinNum }]
-          })(<InputNumber precision={2} min={0} step={0.01} addonAfter="㎡" />)}
+          rules: [{ validator: validMinNum }],
+        })(<InputNumber precision={2} min={0} step={0.01} addonAfter="㎡" />)}
       </Form.Item>
       <Form.Item label="使用面积">
         {getFieldDecorator('insideArea', {
-            rules: [{ validator: validMinNum }]
-          })(<InputNumber precision={2} min={0} step={0.01} addonAfter="㎡" />)}
+          rules: [{ validator: validMinNum }],
+        })(<InputNumber precision={2} min={0} step={0.01} addonAfter="㎡" />)}
       </Form.Item>
       <Form.Item label="权重" help="数值越大越靠前">
         {getFieldDecorator('orderNo', {
-            rules: [{ validator: validMinNum }]
-          })(<InputNumber min={0} step={1} style={fullWidth} />)}
+          rules: [{ validator: validMinNum }],
+        })(<InputNumber min={0} step={1} style={fullWidth} />)}
       </Form.Item>
-      <Form.Item label=" " colon={false} style={{marginTop: '2em'}}>
-        <Button loading={loading} style={{marginLeft: '4em'}} type="primary" htmlType="submit">保存</Button>
-        <Button style={{marginLeft: '2em'}} onClick={props.onCancel}>取消</Button>
+      <Form.Item label=" " colon={false} style={{ marginTop: '2em' }}>
+        <Button loading={loading} style={{ marginLeft: '4em' }} type="primary" htmlType="submit">
+          保存
+        </Button>
+        <Button style={{ marginLeft: '2em' }} onClick={props.onCancel}>
+          取消
+        </Button>
       </Form.Item>
     </ModalForm>
-  )
-}
+  );
+};
 
-export default Form.create({})(AMForm)
+export default Form.create({})(AMForm);

src/pages/building/Edit/Apartment/List.jsx

@@ -2,6 +2,48 @@ import React from 'react'
 import { Button, Table, Popconfirm } from 'antd'
 import moment from 'moment'
 
+const saleType = [
+  {
+    id: 1,
+    name: '待售',
+  },
+  {
+    id: 2,
+    name: '售罄',
+  },
+  {
+    id: 3,
+    name: '在售',
+  },
+  {
+    id: 4,
+    name: '在租',
+  },
+]
+
+const houseType = [
+  {
+    id: 1,
+    name: '1室',
+  },
+  {
+    id: 2,
+    name: '2室',
+  },
+  {
+    id: 3,
+    name: '3室',
+  },
+  {
+    id: 4,
+    name: '4室',
+  },
+  {
+    id: 5,
+    name: '5室及以上',
+  },
+]
+
 export default (props) => {
   const columns = [
     {
@@ -13,11 +55,13 @@ export default (props) => {
       title: '销售状态',
       dataIndex: 'marketStatus',
       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: '面积',

src/pages/building/Edit/Apartment/index.jsx

@@ -64,7 +64,7 @@ export default (props) => {
       <div>
         <Button type="primary" onClick={() => handleEdit()}>新增户型</Button>
       </div>
-      <Form visible={visible} onCancel={() => setVisible(false)} formData={apartmentRef.current} onSuccess={handleSuccess} />
+      <Form buildingId={id} visible={visible} onCancel={() => setVisible(false)} formData={apartmentRef.current} onSuccess={handleSuccess} />
       <List loading={loading} dataSource={list} onEdit={handleEdit} onDelete={handleDelete} />
     </div>
   )

src/pages/news/list/compents/Poster.jsx

@@ -4,6 +4,7 @@ import { message, Radio, Input, Button } from 'antd';
 import apis from '@/services/apis';
 import router from 'umi/router';
 import request from '@/utils/request';
+import Poster from '@/components/Poster';
 import ImageUploader from '@/components/XForm/ImageUpload';
 import logo from '../../../../assets/logo.svg';
 import yinhao from '../../../../assets/yinhao.png';
@@ -14,6 +15,8 @@ import xiaochengxu from '../../../../assets/xiaochengxu.png';
 
 const { TextArea } = Input;
 export default props => {
+  const target = { id: '', type: 'news' };
+
   const { newsId } = props;
   const [inputValue, changeInput] = useState('');
   const [textAreaValue, changeTextArea] = useState('');
@@ -24,7 +27,6 @@ export default props => {
     if (newsId) {
       request({ ...apis.activity.poster, params: { targetId: newsId, targetType: 'news' } })
         .then(data => {
-     
           if (data.length > 0) {
             setPosterId(data[0].posterId);
             changeImg(data[0].posterImg);
@@ -35,11 +37,9 @@ export default props => {
         .catch(err => {
           message.info(err.msg || err.message);
         });
-
-    } 
+    }
   }, []);
 
-  
   const submitPoster = () => {
     if (newsId) {
       if (posterId) {
@@ -90,163 +90,7 @@ export default props => {
 
   return (
     <div>
-      <div style={{ display: 'flex' }}>
-        <div
-          style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}
-        >
-          <div
-            style={{
-              width: '375px',
-              height: '700px',
-              backgroundColor: '#fff',
-              boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)',
-              position: 'relative',
-              margin: '0 auto',
-            }}
-          >
-            <img
-              style={{ width: '100%', height: '300px' }}
-              src={imgValue ? imgValue : poster1}
-              alt=""
-            />
-            <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
-              <img
-                style={{
-                  width: '70px',
-                  height: '70px',
-                  border: '4px solid #fff',
-                  borderRadius: '35px',
-                  marginLeft: '16px',
-                }}
-                src={touxiang}
-                alt=""
-              />
-              <span
-                style={{
-                  color: '#222',
-                  fontWeight: '600',
-                  margin: '24px 10px 0 14px',
-                  fontSize: '17px',
-                }}
-              >
-                喵喵
-              </span>
-              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您阅读</span>
-              <span style={{ color: '#999', margin: '25px 0 0 60px', fontSize: '17px' }}>
-                2019.09.21
-              </span>
-            </div>
-            <p
-              style={{
-                margin: '10px 20px',
-                fontSize: '20px',
-                color: '#222',
-                fontWeight: '600',
-                display: '-webkit-box',
-                lineClamp: '3',
-                height: '60px',
-                WebkitLineClamp: '2',
-                WebkitBoxOrient: 'vertical',
-                overflow: 'hidden',
-                textOverflow: 'ellipsis',
-              }}
-            >
-              {inputValue ? inputValue : '海报标题'}
-            </p>
-
-            <img src={yinhao} style={{ width: '30px', marginLeft: '20px' }} alt="" />
-            <p
-              style={{
-                margin: '16px 20px 28px 20px',
-                fontSize: '17px',
-                color: '#999',
-                display: '-webkit-box',
-                lineClamp: '3',
-                height: '72px',
-                WebkitLineClamp: '3',
-                WebkitBoxOrient: 'vertical',
-                overflow: 'hidden',
-                textOverflow: 'ellipsis',
-              }}
-            >
-              {textAreaValue ? textAreaValue : '海报描述'}
-            </p>
-            <div
-              style={{
-                backgroundColor: '#f1f1f1',
-                padding: '22px 30px',
-                boxShadow: '0px 6px 12px -4px #dcdcdc',
-                position: 'relative',
-              }}
-            >
-              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
-              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>进入资讯查看详情</p>
-              <img
-                style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }}
-                src={xiaochengxu}
-                alt=""
-              />
-            </div>
-          </div>
-          <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>
-            海报模板
-          </p>
-        </div>
-
-        <div>
-          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-            <p
-              style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}
-            >
-              资讯海报图
-            </p>
-            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
-          </div>
-          <p
-            style={{
-              fontSize: '0.5vw',
-              color: '#A9A9A9',
-              marginLeft: '230px',
-              marginBottom: '30px',
-            }}
-          >
-            建议图片尺寸：640*670px，比例64:67,格式：jpg，用于资讯海报
-          </p>
-          <div
-            style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}
-          >
-            <p
-              style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}
-            >
-              海报标题
-            </p>
-            <Input
-              style={{ width: '20vw' }}
-              value={inputValue}
-              placeholder="请输入海报标题"
-              onChange={e => changeInput(e.target.value)}
-            />
-          </div>
-          <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
-            <p
-              style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}
-            >
-              海报描述
-            </p>
-            <TextArea
-              rows={5}
-              maxLength={1024}
-              value={textAreaValue}
-              onChange={e => changeTextArea(e.target.value)}
-            />
-          </div>
-        </div>
-      </div>
-      <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}>
-        {' '}
-        确定
-      </Button>
-      <Button onClick={cancelPage}>取消</Button>
+      <Poster target={target} {...props} />
     </div>
   );
 };

src/pages/news/list/compents/Share.jsx

@@ -5,75 +5,82 @@ import apis from '@/services/apis';
 import router from 'umi/router';
 import request from '@/utils/request';
 import ImageUploader from '@/components/XForm/ImageUpload';
+import Share from '@/components/Share';
 import logo from '../../../../assets/logo.svg';
 import poster2 from '../../../../assets/poster2.png';
 
-
-export default (props) => {
+export default props => {
   const { newsId } = props;
-  const [inputValue, changeInput] = useState('')
-  const [imgValue, changeImg] = useState('')
-  const [shareContentId, setShareContentId] = useState('')
-  
-  if(newsId){
-    useEffect(() => {
-      request({ ...apis.activity.shareContent, params: {targetId: newsId,targetType: 'news'},}).then((data) => {
-        console.log(data,"2222")
-        if(data.length > 0){
-          setShareContentId(data[0].shareContentId)
-          changeImg(data[0].shareContentImg)
-          changeInput(data[0].shareContentTitle)
-        }
-      }).catch((err) => {
-        message.info(err.msg || err.message)
-      })
-    }, [])
-  }
+  const [inputValue, changeInput] = useState('');
+  const [imgValue, changeImg] = useState('');
+  const [shareContentId, setShareContentId] = useState('');
+
+  useEffect(() => {
+    if (newsId) {
+      request({ ...apis.activity.shareContent, params: { targetId: newsId, targetType: 'news' } })
+        .then(data => {
+          console.log(data, '2222');
+          if (data.length > 0) {
+            setShareContentId(data[0].shareContentId);
+            changeImg(data[0].shareContentImg);
+            changeInput(data[0].shareContentTitle);
+          }
+        })
+        .catch(err => {
+          message.info(err.msg || err.message);
+        });
+    }
+  }, []);
 
   const submitShare = () => {
-    if(newsId){
-      if(shareContentId){
-        request({ ...apis.activity.updateShareContent, urlData: {id: shareContentId},data: {targetId: newsId,shareContentType: 'news',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
-          message.info("保存成功")
-        }).catch((err) => {
-          message.info(err.msg || err.message)
+    if (newsId) {
+      if (shareContentId) {
+        request({
+          ...apis.activity.updateShareContent,
+          urlData: { id: shareContentId },
+          data: {
+            targetId: newsId,
+            shareContentType: 'news',
+            shareContentImg: imgValue,
+            shareContentTitle: inputValue,
+          },
         })
-       }else{
-        request({ ...apis.activity.addShareContent, data: {targetId: newsId,shareContentType: 'news',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
-          setShareContentId(data.shareContentId)
-          message.info("保存成功")
-        }).catch((err) => {
-          message.info(err.msg || err.message)
+          .then(data => {
+            message.info('保存成功');
+          })
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
+      } else {
+        request({
+          ...apis.activity.addShareContent,
+          data: {
+            targetId: newsId,
+            shareContentType: 'news',
+            shareContentImg: imgValue,
+            shareContentTitle: inputValue,
+          },
         })
-       }
-     }else{
-      message.warn("请先保存基本信息数据")
-     }
-  }
+          .then(data => {
+            setShareContentId(data.shareContentId);
+            message.info('保存成功');
+          })
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
+      }
+    } else {
+      message.warn('请先保存基本信息数据');
+    }
+  };
 
   const cancelPage = () => {
     router.go(-1);
   };
-
-  return <div style={{ padding: '20px' }}>
-    <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
-      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
-      <div>
-        <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />橙蕉互动</p>
-        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '置业V客厅 精准获客平台'}</p>
-        <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
-      </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)} />
-    </div>
-    <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
-      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>资讯分享好友图</p>
-      <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+  const target = { id: '', type: 'news' };
+  return (
+    <div style={{ padding: '20px' }}>
+      <Share target={target} {...props} />
     </div>
-    <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于资讯分享好友</p>
-    <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
-    <Button onClick={cancelPage}>取消</Button>
-  </div>
-  }
+  );
+};