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

config/config.js

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

config/routes.js

@@ -64,9 +64,23 @@ export default [
           },
           {
             path: '/resource',
-            name: '资源管理',
-            component: './resource',
+            name: '资源位管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/resource/openScreen',
+                name: '开屏通知',
+                component: './resource/openScreen',
+              },
+              {
+                path: '/resource/openScreen/edit',
+                name: '开屏通知修改',
+                hideInMenu: true,
+                component: './resource/openScreen/edit',
+              },
+            ],
           },
+          
           {
             component: './404',
           },

src/pages/resource/index.jsx

@@ -1,197 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal,Breadcrumb } from 'antd';
-import router from 'umi/router';
-import moment from 'moment';
-import styles from './style.less';
-import { fetch, apis } from '../../utils/request';
-import request from '../../utils/request';
-import AuthButton from '@/components/AuthButton';
-
-function header(props) {
-
-    const [houseIdList, setHouseIdList] = useState([])
-
-    const handleSubmit = (e, props) => {
-        e.preventDefault();
-       
-      }
-
-      function handleReset() {
-        props.form.resetFields();
-        // getList({ pageNum: 1, pageSize: 10 });
-      }
-
-      const toEditGoods = (goodsId) => () => {
-        // router.push({
-        //   pathname: '/integralMall/editGoods',
-        //   query: {
-        //     goodsId
-        //   },
-        // });
-      }
-
-      const toDelBatch = rowData => () =>{
-        console.log(houseIdList, 'houseIdListhouseIdList')
-        if(houseIdList.length < 1){
-          openNotificationWithIcon('error', '请先选择需要删除的批次')
-          return
-        }
-    
-        Modal.confirm({
-          title: '确定删除批次信息吗',
-          okText: '确定',
-          cancelText: '取消',
-          onOk () {
-            // request({ ...apis.house.deleteTaSalesBatch, data: houseIdList, }).then((data) => {
-            //   message.info("操作成功")
-            //   getList({ pageNum: 1, pageSize: 10 });
-            // }).catch((err) => {
-            // })
-          },
-        });
-      }
-
-      const rowSelection = {
-        onChange: (selectedRowKeys, selectedRows) => {
-          console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
-          setHouseIdList(selectedRows)
-        },
-      };
-
-      const data =[]
-
-      const columns = [
-        {
-          title: '通知标题',
-          dataIndex: 'title',
-          key: 'title',
-          align: 'center',
-          render: (text, record) => <img src={record.imgUrl} className={styles.touxiang} />,
-        },
-        {
-          title: '通知图',
-          dataIndex: 'imgUrl',
-          key: 'imgUrl',
-          align: 'center',
-    
-        },
-        {
-          title: '关联业务类型',
-          dataIndex: 'pointPrice',
-          key: 'pointPrice',
-          align: 'center',
-        },
-        {
-          title: '关联业务',
-          dataIndex: 'totalNum',
-          key: 'totalNum',
-          align: 'center',
-        },
-        {
-          title: '发布状态',
-          dataIndex: 'status',
-          key: 'status',
-          align: 'center',
-        //   render: (status)=> <><span>{status == 1 ? '是' : '否'}</span></>
-        },
-        {
-          title: '自动下架时间',
-          dataIndex: 'inventory',
-          key: 'inventory',
-          align: 'center',
-        },
-        {
-          title: '权重',
-          dataIndex: 'status',
-          key: 'status',
-          align: 'center',
-         
-        },
-        {
-            title: '新增时间',
-            dataIndex: 'inventory',
-            key: 'inventory',
-            align: 'center',
-          },
-        {
-          title: '操作',
-          dataIndex: 'handle',
-          key: 'handle',
-          align: 'center',
-          render: (x, row) => (
-            <>
-              
-            
-                <span style={{ color: '#FF925C',cursor: 'pointer' }} onClick={toEditGoods(row.goodsId)}>
-                  编辑<Icon type="form" className={styles.edit} />
-                </span>
-              
-            </>
-          ),
-        },
-      ];
-
-    const { getFieldDecorator } = props.form
-  return (
-
-    <>
-   <div>
-   <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
-          {getFieldDecorator('goodsName')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="通知标题"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('status')(
-            <Select style={{ width: '180px' }} placeholder="关联业务类型">
-             
-            </Select>,
-          )}
-        </Form.Item>
-       
-        <Form.Item>
-          {getFieldDecorator('priceLesser')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="关联业务"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('qbc')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="发布状态"
-            />,
-          )}
-           </Form.Item>
-        <Form.Item>
-          
-              <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-                搜索
-              </Button>
-         {/*  */}
-            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
-            </Button>
-        </Form.Item>
-      </Form>
-
-      <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
-
-      <Button type="danger" className={styles.addBtn} onClick={toDelBatch()} style={{marginLeft:'30px'}} >删除</Button>
-
-      <Table rowSelection={rowSelection} rowKey="goodsList" dataSource={data} columns={columns} pagination={false} />
-   </div>
-    </>
-  )
-}
-
-const WrappedHeader = Form.create({ name: 'header' })(header);
-
-export default WrappedHeader

src/pages/resource/openScreen/edit.jsx

@@ -0,0 +1,206 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Modal, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } 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 moment from 'moment';
+
+
+
+const header = props => {
+
+    const [data, setData] = useState({})
+
+    const [datas, setDatas] = useState([])//表格数据
+    const [visible, setVisible] = useState()
+    const [formsdate, setFormsDate] = useState({})
+    //   const [page, changePage] = useState({})
+    useEffect(() => {
+
+        setVisible(false)
+
+    }, [])
+    const ModalData = props => {
+        
+    const data = []
+
+    const columns = [
+        {
+            title: '样例名',
+            dataIndex: 'title',
+            key: 'title',
+            align: 'center',
+
+        },
+        {
+            title: '权重',
+            dataIndex: 'imgUrl',
+            key: 'imgUrl',
+            align: 'center',
+            
+        },
+        {
+            title: '新增人',
+            dataIndex: 'pointPrice',
+            key: 'pointPrice',
+            align: 'center',
+        },
+        {
+            title: '新增时间',
+            dataIndex: 'totalNum',
+            key: 'totalNum',
+            align: 'center',
+        },
+        {
+            title: '修改人',
+            dataIndex: 'status',
+            key: 'status',
+            align: 'center',
+            // render: (status) => <><span>{status == 1 ? '是' : '否'}</span></>
+        },
+        {
+            title: '修改时间',
+            dataIndex: 'inventory',
+            key: 'inventory',
+            align: 'center',
+        },
+    
+        {
+            title: '操作',
+            dataIndex: 'handle',
+            key: 'handle',
+            align: 'center',
+            render: (x, row) => (
+                <>
+
+
+                    <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.goodsId)}>
+                        选择<Icon type="form" className={styles.edit} />
+                    </span>
+
+                </>
+            ),
+        },
+    ];
+        return (
+            <>
+                <div>
+                <Input placeholder="样例名" style={{ width: 200 }} />
+                <Button>搜索</Button><Button>重置</Button>
+                <Table  rowKey="goodsList" dataSource={data} columns={columns} pagination={false} />
+                </div>
+            </>
+        )
+    }
+
+    const onSelectBusiness = (e) => {
+        console.log('11111')
+
+    }
+
+    const fields = [
+        {
+            label: '通知标题',
+            name: 'channelProxyName',
+            type: FieldTypes.Text,
+            value: data.channelProxyName,
+            rules: [
+                { required: true, message: '请输入通知标题' },
+                { max: 20, message: '通知标题名称不超过20个字符' }
+            ]
+        },
+        {
+            label: '通知图',
+            name: 'channelImg',
+            type: FieldTypes.ImageUploader,
+            value: data.channelImg,
+            rules: [
+                { required: true, message: '请选择通知图' },
+            ],
+            help: '建议尺寸：N*N px，比例：N:N，格式：jpg，大小：不超过300KB，用于开屏通知主图',
+        },
+        {
+            label: '关联业务类型',
+            name: 'channelContactName',
+
+            value: data.channelContactName,
+            type: FieldTypes.Select,
+
+        },
+        {
+            label: '关联业务',
+            name: 'channelTel',
+            value: data.channelTel,
+            //   type: FieldTypes.Text,
+            render: (text, record) => <div style={{ display:'flex' }}><div onClick={handleShowModel}>选择关联业务</div><div>234</div></div>,
+        },
+        {
+            label: '发布状态',
+            name: 'userName',
+            type: FieldTypes.Text,
+            rules: [
+                { required: true, message: '请选择有效发布状态' },
+            ],
+
+        },
+        {
+            label: '自动下架时间',
+            name: 'expireDate',
+            type: FieldTypes.DatePicker,
+            value: data.expireDate != null ? moment(data.expireDate, 'YYYY-MM-DD') : null,
+
+            help: '下架时间仅支持未来时间，到达未来时间后系统自动将开屏通知发布状态修改为否'
+
+        },
+        {
+            label: '权重',
+            name: 'appMaxNum',
+            type: FieldTypes.Number,
+            value: data.appMaxNum,
+
+            help: '用于列表排序，越大越靠前'
+        },
+    ]
+
+    const handleSubmit = (values) => {
+
+    }
+    //model
+    const handleShowModel = val => {
+        setVisible(true);
+    }
+
+    const handleCancel = val => {
+        setVisible(false);
+    }
+
+    const cancelPage = () => {
+        router.push({
+            pathname: '/resource/pathname',
+        });
+    }
+
+    return (
+        <>
+            <div>
+                <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+                <Modal
+                    title="选择关联业务"
+                    visible={visible}
+                    //  onOk={handleOk}
+
+                    onCancel={handleCancel}
+                    footer={null}
+                >
+                    <ModalData></ModalData>
+                    {/* <Table rowSelection={rowSelection} rowKey="goodsList" dataSource={data} columns={columns} pagination={false} /> */}
+                </Modal>
+            </div>
+        </>
+    )
+}
+
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedNormalLoginForm

src/pages/resource/openScreen/index.jsx

@@ -0,0 +1,216 @@
+import React, { useState, useEffect } from 'react';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import styles from './style.less';
+import { fetch, apis } from '../../../utils/request';
+import request from '../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+
+function header(props) {
+
+    const [houseIdList, setHouseIdList] = useState([])
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 });
+    }, [])
+    // 查询列表
+    const getList = params => {
+        // request({ ...apis.house.taSalesBatch, params: { ...params } }).then(data => {
+        //     console.log(data)
+        //     setData(data)
+        // })
+    }
+
+    const toEditResource = (id) => () => {
+        router.push({
+          pathname: '/resource/openScreen/edit',
+        //   query: {
+        //     id
+        //   },
+        });
+      }
+
+    const handleSubmit = (e, props) => {
+        e.preventDefault();
+
+    }
+
+    function handleReset() {
+        props.form.resetFields();
+        // getList({ pageNum: 1, pageSize: 10 });
+    }
+
+    const toDelBatch = rowData => () => {
+        console.log(houseIdList, 'houseIdListhouseIdList')
+        if (houseIdList.length < 1) {
+            openNotificationWithIcon('error', '请先选择需要删除的批次')
+            return
+        }
+
+        Modal.confirm({
+            title: '确定删除批次信息吗',
+            okText: '确定',
+            cancelText: '取消',
+            onOk() {
+                // request({ ...apis.house.deleteTaSalesBatch, data: houseIdList, }).then((data) => {
+                //   message.info("操作成功")
+                //   getList({ pageNum: 1, pageSize: 10 });
+                // }).catch((err) => {
+                // })
+            },
+        });
+    }
+
+    const rowSelection = {
+        onChange: (selectedRowKeys, selectedRows) => {
+            console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+            setHouseIdList(selectedRows)
+        },
+    };
+
+    const changePageNum = pageNumber => {
+        // getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+    }
+
+    const data = []
+
+    const columns = [
+        {
+            title: '通知标题',
+            dataIndex: 'title',
+            key: 'title',
+            align: 'center',
+
+        },
+        {
+            title: '通知图',
+            dataIndex: 'imgUrl',
+            key: 'imgUrl',
+            align: 'center',
+            render: (text, record) => <img src={record.imgUrl} className={styles.touxiang} />,
+        },
+        {
+            title: '关联业务类型',
+            dataIndex: 'pointPrice',
+            key: 'pointPrice',
+            align: 'center',
+        },
+        {
+            title: '关联业务',
+            dataIndex: 'totalNum',
+            key: 'totalNum',
+            align: 'center',
+        },
+        {
+            title: '发布状态',
+            dataIndex: 'status',
+            key: 'status',
+            align: 'center',
+            // render: (status) => <><span>{status == 1 ? '是' : '否'}</span></>
+        },
+        {
+            title: '自动下架时间',
+            dataIndex: 'inventory',
+            key: 'inventory',
+            align: 'center',
+        },
+        {
+            title: '权重',
+            dataIndex: 'status',
+            key: 'status',
+            align: 'center',
+
+        },
+        {
+            title: '新增时间',
+            dataIndex: 'inventory',
+            key: 'inventory',
+            align: 'center',
+        },
+        {
+            title: '操作',
+            dataIndex: 'handle',
+            key: 'handle',
+            align: 'center',
+            render: (x, row) => (
+                <>
+
+
+                    <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.goodsId)}>
+                        编辑<Icon type="form" className={styles.edit} />
+                    </span>
+
+                </>
+            ),
+        },
+    ];
+
+    const { getFieldDecorator } = props.form
+    return (
+
+        <>
+            <div>
+                <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+                    <Form.Item>
+                        {getFieldDecorator('goodsName')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="通知标题"
+                            />,
+                        )}
+                    </Form.Item>
+                    <Form.Item>
+                        {getFieldDecorator('status')(
+                            <Select style={{ width: '180px' }} placeholder="关联业务类型">
+
+                            </Select>,
+                        )}
+                    </Form.Item>
+
+                    <Form.Item>
+                        {getFieldDecorator('priceLesser')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="关联业务"
+                            />,
+                        )}
+                    </Form.Item>
+                    <Form.Item>
+                        {getFieldDecorator('qbc')(
+                            <Input
+                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                                placeholder="发布状态"
+                            />,
+                        )}
+                    </Form.Item>
+                    <Form.Item>
+
+                        <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+                            搜索
+              </Button>
+                        {/*  */}
+                        <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                            重置
+            </Button>
+                    </Form.Item>
+                </Form>
+
+                <Button type="danger" className={styles.addBtn} onClick={toEditResource()}>新增</Button>
+
+                <Button type="primary" className={styles.addBtn} onClick={toDelBatch()} style={{ marginLeft: '30px' }} >删除</Button>
+
+                <Table rowSelection={rowSelection} rowKey="goodsList" dataSource={data} columns={columns} pagination={false} />
+
+                <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                    {/* <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} /> */}
+                </div>
+            </div>
+        </>
+    )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader