合并

config/config.js

@@ -23,11 +23,11 @@ const plugins = [
         // default true, when it is true, will use `navigator.language` overwrite default
         baseNavigator: true,
       },
-      // dynamicImport: {
-      //   loadingComponent: './components/PageLoading/index',
-      //   webpackChunkName: true,
-      //   level: 3,
-      // },
+      dynamicImport: {
+        loadingComponent: './components/PageLoading/index',
+        webpackChunkName: true,
+        level: 3,
+      },
       pwa: pwa
         ? {
           workboxPluginMode: 'InjectManifest',

src/components/SelectButton/BuildSelect.jsx

@@ -13,6 +13,7 @@ const { Option } = Select;
  */
 const BuildingSelect = (props) => {
   const [ data, setData ] = useState([])
+  const [ value, setValue ] = useState(props.value)
 
   useEffect(() => {
     getCityList();
@@ -28,8 +29,13 @@ const BuildingSelect = (props) => {
     })
   }
 
+  const handleChange = (e) => {
+    setValue(e)
+    props.onChange(e)
+  }
+
   return (
-      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择项目" onChange={props.onChange}>
+      <Select value={value} style={{ width: '180px' }} placeholder="请选择项目" onChange={handleChange}>
           {data.map(building => (
             <Option key={building.buildingId}>{building.buildingName}</Option>
           ))}

src/components/XForm/ImageUpload.jsx

@@ -34,10 +34,10 @@ class ImageUpload extends React.Component {
     }
   };
 
-  render () {
+  render() {
     const uploadButton = (
       <div>
-        <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? "loading" : "plus"} />        
+        <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? "loading" : "plus"} />
       </div>
     );
 
@@ -56,8 +56,8 @@ class ImageUpload extends React.Component {
         {(this.state.imageUrl || value) ? (
           <img src={this.state.imageUrl || value} alt="avatar" style={{ width: "100%" }} />
         ) : (
-          uploadButton
-        )}
+            uploadButton
+          )}
       </Upload>
     );
   }

src/layouts/SecurityLayout.jsx

@@ -25,6 +25,8 @@ class SecurityLayout extends React.Component {
     const { isReady } = this.state;
     const { children, loading, currentUser } = this.props;
 
+    console.log('------------>', loading, currentUser)
+
     if ((!currentUser.userId && loading) || !isReady) {
       return <PageLoading />;
     }

src/models/login.js

@@ -36,7 +36,6 @@ const Model = {
       }
 
       yield put(routerRedux.replace(redirect || '/'));
-      
     },
 
     *getCaptcha({ payload }, { call }) {
@@ -60,7 +59,7 @@ const Model = {
   },
   reducers: {
     changeLoginStatus(state, { payload }) {
-      setAuthority('admin');
+      setAuthority((payload.user.roles || []).map(x => x.roleId));
       return { ...state, status: 'ok', type: payload.type };
     },
   },

src/pages/activity/editActivity.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message } from 'antd';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import moment from 'moment';
@@ -14,6 +14,7 @@ import ImageUploader from '../../components/XForm/ImageUpload';
 import logo from '../../assets/logo.png';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
 
 /**
  *
@@ -22,7 +23,8 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
  * @returns
  */
 const Edit = (props) => {
-  const [tab, changeTab] = useState('basic')
+  const [tab, changeTab] = useState('poster')
+  // const [tab, changeTab] = useState('basic')
   const dynamicId = props.location.query.dynamicId
   const [dynamicData, setDynamicData] = useState({})
   if (dynamicId) {
@@ -165,77 +167,99 @@ const Edit = (props) => {
   }
 
   const Poster = (props) => {
+    const [inputValue, changeInput] = useState('')
+    const [textAreaValue, changeTextArea] = useState('')
+    const [imgValue, changeImg] = useState('')
+    return <div>
+      <div style={{ display: 'flex' }}>
+        <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
+          <div style={{ width: '375px', height: '785px', 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 : 'http://img0.imgtn.bdimg.com/it/u=4246326797,2657995307&fm=26&gp=0.jpg'} alt="" />
 
-    return <div style={{ display: 'flex' }}>
-      <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
-        <div style={{ width: '375px', height: '785px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
+            <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
+              <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src="http://img0.imgtn.bdimg.com/it/u=3463541938,2540701974&fm=26&gp=0.jpg" 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 style={{ width: '100%', height: '300px' }} src="http://img0.imgtn.bdimg.com/it/u=4246326797,2657995307&fm=26&gp=0.jpg" alt="" />
+            <img src={yinhao} style={{ width: '30px', marginLeft: '10px' }} alt="" />
+            <p style={{
+              margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
+              display: '-webkit-box', lineClamp: '3', height: '76px',
+              WebkitLineClamp: '3',
+              WebkitBoxOrient: 'vertical',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis'
+            }}>{textAreaValue ? textAreaValue : '海报描述'}</p>
+            <img src={PosterBottom} style={{ width: '100%' }} alt="" />
+          </div>
+          <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
+        </div>
 
-          <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
-            <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src="http://img0.imgtn.bdimg.com/it/u=3463541938,2540701974&fm=26&gp=0.jpg" 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 >
+          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
+            <ImageUploader onChange={e => changeImg(e)} />
+          </div>
+          <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' }} 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} onChange={e => changeTextArea(e.target.value)} />
           </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'
-          }}>破晓·内容生态下半场的版权到企业高峰论坛会议破晓·内容生态下半场的版权到企业高峰论坛活动</p>
 
-          <img src={yinhao} style={{ width: '30px', marginLeft: '10px' }} alt="" />
-          <p style={{
-            margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
-            display: '-webkit-box', lineClamp: '3', height: '76px',
-            WebkitLineClamp: '3',
-            WebkitBoxOrient: 'vertical',
-            overflow: 'hidden',
-            textOverflow: 'ellipsis'
-          }}>活动描述:破晓·内容生态下半场的版权到企业高峰论坛活动破晓·内容生态下半场的版权到企业高峰论坛活动破晓·内容生态下半场的版权到企业高峰论坛活动</p>
-          <img src={PosterBottom} style={{ width: '100%' }} alt="" />
         </div>
-        <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
       </div>
-      <div></div>
+      <Button type="primary" onClick={() => router.go(-1)} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+      <Button onClick={() => router.go(-1)}>取消</Button>
     </div>
+
   }
 
+
+
   const Share = (props) => {
-    const fields = [
-      {
-        label: '分享模板',
-        name: 'buildingId',
-        render: () => <div style={{ margin: ' 10px 20px' }}>
-          <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' }}>置业V客厅 精准获客平台</p>
-          <img style={{ width: '200px', height: '140px' }} src="http://house.china.com.cn/nanjing/UserFiles/20171124/11070256.jpg" alt="" />
-        </div>,
-      },
-      {
-        label: '海报标题',
-        name: 'newsTypeName',
-        type: FieldTypes.Text,
-        value: '',
-        rules: [
-          { required: true, message: '请输入咨询名称' },
-        ]
-      },
-      {
-        label: '类型图',
-        name: 'newsTypeImg',
-        type: FieldTypes.ImageUploader,
-        value: 'newsTypeImg',
-      },
-    ]
-    const handleSubmit = (values) => {
+    const [inputValue, changeInput] = useState('')
+    const [imgValue, changeImg] = useState('')
+    // const changeInputValue = e => {
+    //   changeInput(e.target.value)
+    // }
 
-    }
-    return <div>
-      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+    // const handleSubmit = (values) => {
+
+    // }
+
+    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: '140px' }} src={imgValue ? imgValue : 'http://house.china.com.cn/nanjing/UserFiles/20171124/11070256.jpg'} 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="请输入海报标题" 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 onChange={e => changeImg(e)} />
+      </div>
+      <Button type="primary" htmlType="submit" style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+      <Button onClick={() => router.go(-1)}>取消</Button>
     </div>
   }
 

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, InputNumber } from 'antd';
 import moment from 'moment';
 import request from '../../../../../utils/request';
 import apis from '../../../../../services/apis';
@@ -24,12 +24,6 @@ const formItemLayout = {
 };
 
 function AddBuilding(props) {
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [dataSource, setDataSource] = useState({ records: [] })
-
-  const [buildingAreaTags, setBuildingAreaTags] = useState({ tags: ['Unremovable', 'Tag 2', 'Tag 3'], inputVisible: false, inputValue: '' })
-
-
   const { getFieldDecorator } = props.form;
 
   function handleSubmit(e) {
@@ -80,7 +74,7 @@ function AddBuilding(props) {
           <Form.Item label="标签" hasFeedback>
             {getFieldDecorator('tags')(
               <Select mode="multiple" placeholder="标签" style={{ width: '1016px' }}>
-              <Option value="未知">未知</Option>
+                <Option value="未知">未知</Option>
               </Select>,
             )}
           </Form.Item>
@@ -172,7 +166,7 @@ function AddBuilding(props) {
             {getFieldDecorator('parkingRate')(<Input />)}
           </Form.Item>
           <Form.Item label="规划户数" hasFeedback>
-            {getFieldDecorator('familyNum')(<Input />)}
+            {getFieldDecorator('familyNum')(<InputNumber />)}
           </Form.Item>
           <Form.Item label="物业公司" hasFeedback>
             {getFieldDecorator('serviceCompany')(<Input />)}
@@ -187,7 +181,7 @@ function AddBuilding(props) {
             {getFieldDecorator('receivedDate')(<DatePicker />)}
           </Form.Item>
           <Form.Item label="产权年限" hasFeedback>
-            {getFieldDecorator('rightsYear')(<Input />)}
+            {getFieldDecorator('rightsYear')(<InputNumber />)}
           </Form.Item>
           <Form.Item label="预售许可证" hasFeedback>
             {getFieldDecorator('decoration')(

src/pages/system/intention.jsx

@@ -19,8 +19,10 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
  */
  const Edit = (props) => {
   const [ data, setData ] = useState([])
+  const [ buildingIdValue, setBuildingIdData ] = useState('')
 
   const changBuilding = (buildingId) => {
+    setBuildingIdData(buildingId)
     request({
       url: '/api/admin/tdBizEventIntention',
       method: 'GET',
@@ -31,6 +33,32 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     })
   }
 
+  const changeBox = (x) => (e) => {
+    setData(data.map((item) => {
+      return x.eventId === item.eventId ? {...item, checkbox: e.target.checked} : item
+    }))
+  }
+
+  const changeInput = (x) => (e) => {
+    setData(data.map((item) => {
+      return x.eventId === item.eventId ? {...item, intention: e.target.value} : item
+    }))
+  }
+
+  const submitValue = () => {
+    console.log(buildingIdValue)
+    if(buildingIdValue === ''){
+      return
+    }
+    request({
+      url: '/api/admin/taBuildingIntentionAddOrUpdate/' + buildingIdValue,
+      method: 'POST',
+      data
+    }).then((data) => {
+      message.info("保存成功")
+    })
+  }
+
   return (
     <>
     <Row>
@@ -39,26 +67,25 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
       </Col>
     </Row>
     <Row>
-      <Col span={6} offset={6}>
+      <Col span={3} offset={3}>
         用户操作
       </Col>
-      <Col span={6} offset={6}>
+      <Col span={3} offset={3}>
         意向值
       </Col>
     </Row>
     {data.map((x) => {
-      console.log(x)
       return <Row>
-                <Col span={6} offset={6}>
-                {x.eventName}
+                <Col span={3} offset={3}>
+                  <Checkbox checked={x.checkbox} onChange={changeBox(x)}>{x.eventName}</Checkbox>
                 </Col>
-                <Col span={6} offset={6}>
-                  {x.intention}
+                <Col span={3} offset={3}>
+                  <Input value={x.intention} onChange={changeInput(x)}/>
                 </Col>
               </Row>
     })}
     <Row>
-      <Button type="primary" className={styles.searchBtn} >确定</Button>
+      <Button type="primary" className={styles.searchBtn} onClick={submitValue}>确定</Button>
     </Row>
     </>
   );

src/pages/system/report.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message,Checkbox } from 'antd';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message,Checkbox,Row, Col  } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import moment from 'moment';
@@ -62,7 +62,9 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   return (
     <>
-      <Checkbox.Group options={data} value={checkData} onChange={onChange} />
+      <Row>
+        <Checkbox.Group options={data} value={checkData} onChange={onChange} />
+      </Row>
       <Button type="primary" className={styles.searchBtn} onClick={saveCheckedReport}>提交</Button>
     </>
   );

src/utils/request.js

@@ -4,6 +4,8 @@
  */
 import request from 'umi-request';
 import { notification } from 'antd';
+import apis from '../services/apis';
+
 const codeMessage = {
   200: '服务器成功返回请求的数据。',
   201: '新建或修改数据成功。',
@@ -25,7 +27,7 @@ const codeMessage = {
 const replaceURLParams = (url, params = {}) => {
   return Object.keys(params).reduce((acc, k) => { // 此方法对每个元素进行处理
     const re = new RegExp(`:${k}(?!w)`, 'i')
-    return acc.replace(re, args[k])
+    return acc.replace(re, params[k])
   }, url)
 }
 
@@ -92,6 +94,9 @@ request.interceptors.response.use(async (response, options) => {
   }
 });
 
+
+const fetch = api => options => request(api.url, {...api, ...options || {}})
+
 export default config => {
   if (typeof config === 'string') {
     return request(config);
@@ -100,3 +105,5 @@ export default config => {
     return request(url, options);
   }
 };
+
+export { fetch, apis }