Merge branch 'master' of http://git.ycjcjy.com/estateagents/pc-channel

config/config.js

@@ -133,7 +133,7 @@ export default {
 
   proxy: {
     '/api': {
-      target: 'http://192.168.2.49:8080/',
+      target: 'http://127.0.0.1:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

src/app.js

@@ -1,3 +1,24 @@
+(function (doc, win) {
+  var docEl = doc.documentElement,
+    resizeEvt = 'onorientationchange' in window ? 'onorientationchange' : 'resize',
+    recalc = function () {
+      var clientWidth = docEl.clientWidth;
+      if (!clientWidth) return;
+      if (clientWidth < 1700) {
+        docEl.style.fontSize = '150px';
+      } else if ( 1700>=clientWidth>2000 ){
+        docEl.style.fontSize = '170px';
+      }else{
+        docEl.style.fontSize = '170px';
+        // docEl.style.fontSize = 100 * (clientWidth / 1400) + 'px';
+      }
+    };
+
+  if (!doc.addEventListener) return;
+  win.addEventListener(resizeEvt, recalc, false);
+  doc.addEventListener('DOMContentLoaded', recalc, false);
+})(document, window);
+
 export const dva = {
   config: {
     onError(e) {

src/components/uploadImage/ImageUpload.jsx

@@ -0,0 +1,81 @@
+import React from 'react';
+import { Upload, Icon, message, Modal } from 'antd';
+import './style.less';
+import { uploaderProps } from '../../utils/upload';
+
+
+
+class ImageUpload extends React.Component {
+
+  state = {
+    loading: false,
+    previewVisible: false,
+    previewImage: '',
+    fileList: this.getPropsFileList(),
+  };
+
+  componentDidUpdate(prevProps) {
+    // 直接 setState 会死循环
+    if (prevProps.value !== this.props.value) {
+      this.setState({ fileList: this.getPropsFileList() })
+    }
+  }
+
+  getPropsFileList() {
+    return !this.props.value ? [] : [{
+      uid: '-1',
+      name: 'image.png',
+      status: 'done',
+      url: this.props.value,
+    }]
+  }
+
+
+  handleChange = ({ file, fileList }) => {
+    const { status, response } = file
+    this.setState({ fileList, loading: status === "uploading" })
+
+    if (typeof this.props.onChange === 'function' && status != "uploading") {
+      const image = status === 'done' ? response : undefined
+      this.props.onChange(image);
+    }
+  };
+
+  handleCancel = () => this.setState({ previewVisible: false });
+
+  handlePreview = async file => {
+    console.log(file)
+    this.setState({
+      previewImage: file.url,
+      previewVisible: true,
+    });
+  };
+
+  render() {
+    const uploadButton = (
+      <div>
+        <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? "loading" : "plus"} />
+      </div>
+    );
+
+    return (
+      <>
+      <Upload
+        {...uploaderProps}
+        listType="picture-card"
+        className="avatar-uploader"
+        onChange={this.handleChange}
+        fileList={this.state.fileList}
+        onPreview={this.handlePreview}
+      >
+        {this.state.fileList.length >= 1 ? null : uploadButton}  
+      </Upload>
+      <Modal visible={this.state.previewVisible} footer={null} onCancel={this.handleCancel}>
+      <img alt="example" style={{ width: '100%' }} src={this.state.previewImage} />
+      </Modal>
+      </>
+    );
+  }
+}
+
+export default ImageUpload;

src/components/uploadImage/style.less

@@ -0,0 +1,8 @@
+:global {
+  .avatar-uploader {
+    & > .ant-upload {
+      width: 128px;
+      height: 128px;
+    }
+  }
+}

src/layouts/BasicLayout.jsx

@@ -103,7 +103,7 @@ const BasicLayout = props => {
 
         return <Link to={menuItemProps.path}>{defaultDom}</Link>;
       }}
-      breadcrumbRender={(routers = []) => [
+      breadcrumbRender={(routers = []) => console.log('---------menuList---->', routers) ||[
         {
           path: '/',
           breadcrumbName: formatMessage({

src/layouts/BlankLayout.jsx

@@ -1,5 +1,20 @@
 import React from 'react';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
 
-const Layout = ({ children }) => <div>{children}</div>;
+const Layout = ({ children }) => (
+  <PageHeaderWrapper style={{height:'auto',background:'rgba(240,240,240,1)',paddingTop:'15px'}}>
+    <div
+      style={{
+        backgroundColor: '#fff',
+        padding: '32PX 28px',
+        boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
+        borderRadius: '12px',
+        minHeight:'60vh'
+      }}
+    >
+      {children}
+    </div>
+  </PageHeaderWrapper>
+);
 
 export default Layout;

src/pages/sample/demand/edit.jsx

@@ -37,30 +37,35 @@ const header = props => {
         name: 'sampleName',
         type: FieldTypes.Text,
         value: data.sampleName,
+        props: {disabled: true}
       },    
       {
         label: '下单组织',
         name: 'orgName',
         type: FieldTypes.Text,
         value: data.orgName,
+        props: {disabled: true}
       },
       {
         label: '下单人',
         name: 'orderer',
         value: data.orderer,
         type: FieldTypes.Text,
+        props: {disabled: true}
       },
       {
         label: '联系方式',
         name: 'phone',
         value: data.phone,
         type: FieldTypes.Text,
+        props: {disabled: true}
       },
       {
         label: '下单时间',
         name: 'createDate',
         type: FieldTypes.DatePicker ,
         value: data.createDate != null ? moment(data.createDate, 'YYYY-MM-DD') : null,
+        props: {disabled: true}
       },
       {
         label: '需求单状态',
@@ -76,14 +81,21 @@ const header = props => {
       {
         label: '备注',
         name: 'remark',
-        type: FieldTypes.Text,
         value: data.remark,
+        render: <Input placeholder="不超过100个字" maxLength = "100"/>
+      },
+      {
+        label: '最后修改时间',
+        name: 'updateDate',
+        type: FieldTypes.DatePicker ,
+        value: data.updateDate != null ? moment(data.updateDate, 'YYYY-MM-DD') : null,
+        props: {disabled: true}
       },
       {
         label: '需求描述',
         name: 'demandContent',
         value: data.demandContent,
-        render: <Wangedit />
+        render: <Wangedit contenteditable={false}/>
       },
     ]
   

src/pages/sample/demand/index.jsx

@@ -50,7 +50,16 @@ function header(props) {
   }
 
   const changePageNum = (pageNumber) => {
-    getList({ pageNum: pageNumber, pageSize: 10 })
+    let {createDate, ...submitValue}  = props.form.getFieldsValue()
+    if(null != createDate && createDate.length > 0){
+      const [startCreateDate, endCreateDate] = createDate
+      submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
+      submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
+    }else{
+      submitValue.startCreateDate = null
+      submitValue.endCreateDate = null
+    }
+    getList({ pageNum: pageNumber, pageSize: 10, ...submitValue })
   }
 
   const rowSelection = {
@@ -131,7 +140,7 @@ function header(props) {
       dataIndex: 'createDate',
       key: 'createDate',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD')}`}</span></>,
+      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
     },
     {
       title: '需求单状态',

src/pages/sample/h5/components/H5Card.jsx

@@ -12,7 +12,7 @@ const { Meta } = Card
 const H5Card = props => {
   const { h5Data } = props
 
-  const colerArr = ["#2db7f5","#87d068","#108ee9","magenta","red","volcano","orange","green","geekblue","purple"]
+  const colerArr = ["#2db7f5", "#87d068", "#108ee9", "magenta", "red", "volcano", "orange", "green", "geekblue", "purple"]
   const toEdit = () => {
     router.push({
       pathname: '/sample/h5/edit',
@@ -29,7 +29,7 @@ const H5Card = props => {
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        request({ ...apis.sample.puth5, urlData: { id: h5Data.sampleId }}).then((data) => {
+        request({ ...apis.sample.puth5, urlData: { id: h5Data.sampleId } }).then((data) => {
           message.info('操作成功！')
           props.onChange()
         }).catch((err) => {
@@ -40,24 +40,35 @@ const H5Card = props => {
     });
   }
 
-    return (
-      <>
+  return (
+    <>
       <Card
         hoverable
-        style={{ width: 480,height: 450,marginTop: 50,position: "relative" }}
-        cover={<img height="335px" alt="example" onClick={toEdit} src={h5Data.coverImg} />}
+        style={{
+          minWidth: '240px',
+          marginRight: '0.1rem',
+          height: '2.1rem',
+          background: 'rgba(255, 255, 255, 1)',
+          boxShadow: '0px 0px 16px 2px rgba(0, 0, 0, 0.12)',
+          borderRadius: '12px',
+          marginBottom: '0.1rem',
+          position: 'relative',
+          padding: '0.1rem'
+        }}
+        // style={{ width: 480,height: 450,marginTop: 50,position: "relative" }}
+        cover={<img  width="100%" style={{height:'1.3rem'}} alt="example" onClick={toEdit} src={h5Data.coverImg} />}
         extra={<a onClick={deleteSample}>删除</a>}
         title={h5Data.status == 1 ? '已发布' : h5Data.status == 0 ? '未发布' : ''}
       >
         <Meta onClick={toEdit} title={h5Data.sampleName} />
-        <div style={{position: "absolute", bottom: "50px", right: "20px", margin: '20px 0'}}>
-          {(h5Data.tags || []).map((x,i) => {
+        <div style={{ position: "absolute", bottom: "50px", right: "20px", margin: '20px 0' }}>
+          {(h5Data.tags || []).map((x, i) => {
             return <Tag color={colerArr[i]}>{x}</Tag>
           })}
         </div>
       </Card>
     </>
-    )
-  }
- 
-  export default H5Card
+  )
+}
+
+export default H5Card

src/pages/sample/h5/components/SelectContact.jsx

@@ -76,7 +76,6 @@ const SelectContact = props => {
       key: 'drainageId',
       align: 'center',
       ellipsis: true,
-      render: text => <a>{text}</a>,
     },
     {
       title: '性别',
@@ -84,7 +83,7 @@ const SelectContact = props => {
       key: 'drainageId',
       align: 'center',
       ellipsis: true,
-      render: text => <a>{text}</a>,
+    render: text => <span>{text == 1 ? '男' : text == 2 ? '女' : '' }</span>,
     },
     {
       title: '头像',
@@ -92,7 +91,7 @@ const SelectContact = props => {
       key: 'drainageId',
       align: 'center',
       ellipsis: true,
-      render: text => <a>{text}</a>,
+      render: text => <img src={text} width="40px" height="40px"/>,
     },
     {
       title: '固话',
@@ -135,7 +134,7 @@ const SelectContact = props => {
   return (
     <div>
       <Row gutter={24}>
-        <Col span={2}><div onClick={() => setVisible(true)}>{group.groupName}</div></Col>
+        <Col span={2}><div onClick={() => setVisible(true)}><a>{group.groupName}</a></div></Col>
         <Col span={16}><div>
         {selectedData.map(x => {
           return <Tag size="large" key={x.contactId} closable onClose={() => removeSelected(x)}>{x.contactName}</Tag>

src/pages/sample/h5/edit.jsx

@@ -1,23 +1,23 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert, Radio } from 'antd';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert, Radio, InputNumber } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import XForm, { FieldTypes } from '../../../components/XForm';
 import router from 'umi/router';
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import Wangedit from '../../../components/Wangedit/Wangedit'
-import ImageUpload from '../../../components/XForm/ImageUpload'
+import ImageUpload from '../../../components/uploadImage/ImageUpload'
 import SelectContact from './components/SelectContact';
 import moment from 'moment';
 
 const formItemLayout = {
   labelCol: {
-    xs: { span: 24 },
-    sm: { span: 2 },
+    xs: { span: 6 },
+    sm: { span: 6 },
   },
   wrapperCol: {
-    xs: { span: 24 },
-    sm: { span: 16 },
+    xs: { span: 18 },
+    sm: { span: 18 },
   },
 };
 
@@ -52,7 +52,6 @@ const header = props => {
       // e.stopPropagation();
       props.form.validateFieldsAndScroll((err, values) => {
         console.log(values,"valuesvaluesvaluesvaluesvaluesvaluesvalues")
-        debugger
         if (!err) {
           if(sampleId){
             request({ ...apis.sample.updateh5, urlData: { id: sampleId }, data: { ...values }}).then((data) => {
@@ -79,6 +78,7 @@ const header = props => {
     }
 
     function sampleTypeChange(e) {
+      console.log(data,"111111111111")
       setTypeState(e.target.value)
     }
   
@@ -116,19 +116,19 @@ const header = props => {
           </Form.Item>
           <Form.Item label="发布状态" >
             {getFieldDecorator('status', {
-              initialValue: "1",
+              initialValue: 1,
             })(
             <Select style={{ width: '180px' }}>
-              <Select.Option value="1">是</Select.Option>
-              <Select.Option value="0">否</Select.Option>
+              <Select.Option value={1}>是</Select.Option>
+              <Select.Option value={0}>否</Select.Option>
             </Select>)}
           </Form.Item>
           <Form.Item label="权重" help="数值越大越靠前">
-            {getFieldDecorator('orderNo')(<Input />)}
+            {getFieldDecorator('orderNo')(<InputNumber placeholder="权重越大，在列表中的排序越靠前" />)}
           </Form.Item>
           <Form.Item label="标签" help="标签长度6个字，最多3个标签">
             {getFieldDecorator('tags')(
-              <Select mode="tags" placeholder="输入后选中" style={{ width: '1016px' }}>
+              <Select mode="tags" placeholder="输入标签，回车确认后再输入下一个" style={{ width: '1016px' }}>
 
               </Select>,
             )}
@@ -145,11 +145,14 @@ const header = props => {
           </Form.Item>
           {typeState === 'link' && <Form.Item label="外部链接">
             {getFieldDecorator('sampleContentLink',{
+              initialValue: data.sampleContentLink,
               rules: [{ max: 300, message: '外部链接不超过300个字符' }],
             })(<Input placeholder="填写外部链接，如公众号链接或135编辑器生成的页面链接" />)}
           </Form.Item>}
           {typeState === 'rich' && <Form.Item label="样例内容" >
-            {getFieldDecorator('sampleContent')(
+            {getFieldDecorator('sampleContent', {
+              rules: [{ required: true, message: '请输入样例内容' }],
+            })(
               <Wangedit />,
             )}
           </Form.Item> }

src/pages/sample/h5/index.jsx

@@ -33,6 +33,7 @@ function header(props) {
   // 提交事件
   const handleSubmit = (e, props) => {
     e.preventDefault();
+    e.stopPropagation();
     props.form.validateFields((err, values) => {
       if (!err) {
         let {createDate, ...submitValue} = values
@@ -44,7 +45,7 @@ function header(props) {
           submitValue.startCreateDate = null
           submitValue.endCreateDate = null
         }
-        getList({ pageNum: 1, pageSize: 10, ...values })
+        getList({ pageNum: 1, pageSize: 10, ...submitValue })
       }
     });
   }