zls

config/config.js

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

config/routes.js

@@ -68,7 +68,7 @@ export default [
               },
               {
                 path: '/resource/openScreen/edit',
-                name: '开屏通知修改',
+                name: '开屏通知编辑',
                 hideInMenu: true,
                 component: './resource/openScreen/edit',
               },

src/pages/resource/openScreen/edit.jsx

@@ -1,7 +1,9 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Modal, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { Input, DatePicker, Pagination, Search, 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 XForm, { FieldTypes, createForm } from '../../../components/XForm';
+// import XForm, { FieldTypes } from '../../../components/XForm';
+import styles from './style.less';
 import router from 'umi/router';
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
@@ -11,101 +13,226 @@ import moment from 'moment';
 
 const header = props => {
 
+    const noticeId = props.location.query.id
+
     const [data, setData] = useState({})
+    const [sample, setsample] = useState({})
 
-    const [datas, setDatas] = useState([])//表格数据
     const [visible, setVisible] = useState()
     const [formsdate, setFormsDate] = useState({})
     //   const [page, changePage] = useState({})
     useEffect(() => {
 
         setVisible(false)
-
+        if (noticeId) {
+            console.log(noticeId, 'noticeId')
+            getNewsData(noticeId)
+        }
     }, [])
+
+    const getNewsData = (noticeId) => {
+        request({
+            ...apis.openScreen.get,
+            urlData: { id: noticeId }
+        }).then((data) => {
+            console.log(data, 'data')
+            setData(data)
+            setsample({
+                sampleId: data.targetId,
+                sampleName: data.targetName
+            })
+        }).catch((err) => {
+            message.error(err.msg || err.message)
+        })
+
+    }
+
     const ModalData = props => {
-        
-    const data = []
+        // console.log('data', data.targetId)
+        // const targetId = data.targetType
 
-    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) => (
-                <>
+        const [h5data, setH5data] = useState({})
+        const [name, setName] = useState()
 
+        useEffect(() => {
 
-                    <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.goodsId)}>
-                        选择<Icon type="form" className={styles.edit} />
-                    </span>
 
-                </>
-            ),
-        },
-    ];
+            // console.log(targetType, 'targetType')
+            getH5data({ pageNum: 1, pageSize: 10 })
+
+        }, [])
+        // const getList = params => {
+        //     request({ ...apis.openScreen.list, params: { ...params } }).then(data => {
+        //         setData(data)
+        //     })
+        // }
+        const getH5data = params => {
+            request({
+                ...apis.openScreen.getSample, params: { ...params }
+            }).then((data) => {
+                setH5data(data)
+            }).catch((err) => {
+                message.error(err.msg || err.message)
+            })
+
+        }
+
+
+        const toChoice = (value) => {
+
+            Modal.confirm({
+                title: '是否关联此业务',
+                okText: '确定',
+                cancelText: '取消',
+                onOk() {
+                    setsample({
+                        sampleId: value.sampleId,
+                        sampleName: value.sampleName
+                    })
+                    message.info("操作成功")
+                    setVisible(false)
+                },
+            });
+
+            console.log(value, 'value')
+
+
+        }
+
+        const changePageNum = pageNumber => {
+
+            getH5data({ pageNum: pageNumber, pageSize: 10, })
+        }
+
+
+
+        const columns = [
+            {
+                title: '样例名',
+                dataIndex: 'sampleName',
+                key: 'sampleName',
+                align: 'center',
+
+            },
+            {
+                title: '权重',
+                dataIndex: 'orderNo',
+                key: 'orderNo',
+                align: 'center',
+
+            },
+            {
+                title: '新增人',
+                dataIndex: 'pointPrice',
+                key: 'pointPrice',
+                align: 'center',
+            },
+            {
+                title: '新增时间',
+                dataIndex: 'createDate',
+                key: 'createDate',
+                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={e => toChoice(row)}>
+                            选择<Icon type="form" />
+                        </span>
+                        {/* className={styles.edit} */}
+                    </>
+                ),
+            },
+        ];
+
+        const getname = value => {
+            console.log(value.value, '44')
+            setName(value)
+            // setH5data({ pageNum: 1, pageSize: 10,sampleName:value })
+        }
+
+
+        const handleSubmitName = (e, props) => {
+            e.preventDefault();
+            getH5data({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
+        }
+
+        function handleReset() {
+            props.form.resetFields();
+            getH5data({ pageNum: 1, pageSize: 10 });
+        }
+
+        const { getFieldDecorator } = props.form
         return (
             <>
                 <div>
-                <Input placeholder="样例名" style={{ width: 200 }} />
-                <Button>搜索</Button><Button>重置</Button>
-                <Table  rowKey="goodsList" dataSource={data} columns={columns} pagination={false} />
+                    <Form layout="inline" onSubmit={e => handleSubmitName(e, props)}>
+                        <Form.Item>
+                            {getFieldDecorator('sampleName')(
+                                <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>
+                    <Table rowKey="H5List" dataSource={h5data.records || []} columns={columns} pagination={false} />
+                    <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                        <Pagination showQuickJumper defaultCurrent={1} total={h5data.total} onChange={e => changePageNum(e)} current={h5data.current} />
+                    </div>
                 </div>
             </>
         )
     }
-
+    const ModalDatas = Form.create({ name: 'ModalData' })(ModalData);
     const onSelectBusiness = (e) => {
         console.log('11111')
 
     }
 
+    const handleChange = (value) => { }
+
+    function disabledDate(current) {
+        // Can not select days before today and today
+        return current && current < moment().endOf('day');
+    }
+
     const fields = [
         {
             label: '通知标题',
-            name: 'channelProxyName',
+            name: 'title',
             type: FieldTypes.Text,
-            value: data.channelProxyName,
+            value: data.title,
             rules: [
                 { required: true, message: '请输入通知标题' },
                 { max: 20, message: '通知标题名称不超过20个字符' }
@@ -113,9 +240,9 @@ const header = props => {
         },
         {
             label: '通知图',
-            name: 'channelImg',
+            name: 'noticeImg',
             type: FieldTypes.ImageUploader,
-            value: data.channelImg,
+            value: data.noticeImg,
             rules: [
                 { required: true, message: '请选择通知图' },
             ],
@@ -123,23 +250,40 @@ const header = props => {
         },
         {
             label: '关联业务类型',
-            name: 'channelContactName',
-
-            value: data.channelContactName,
+            name: 'targetType',
             type: FieldTypes.Select,
-
+            dict: [{
+                name: "H5",
+                value: "H5"
+            },
+            ],
+            value: data.targetType,
         },
         {
             label: '关联业务',
-            name: 'channelTel',
-            value: data.channelTel,
+            name: 'targetId',
+            // value: data.targetId,
             //   type: FieldTypes.Text,
-            render: (text, record) => <div style={{ display:'flex' }}><div onClick={handleShowModel}>选择关联业务</div><div>234</div></div>,
+            render: <div onClick={e => handleShowModel(data.targetId)}>{sample.sampleName || '选择关联业务'}</div>,
         },
         {
             label: '发布状态',
-            name: 'userName',
-            type: FieldTypes.Text,
+            type: FieldTypes.Select,
+            name: 'status',
+            dict: [{
+                name: "删除",
+                value: "-1"
+            },
+            {
+                name: "已下架",
+                value: "0"
+            },
+            {
+                name: "已上架",
+                value: "1"
+            },],
+            value: data.status === null ? null : data.status + "",
+
             rules: [
                 { required: true, message: '请选择有效发布状态' },
             ],
@@ -147,18 +291,19 @@ const header = props => {
         },
         {
             label: '自动下架时间',
-            name: 'expireDate',
-            type: FieldTypes.DatePicker,
-            value: data.expireDate != null ? moment(data.expireDate, 'YYYY-MM-DD') : null,
+            name: 'invalidTime',
+            render: (text, record) => <DatePicker disabledDate={disabledDate}></DatePicker>,
+            // type: FieldTypes.DatePicker,
+            value: data.invalidTime != null ? moment(data.invalidTime, 'YYYY-MM-DD') : null,
 
             help: '下架时间仅支持未来时间，到达未来时间后系统自动将开屏通知发布状态修改为否'
 
         },
         {
             label: '权重',
-            name: 'appMaxNum',
+            name: 'orderNo',
             type: FieldTypes.Number,
-            value: data.appMaxNum,
+            value: data.orderNo,
 
             help: '用于列表排序，越大越靠前'
         },
@@ -166,6 +311,25 @@ const header = props => {
 
     const handleSubmit = (values) => {
 
+        values.targetId = sample.sampleId
+        values.sampleName = sample.sampleName
+        if (noticeId) {
+            values.noticeId = noticeId
+            request({ ...apis.openScreen.put, urlData: { id: noticeId }, data: { ...values } }).then((data) => {
+                cancelPage();
+            }).catch((err) => {
+                message.error(err.msg || err.message)
+            })
+        } else {
+            request({ ...apis.openScreen.post, data: { ...values } }).then((data) => {
+                console.log('success')
+                cancelPage();
+            }).catch((err) => {
+                message.error(err.msg || err.message)
+            })
+        }
+
+
     }
     //model
     const handleShowModel = val => {
@@ -194,7 +358,7 @@ const header = props => {
                     onCancel={handleCancel}
                     footer={null}
                 >
-                    <ModalData></ModalData>
+                    <ModalDatas></ModalDatas>
                     {/* <Table rowSelection={rowSelection} rowKey="goodsList" dataSource={data} columns={columns} pagination={false} /> */}
                 </Modal>
             </div>

src/pages/resource/openScreen/index.jsx

@@ -9,42 +9,43 @@ import request from '../../../utils/request';
 import AuthButton from '@/components/AuthButton';
 
 function header(props) {
-
-    const [houseIdList, setHouseIdList] = useState([])
+    
+    const [taNoticeList, setTaNoticeList] = useState([])
+    const [ data, setData ] = useState({})
 
     useEffect(() => {
         getList({ pageNum: 1, pageSize: 10 });
     }, [])
     // 查询列表
+    // /api/admin/listNoticeByCondition
     const getList = params => {
-        // request({ ...apis.house.taSalesBatch, params: { ...params } }).then(data => {
-        //     console.log(data)
-        //     setData(data)
-        // })
+        request({ ...apis.openScreen.list, params: { ...params } }).then(data => {
+            setData(data)
+        })
     }
 
     const toEditResource = (id) => () => {
         router.push({
-          pathname: '/resource/openScreen/edit',
-        //   query: {
-        //     id
-        //   },
+            pathname: '/resource/openScreen/edit',
+              query: {
+                id
+              },
         });
-      }
+    }
 
     const handleSubmit = (e, props) => {
         e.preventDefault();
-
+        getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
     }
 
     function handleReset() {
         props.form.resetFields();
-        // getList({ pageNum: 1, pageSize: 10 });
+        getList({ pageNum: 1, pageSize: 10 });
     }
 
     const toDelBatch = rowData => () => {
-        console.log(houseIdList, 'houseIdListhouseIdList')
-        if (houseIdList.length < 1) {
+        console.log(taNoticeList, 'taNoticeList')
+        if (taNoticeList.length < 1) {
             openNotificationWithIcon('error', '请先选择需要删除的批次')
             return
         }
@@ -54,11 +55,11 @@ function header(props) {
             okText: '确定',
             cancelText: '取消',
             onOk() {
-                // request({ ...apis.house.deleteTaSalesBatch, data: houseIdList, }).then((data) => {
-                //   message.info("操作成功")
-                //   getList({ pageNum: 1, pageSize: 10 });
-                // }).catch((err) => {
-                // })
+                request({ ...apis.openScreen.delete, data: taNoticeList, }).then((data) => {
+                  message.info("操作成功")
+                  getList({ pageNum: 1, pageSize: 10 });
+                }).catch((err) => {
+                })
             },
         });
     }
@@ -66,15 +67,15 @@ function header(props) {
     const rowSelection = {
         onChange: (selectedRowKeys, selectedRows) => {
             console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
-            setHouseIdList(selectedRows)
+            setTaNoticeList(selectedRows)
         },
     };
 
     const changePageNum = pageNumber => {
-        // getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+        getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
     }
 
-    const data = []
+    // const data = []
 
     const columns = [
         {
@@ -86,21 +87,21 @@ function header(props) {
         },
         {
             title: '通知图',
-            dataIndex: 'imgUrl',
-            key: 'imgUrl',
+            dataIndex: 'noticeImg',
+            key: 'noticeImg',
             align: 'center',
-            render: (text, record) => <img src={record.imgUrl} className={styles.touxiang} />,
+            render: (text, record) => <img src={record.noticeImg} className={styles.touxiang} />,
         },
         {
             title: '关联业务类型',
-            dataIndex: 'pointPrice',
-            key: 'pointPrice',
+            dataIndex: 'targetType',
+            key: 'targetType',
             align: 'center',
         },
         {
             title: '关联业务',
-            dataIndex: 'totalNum',
-            key: 'totalNum',
+            dataIndex: 'targetName',
+            key: 'targetName',
             align: 'center',
         },
         {
@@ -108,25 +109,25 @@ function header(props) {
             dataIndex: 'status',
             key: 'status',
             align: 'center',
-            // render: (status) => <><span>{status == 1 ? '是' : '否'}</span></>
+            render: (status) => <><span>{status == 1 ? '是' : '否'}</span></>
         },
         {
             title: '自动下架时间',
-            dataIndex: 'inventory',
-            key: 'inventory',
+            dataIndex: 'invalidTime',
+            key: 'invalidTime',
             align: 'center',
         },
         {
             title: '权重',
-            dataIndex: 'status',
-            key: 'status',
+            dataIndex: 'orderNo',
+            key: 'orderNo',
             align: 'center',
 
         },
         {
             title: '新增时间',
-            dataIndex: 'inventory',
-            key: 'inventory',
+            dataIndex: 'createDate',
+            key: 'createDate',
             align: 'center',
         },
         {
@@ -138,7 +139,7 @@ function header(props) {
                 <>
 
 
-                    <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.goodsId)}>
+                    <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditResource(row.noticeId)}>
                         编辑<Icon type="form" className={styles.edit} />
                     </span>
 
@@ -154,7 +155,7 @@ function header(props) {
             <div>
                 <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
                     <Form.Item>
-                        {getFieldDecorator('goodsName')(
+                        {getFieldDecorator('title')(
                             <Input
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                                 placeholder="通知标题"
@@ -162,9 +163,9 @@ function header(props) {
                         )}
                     </Form.Item>
                     <Form.Item>
-                        {getFieldDecorator('status')(
+                        {getFieldDecorator('targetType')(
                             <Select style={{ width: '180px' }} placeholder="关联业务类型">
-
+                                   <Option value='H5'>H5</Option>
                             </Select>,
                         )}
                     </Form.Item>
@@ -178,11 +179,16 @@ function header(props) {
                         )}
                     </Form.Item>
                     <Form.Item>
-                        {getFieldDecorator('qbc')(
-                            <Input
-                                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-                                placeholder="发布状态"
-                            />,
+                        {getFieldDecorator('status')(
+
+                            <Select style={{ width: '180px' }} placeholder="发布状态">
+                                 <Option value="">全部</Option>
+                                <Option value="-1">删除</Option>
+                                <Option value="0">未发布</Option>
+                                <Option value="1">已发布</Option>
+
+                            </Select>,
+
                         )}
                     </Form.Item>
                     <Form.Item>
@@ -201,10 +207,10 @@ function header(props) {
 
                 <Button type="primary" className={styles.addBtn} onClick={toDelBatch()} style={{ marginLeft: '30px' }} >删除</Button>
 
-                <Table rowSelection={rowSelection} rowKey="goodsList" dataSource={data} columns={columns} pagination={false} />
+                <Table rowSelection={rowSelection} rowKey="taNoticeList" dataSource={data.records} 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} /> */}
+                    <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} />
                 </div>
             </div>
         </>

src/services/apis.js

@@ -76,6 +76,42 @@ const apis = {
       action: 'center',
     },
   },
+  openScreen: {
+    list: {
+      url: `${prefix}/listNoticeByCondition`,
+      method: 'GET',
+      action: 'channel',
+    },
+    post: {
+      url: `${prefix}/taNotice`,
+      method: 'post',
+      action: 'channel',
+    },
+    // /api/admin/taNotice/{id}
+    put: {
+      url: `${prefix}/taNotice/:id`,
+      method: 'put',
+      action: 'channel',
+    },
+
+   
+    get:{
+      url: `${prefix}/taNotice/:id`,
+      method: 'GET',
+      action: 'channel',
+    },
+    delete:{
+      url: `${prefix}/taNotice/batchDelete`,
+      method: 'put',
+      action: 'channel',
+    },
+    getSample:{
+      url: `${prefix}/ListH5SampleByCondition`,
+      method: 'GET',
+      action: 'channel',
+    }
+    // /api/admin/ListH5SampleByCondition
+  },
   
   
 }