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

config/routes.js

@@ -554,6 +554,11 @@ export default [
                 name: '购买套餐',
                 component: './system/miniappSetMeal/index',
               },
+              {
+                path: '/system/sell/index',
+                name: '售前售后联系人',
+                component: './system/sell/index',
+              },
               // {
               //   path: '/system/MiniappTheme',
               //   name: '小程序主题',

src/pages/activity/drainage/DrainageList.jsx

@@ -329,8 +329,9 @@ const header = props => {
 
     const { getFieldDecorator } = props.form;
     {/* <XForm onSubmit={handleSubmit} onCancel={handleCancel} fields={fields} ></XForm> */ }
-
+ 
     return <Form {...formItemLayout} onSubmit={handleSubmit}>
+      <span style={{ color: '#ef273a' }}>发布后请到资源位管理中关联资源位图，否则客户看不到</span>
 
       <Form.Item label="是否投放小程序端" help='选择是后,该活动可投放至小程序的轮播位以及开屏广告'>
         {getFieldDecorator('isMiniapp', {

src/pages/activity/drainage/components/RedPacket.jsx

@@ -111,7 +111,7 @@ function RedPacket(props) {
                 </Form.Item>
                 <Form.Item label="单个红包金额范围/元">
                     {getFieldDecorator('minPacket', {
-                        initialValue: data.minPacket / 100 || 3,
+                        initialValue: data.minPacket / 100 || 1,
                         rules: [
                             { required: true, message: '请设置合适的最小红包值', pattern: new RegExp('^[0-9]{1,5}([.][0-9]{1,2})?$') },
                         ],
@@ -119,7 +119,7 @@ function RedPacket(props) {
                         <InputNumber min={1} max={199} />,
                     )}~
                      {getFieldDecorator('maxPacket', {
-                        initialValue: data.maxPacket / 100 || 3,
+                        initialValue: data.maxPacket / 100 || 199,
                         rules: [
                             { required: true, message: '请设置合适的最大红包值', pattern: new RegExp('^[0-9]{1,5}([.][0-9]{1,2})?$') },
                         ],

src/pages/funds/financialContact/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
+import { Form, Input, Button, Card, Icon, Avatar, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb,Row,Col } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import apis from '../../../services/apis';
@@ -7,8 +7,11 @@ import request from '../../../utils/request';
 
 function financialContact(props) {
 
+    const { Meta } = Card;
     // const [taNoticeList, setTaNoticeList] = useState([])
     const [data, setData] = useState({})
+    const [visible, setVisible] = useState(false);
+    const [currentData, setCurrentData] = useState('');
 
     useEffect(() => {
         getList({ pageNum: 1, pageSize: 10 });
@@ -16,7 +19,7 @@ function financialContact(props) {
     // 查询列表
 
     const getList = params => {
-        request({ ...apis.funds.list, params: { ...params } }).then(data => {
+        request({ ...apis.funds.list, params: { ...params, contactType: "finance" } }).then(data => {
             setData(data)
         })
     }
@@ -87,6 +90,18 @@ function financialContact(props) {
         });
     }
 
+    const openModel =(wxImg)=>{
+        console.log(wxImg)
+        if(wxImg){
+            setVisible(true)
+            setCurrentData(wxImg)
+        }    
+    }
+
+    const onCancel = () => {
+        setVisible(false)
+    }
+
 
     const { getFieldDecorator } = props.form
 
@@ -123,13 +138,49 @@ function financialContact(props) {
             {/* <div style={{ marginTop: '20px' }}>
                 <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
             </div> */}
-            <Table dataSource={data.records} columns={columns} pagination={false} style={{ marginTop: '20px' }} />
+
+            <Row>
+                {(data.records || []).map((x, index) => (
+                <Col key={index} span={6}>
+                     <Card
+                        style={{ width: 300, marginTop: 16 }}
+                        actions={[
+                        <span>{"TEL:" + x.phone}</span>,
+                        <span onClick={() => openModel(x.wxCardImg)}>加微信</span>,
+                        ]}
+                    >
+                        <Meta
+                        style={{ height: 100 }}
+                        avatar={<Avatar src={x.avatar ? x.avatar : "https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"} />}
+                        title={x.contactName}
+                        description={x.appellation}
+                        />
+                    </Card>
+                </Col>
+                ))}
+            </Row>
+
             <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
                 <Pagination
                     showQuickJumper
                     defaultCurrent={1}
                     total={data.total} onChange={e => changePageNum(e)} current={data.current} />
             </div>
+
+
+            <Modal
+                title="加我微信"
+                width="500px"
+                visible={visible}
+                onCancel={onCancel}
+                footer={[]}
+            >
+                <div style={{textAlign:'center',display:'inline-grid',width:'100%'}}>
+                     <img src={currentData} alt="" style={{margin:'0 auto'}}/>
+                <p>扫码加我微信聊</p>
+                </div>
+               
+            </Modal>
         </>
 
     )

src/pages/h5SampleManager/h5Sample/addH5.jsx

@@ -145,6 +145,7 @@ const header = props => {
     return (
         <>
             <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+
                 <Form.Item label="H5活动名称">
                     {getFieldDecorator('name', {
                         rules: [
@@ -216,6 +217,11 @@ const header = props => {
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             <Button onClick={() => router.go(-1)}>取消</Button>
                 </Form.Item>
+                <Row>
+                    <Col span={7}></Col>
+                    <Col span={17}><span style={{ color: '#ef273a' }}>发布后请到资源位管理中关联资源位图，否则客户看不到</span></Col>
+                </Row>
+                
             </Form>
             <Modal
                 title="新增成功"

src/pages/system/sell/index.jsx

@@ -0,0 +1,193 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Card, Icon, Avatar, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb,Row,Col } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+
+function financialContact(props) {
+
+    const { Meta } = Card;
+    // const [taNoticeList, setTaNoticeList] = useState([])
+    const [data, setData] = useState({})
+    const [visible, setVisible] = useState(false);
+    const [currentData, setCurrentData] = useState('');
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 });
+    }, [])
+    // 查询列表
+
+    const getList = params => {
+        request({ ...apis.funds.list, params: { ...params,contactType: "sell" } }).then(data => {
+            setData(data)
+        })
+    }
+
+    function handleSubmit(e) {
+        e.preventDefault();
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                // eslint-disable-next-line no-console
+                console.log('提交数据: ', values)
+                getList({ ...values })
+            }
+        });
+    }
+
+    function handleReset() {
+        props.form.resetFields();
+
+        getList({ pageNum: 1, pageSize: 10 })
+    }
+
+    const columns = [
+        {
+            title: '姓名',
+            dataIndex: 'contactName',
+            key: 'contactName',
+            align: 'center',
+        },
+        {
+            title: '性别',
+            dataIndex: 'sex',
+            key: 'sex',
+            align: 'center',
+            render: x => <span>{x == 1 ? '男' : x === 2 ? '女' : '未知'}</span >,
+        },
+        {
+            title: '头像',
+            dataIndex: 'avatar',
+            key: 'avatar',
+            align: 'center',
+            render: (x, row) => <img src={row.avatar} alt="" width="93px" height="93px"></img >,
+        },
+        {
+            title: '固话',
+            dataIndex: 'telephone',
+            key: 'telephone',
+            align: 'center',
+        },
+        {
+            title: '手机号',
+            dataIndex: 'phone',
+            key: 'phone',
+            align: 'center',
+        },
+        {
+            title: '头衔',
+            dataIndex: 'appellation',
+            key: 'appellation',
+            align: 'center',
+        },
+    ]
+
+    const changePageNum = pageNumber => {
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                getList({ pageNum: pageNumber, pageSize: 10, ...values })
+            }
+        });
+    }
+
+    const openModel =(wxImg)=>{
+        console.log(wxImg)
+        if(wxImg){
+            setVisible(true)
+            setCurrentData(wxImg)
+        }    
+    }
+
+    const onCancel = () => {
+        setVisible(false)
+    }
+
+
+    const { getFieldDecorator } = props.form
+
+    return (
+
+        <>
+            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+                <Form.Item>
+                    {getFieldDecorator('contactName')(
+                        <Input
+                            placeholder="姓名"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('telephone')(
+                        <Input
+                            placeholder="固话"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('phone')(
+                        <Input
+                            placeholder="手机号"
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    <Button type="primary" htmlType="submit"> 搜索</Button>
+                    <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
+                </Form.Item>
+            </Form>
+            {/* <div style={{ marginTop: '20px' }}>
+                <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} >导出</Button>
+            </div> */}
+
+            <Row>
+                {(data.records || []).map((x, index) => (
+                <Col key={index} span={6}>
+                     <Card
+                        style={{ width: 300, marginTop: 16 }}
+                        actions={[
+                        <span>{"TEL:" + x.phone}</span>,
+                        <span onClick={() => openModel(x.wxCardImg)}>加微信</span>,
+                        ]}
+                    >
+                        <Meta
+                        style={{ height: 100 }}
+                        avatar={<Avatar src={x.avatar ? x.avatar : "https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"} />}
+                        title={x.contactName}
+                        description={x.appellation}
+                        />
+                    </Card>
+                </Col>
+                ))}
+            </Row>
+
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination
+                    showQuickJumper
+                    defaultCurrent={1}
+                    total={data.total} onChange={e => changePageNum(e)} current={data.current} />
+            </div>
+
+
+            <Modal
+                title="加我微信"
+                width="500px"
+                visible={visible}
+                onCancel={onCancel}
+                footer={[]}
+            >
+                <div style={{textAlign:'center',display:'inline-grid',width:'100%'}}>
+                     <img src={currentData} alt="" style={{margin:'0 auto'}}/>
+                <p>扫码加我微信聊</p>
+                </div>
+               
+            </Modal>
+        </>
+
+    )
+}
+
+
+const WrappedFinancialContact = Form.create({ name: 'financialContact' })(financialContact);
+
+export default WrappedFinancialContact
+