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

# Conflicts:
#	config/config.js

config/config.js

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

config/routes.js

@@ -102,6 +102,12 @@ export default [
                 name: '开屏通知',
                 component: './resource/openScreen',
               },
+              {
+                path: '/resource/openScreen/add',
+                name: '新增',
+                hideInMenu: true,
+                component: './resource/openScreen/edit',
+              },
               {
                 path: '/resource/openScreen/edit',
                 name: '开屏通知编辑',

src/locales/zh-CN/menu.js

@@ -1,7 +1,7 @@
 export default {
   'menu.welcome': '欢迎',
   'menu.more-blocks': '更多区块',
-  'menu.home': '首页',
+  'menu.home': '服务管理后台',
   'menu.login': '登录',
   'menu.register': '注册',
   'menu.register.result': '注册结果',

src/pages/resource/openScreen/edit.jsx

@@ -25,7 +25,7 @@ const header = props => {
 
         setVisible(false)
         setsample({
-            sampleNme : ''
+            sampleNme: ''
         })
         if (noticeId) {
             console.log(noticeId, 'noticeId')
@@ -136,22 +136,22 @@ const header = props => {
                 dataIndex: 'createDate',
                 key: 'createDate',
                 align: 'center',
-                render: (x, row) => <><span>{row.createDate?`${moment(row.createDate).format('YYYY-MM-DD H:mm:ss')}`:''}</span></>,
-            },
-            {
-                title: '修改人',
-                dataIndex: 'updateUserName',
-                key: 'updateUserName',
-                align: 'center',
-                // render: (status) => <><span>{status == 1 ? '是' : '否'}</span></>
-            },
-            {
-                title: '修改时间',
-                dataIndex: 'updateDate',
-                key: 'updateDate',
-                align: 'center',
-                render: (x, row) => <><span>{row.updateDate?`${moment(row.updateDate).format('YYYY-MM-DD H:mm:ss')}`:''}</span></>,
+                render: (x, row) => <><span>{row.createDate ? `${moment(row.createDate).format('YYYY-MM-DD H:mm:ss')}` : ''}</span></>,
             },
+            // {
+            //     title: '修改人',
+            //     dataIndex: 'updateUserName',
+            //     key: 'updateUserName',
+            //     align: 'center',
+            //     // render: (status) => <><span>{status == 1 ? '是' : '否'}</span></>
+            // },
+            // {
+            //     title: '修改时间',
+            //     dataIndex: 'updateDate',
+            //     key: 'updateDate',
+            //     align: 'center',
+            //     render: (x, row) => <><span>{row.updateDate ? `${moment(row.updateDate).format('YYYY-MM-DD H:mm:ss')}` : ''}</span></>,
+            // },
 
             {
                 title: '操作',
@@ -229,18 +229,49 @@ const header = props => {
     //     console.log('Selected Time: ', value);
     //     console.log('Formatted Selected Time: ', dateString);
     //   }
-      
+
     //   function onOk(value) {
     //     console.log('onOk: ', value);
     //   }
 
     const handleChange = (value) => { }
 
+    function range(start, end) {
+        const result = [];
+        for (let i = start; i < end; i++) {
+            result.push(i);
+        }
+        return result;
+    }
+
     function disabledDate(current) {
         // Can not select days before today and today
         return current && current < moment().endOf('day');
     }
 
+    function disabledDateTime() {
+        return {
+            disabledHours: () => range(0, 24).splice(4, 20),
+            disabledMinutes: () => range(30, 60),
+            disabledSeconds: () => [55, 56],
+        };
+    }
+
+    function disabledRangeTime(_, type) {
+        if (type === 'start') {
+            return {
+                disabledHours: () => range(0, 60).splice(4, 20),
+                disabledMinutes: () => range(30, 60),
+                disabledSeconds: () => [55, 56],
+            };
+        }
+        return {
+            disabledHours: () => range(0, 60).splice(20, 4),
+            disabledMinutes: () => range(0, 31),
+            disabledSeconds: () => [55, 56],
+        };
+    }
+
     const fields = [
         {
             label: '通知标题',
@@ -278,7 +309,7 @@ const header = props => {
             name: 'targetName',
             // value: data.targetId,
             //   type: FieldTypes.Text,
-        render: <div onClick={e => handleShowModel(data.targetId)}>{sample.sampleName || '选择关联业务'}{console.log(sample,'13')}</div>,
+            render: <div onClick={e => handleShowModel(data.targetId)}>{sample.sampleName || '选择关联业务'}{console.log(sample, '13')}</div>,
         },
         {
             label: '发布状态',
@@ -286,17 +317,17 @@ const header = props => {
             name: 'status',
             dict: [
                 // {
-            //     name: "删除",
-            //     value: "-1"
-            // },
-            {
-                name: "是",
-                value: "1"
-            },
-            {
-                name: "否",
-                value: "0"
-            },],
+                //     name: "删除",
+                //     value: "-1"
+                // },
+                {
+                    name: "是",
+                    value: "1"
+                },
+                {
+                    name: "否",
+                    value: "0"
+                },],
             value: data.status === undefined ? null : data.status + "",
 
             rules: [
@@ -307,94 +338,112 @@ const header = props => {
         {
             label: '自动下架时间',
             name: 'invalidTime',
-            render: (text, record) =><DatePicker disabledDate={disabledDate}></DatePicker>,
-            // <div>
-             /* <DatePicker showTime onChange={onChange} onOk={onOk} />
-            <br />
-            <RangePicker
-              showTime={{ format: 'HH:mm' }}
-              format="YYYY-MM-DD HH:mm"
-              onChange={onChange}
-              onOk={onOk}
-            />
-            </div>, */
-            
-            
-            
-            
-            // type: FieldTypes.DatePicker,
-            value: data.invalidTime != null ? moment(data.invalidTime, 'YYYY-MM-DD') : null,
-
-            help: '下架时间仅支持未来时间，到达未来时间后系统自动将开屏通知发布状态修改为否'
+            render: (text, record) =>
+                // <div>
+                /* <DatePicker showTime onChange={onChange} onOk={onOk} />
+               <br /><DatePicker disabledDate={disabledDate}></DatePicker>,
+               <RangePicker
+                 showTime={{ format: 'HH:mm' }}
+                 format="YYYY-MM-DD HH:mm"
+                 onChange={onChange}
+                 onOk={onOk}
+               />
+               </div>, */
+
+                // <div>
+                //   <DatePicker showTime = {data.invalidTime}  disabledDate={disabledDate} onChange={onChange} onOk={onOk} />
+
+                // </div>, 
+                // <DatePicker disabledDate={disabledDate} onChange={ontime}></DatePicker>,
+                <DatePicker
+                // disabledDate={disabledDate}format: 'HH:mm:ss'
+                showTime={{ defaultValue: moment(data.invalidTime, 'YYYY-MM-DD HH:mm:ss') }}
+                    // showTime={{ data.invalidTime, 'HH:mm:ss' }}
+                />,
+        //         < DatePicker
+        //             format = "YYYY-MM-DD HH:mm:ss"
+        //             disabledDate = { disabledDate }
+        //             disabledTime = { disabledDateTime }
+        //             showTime
+        // // onChange={onChange}
+        // ></DatePicker >,
+
+
+        // type: FieldTypes.DatePicker,
+        value: data.invalidTime != null ? moment(data.invalidTime, 'YYYY-MM-DD HH:mm:ss') : null,
+
+        help: '下架时间仅支持未来时间，到达未来时间后系统自动将开屏通知发布状态修改为否'
 
         },
-        {
-            label: '权重',
-            name: 'orderNo',
-            type: FieldTypes.Number,
-            value: data.orderNo,
+    {
+        label: '权重',
+        name: 'orderNo',
+        type: FieldTypes.Number,
+        value: data.orderNo,
 
-            help: '用于列表排序，越大越靠前'
+        help: '用于列表排序，越大越靠前'
         },
     ]
 
-    const handleSubmit = (values) => {
-
-        values.targetId = sample.sampleId
-        values.targetName = sample.sampleName
-        if (noticeId) {
-            values.noticeId = noticeId
-            console.log('3333333',values)
-            // request({ ...apis.openScreen.put, urlData: { id: noticeId }, data: { ...values } }).then((data) => {
-            //     message.info('提交成功！')
-            //     cancelPage();
-            // }).catch((err) => {
-            //     message.error(err.msg || err.message)
-            // })
-        } else {
-            request({ ...apis.openScreen.post, data: { ...values } }).then((data) => {
-                console.log('提交成功！')
-                cancelPage();
-            }).catch((err) => {
-                message.error(err.msg || err.message)
-            })
-        }
+const handleSubmit = (values) => {
+
+    values.targetId = sample.sampleId
+    values.targetName = sample.sampleName
+    if (noticeId) {
+        values.noticeId = noticeId
+        
+        values.invalidTime = moment(values.invalidTime).format('YYYY-MM-DD HH:mm:ss');
+        console.log('3333333', values)
+        request({ ...apis.openScreen.put, urlData: { id: noticeId }, data: { ...values } }).then((data) => {
+            message.info('提交成功！')
+            cancelPage();
+        }).catch((err) => {
+            message.error(err.msg || err.message)
+        })
+    } else {
+        request({ ...apis.openScreen.post, data: { ...values } }).then((data) => {
+            console.log('提交成功！')
+            cancelPage();
+        }).catch((err) => {
+            message.error(err.msg || err.message)
+        })
+    }
 
 
-    }
-    //model
-    const handleShowModel = val => {
-        setVisible(true);
-    }
+}
+//model
+const handleShowModel = val => {
+    setVisible(true);
+}
 
-    const handleCancel = val => {
-        setVisible(false);
-    }
+const handleCancel = val => {
+    setVisible(false);
+}
 
-    const cancelPage = () => {
-        router.push({
-            pathname: '/resource/openScreen',
-        });
-    }
+const cancelPage = () => {
+    router.push({
+        pathname: '/resource/openScreen',
+    });
+}
 
-    return (
-        <>
-            <div>
-                <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
-                <Modal
-                    title="选择关联业务"
-                    visible={visible}
-                    //  onOk={handleOk}
-
-                    onCancel={handleCancel}
-                    footer={null}
-                >
-                    <ModalDatas></ModalDatas>
-              
-                </Modal>
-            </div>
-        </>
-    )
+return (
+    <>
+        <div>
+            <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+            <Modal
+                title="选择关联业务"
+                visible={visible}
+                //  onOk={handleOk}
+
+                onCancel={handleCancel}
+                footer={null}
+            >
+                <ModalDatas></ModalDatas>
+
+            </Modal>
+        </div>
+    </>
+)
 }
 
 const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);

src/pages/resource/openScreen/index.jsx

@@ -25,12 +25,21 @@ function header(props) {
     }
 
     const toEditResource = (id) => () => {
+        if(id){
         router.push({
             pathname: '/resource/openScreen/edit',
               query: {
                 id
               },
         });
+    }else{
+            router.push({
+                pathname: '/resource/openScreen/add',
+                  query: {
+                    id
+                  },
+            });
+        }
     }
 
     const handleSubmit = (e, props) => {
@@ -109,7 +118,7 @@ function header(props) {
             dataIndex: 'invalidTime',
             key: 'invalidTime',
             align: 'center',
-            render: (x, row) => <><span>{row.invalidTime?`${moment(row.invalidTime).format('YYYY-MM-DD H:mm:ss')}`:''}</span></>,
+            render: (x, row) => <><span>{row.invalidTime?`${moment(row.invalidTime).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>,
         },
         {
             title: '权重',
@@ -123,7 +132,7 @@ function header(props) {
             dataIndex: 'createDate',
             key: 'createDate',
             align: 'center',
-            render: (x, row) => <><span>{row.createDate?`${moment(row.createDate).format('YYYY-MM-DD H:mm:ss')}`:''}</span></>,
+            render: (x, row) => <><span>{row.createDate?`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>,
         },
         {
             title: '操作',