zls

config/config.js

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

src/pages/resource/openScreen/edit.jsx

@@ -136,7 +136,7 @@ const header = props => {
                 dataIndex: 'createDate',
                 key: 'createDate',
                 align: 'center',
-                render: (x, row) => <><span>{row.createDate?`${moment(row.createDate).format('YYYY-MM-DD')}`:''}</span></>,
+                render: (x, row) => <><span>{row.createDate?`${moment(row.createDate).format('YYYY-MM-DD H:mm:ss')}`:''}</span></>,
             },
             {
                 title: '修改人',
@@ -150,7 +150,7 @@ const header = props => {
                 dataIndex: 'updateDate',
                 key: 'updateDate',
                 align: 'center',
-                render: (x, row) => <><span>{row.updateDate?`${moment(row.updateDate).format('YYYY-MM-DD')}`:''}</span></>,
+                render: (x, row) => <><span>{row.updateDate?`${moment(row.updateDate).format('YYYY-MM-DD H:mm:ss')}`:''}</span></>,
             },
 
             {
@@ -225,6 +225,15 @@ const header = props => {
 
     }
 
+    // function onChange(value, dateString) {
+    //     console.log('Selected Time: ', value);
+    //     console.log('Formatted Selected Time: ', dateString);
+    //   }
+      
+    //   function onOk(value) {
+    //     console.log('onOk: ', value);
+    //   }
+
     const handleChange = (value) => { }
 
     function disabledDate(current) {
@@ -251,15 +260,15 @@ const header = props => {
             rules: [
                 { required: true, message: '请选择通知图' },
             ],
-            help: '建议尺寸：N*N px，比例：N:N，格式：jpg，大小：不超过300KB，用于开屏通知主图',
+            help: '建议尺寸：835*556 px，比例：3:2，格式：jpg，大小：不超过300KB，用于开屏通知主图',
         },
         {
             label: '关联业务类型',
             name: 'targetType',
             type: FieldTypes.Select,
             dict: [{
-                name: "H5",
-                value: "H5"
+                name: "H5样例",
+                value: "H5样例"
             },
             ],
             value: data.targetType,
@@ -275,17 +284,18 @@ const header = props => {
             label: '发布状态',
             type: FieldTypes.Select,
             name: 'status',
-            dict: [{
-                name: "删除",
-                value: "-1"
-            },
+            dict: [
+                // {
+            //     name: "删除",
+            //     value: "-1"
+            // },
             {
-                name: "已下架",
-                value: "0"
+                name: "是",
+                value: "1"
             },
             {
-                name: "已上架",
-                value: "1"
+                name: "否",
+                value: "0"
             },],
             value: data.status === undefined ? null : data.status + "",
 
@@ -297,7 +307,21 @@ const header = props => {
         {
             label: '自动下架时间',
             name: 'invalidTime',
-            render: (text, record) => <DatePicker disabledDate={disabledDate}></DatePicker>,
+            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,
 
@@ -317,15 +341,16 @@ const header = props => {
     const handleSubmit = (values) => {
 
         values.targetId = sample.sampleId
-        values.sampleName = sample.sampleName
+        values.targetName = sample.sampleName
         if (noticeId) {
             values.noticeId = noticeId
-            request({ ...apis.openScreen.put, urlData: { id: noticeId }, data: { ...values } }).then((data) => {
-                message.info('提交成功！')
-                cancelPage();
-            }).catch((err) => {
-                message.error(err.msg || err.message)
-            })
+            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('提交成功！')

src/pages/resource/openScreen/index.jsx

@@ -46,7 +46,7 @@ function header(props) {
     const toDelBatch = rowData => () => {
         console.log(taNoticeList, 'taNoticeList')
         if (taNoticeList.length < 1) {
-            message.error('请先选择要删除的数据！')
+            message.error('请至少选择一条数据')
             return
         }
 
@@ -58,7 +58,7 @@ function header(props) {
                 request({ ...apis.openScreen.delete, data: taNoticeList, }).then((data) => {
                   message.info("操作成功")
                   getList({ pageNum: 1, pageSize: 10 });
-  
+                  setTaNoticeList([])
                 }).catch((err) => {
                 })
             },
@@ -102,14 +102,14 @@ function header(props) {
             dataIndex: 'status',
             key: 'status',
             align: 'center',
-            render: (status) => <><span>{status === 1 ? '已上架' : status === 0 ? '已下架':'删除'}</span></>
+            render: (status) => <><span>{status === 1 ? '是' : status === 0 ? '否':'否'}</span></>
         },
         {
             title: '自动下架时间',
             dataIndex: 'invalidTime',
             key: 'invalidTime',
             align: 'center',
-            render: (x, row) => <><span>{row.invalidTime?`${moment(row.invalidTime).format('YYYY-MM-DD')}`:''}</span></>,
+            render: (x, row) => <><span>{row.invalidTime?`${moment(row.invalidTime).format('YYYY-MM-DD H:mm:ss')}`:''}</span></>,
         },
         {
             title: '权重',
@@ -123,7 +123,7 @@ function header(props) {
             dataIndex: 'createDate',
             key: 'createDate',
             align: 'center',
-            render: (x, row) => <><span>{row.createDate?`${moment(row.createDate).format('YYYY-MM-DD')}`:''}</span></>,
+            render: (x, row) => <><span>{row.createDate?`${moment(row.createDate).format('YYYY-MM-DD H:mm:ss')}`:''}</span></>,
         },
         {
             title: '操作',
@@ -135,7 +135,7 @@ function header(props) {
 
 
                     <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditResource(row.noticeId)}>
-                        编辑<Icon type="form" className={styles.edit} />
+                        查看详情<Icon type="form" className={styles.edit} />
                     </span>
 
                 </>
@@ -168,13 +168,13 @@ function header(props) {
                     <Form.Item>
                         {getFieldDecorator('targetType')(
                             <Select style={{ width: '180px' }} placeholder="关联业务类型">
-                                   <Option value='H5'>H5</Option>
+                                   <Option value='H5'>H5样例</Option>
                             </Select>,
                         )}
                     </Form.Item>
 
                     <Form.Item>
-                        {getFieldDecorator('priceLesser')(
+                        {getFieldDecorator('targetName')(
                             <Input
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                                 placeholder="关联业务"
@@ -186,9 +186,9 @@ function header(props) {
 
                             <Select style={{ width: '180px' }} placeholder="发布状态">
                                  <Option value="">全部</Option>
-                                <Option value="-1">删除</Option>
-                                <Option value="0">未发布</Option>
-                                <Option value="1">已发布</Option>
+                                {/* <Option value="-1">删除</Option> */}
+                                <Option value="0">否</Option>
+                                <Option value="1">是</Option>
 
                             </Select>,