bug

src/pages/channel/newCustomer/index.jsx

@@ -15,7 +15,14 @@ import request from '../../../utils/request';
 
 // import RaiseHelpDoc from '../edit/components/RaiseHelpDoc';
 
+// function getDayBegin(dt) {
+//     return moment(dt, 'day').hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
+//   }
 
+
+//   function getDayEnd(dt) {
+//     return moment(dt, 'day').hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
+//   }
 const { RangePicker } = DatePicker
 
 const qrcodelist = props => {
@@ -25,7 +32,8 @@ const qrcodelist = props => {
     const [endDate, setEndDate] = useState(new Date())
     const [startDate, setStartDate] = useState(moment().subtract(7, 'day').toDate())
 
-
+    // setEndDate(`${moment(dateStrings[1]).format('YYYY-MM-DDT00:00:00.000')}Z`)
+    // setStartDate(`${moment(dateStrings[0]).format('YYYY-MM-DDT00:00:00.000')}Z`)
     // 查询列表
     const getList = params => {
         request({ ...apis.channelList.getIntroductionList, params: { ...params, channelId: id } }).then(data => {
@@ -33,12 +41,16 @@ const qrcodelist = props => {
             setData(data)
         })
     }
-
+    const formatDate = (start, end) => {
+        const tempStartDate = `${moment(start).format('YYYY-MM-DDT00:00:00.000')}Z`
+        const tempEndDate = `${moment(end).format('YYYY-MM-DDT23:59:59.999')}Z`
+        return { startDate: tempStartDate, endDate: tempEndDate }
+    }
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
         setEndDate(new Date())
         setStartDate(moment().subtract(7, 'day').toDate())
-        getList({ pageNum: 1, pageSize: 10, startDate, endDate });
+        getList({ pageNum: 1, pageSize: 10, ...formatDate(startDate, endDate) });
     }, [])
 
 
@@ -52,8 +64,7 @@ const qrcodelist = props => {
                 targetType: record.targetType,
                 buildingId: record.buildingId,
                 newCustomers: record.newCustomers,
-                startDate,
-                endDate,
+                ...formatDate(startDate, endDate)
             },
         });
     }
@@ -68,8 +79,7 @@ const qrcodelist = props => {
                 targetType: record.targetType,
                 buildingId: record.buildingId,
                 visitNum: record.visitNum,
-                startDate,
-                endDate,
+                ...formatDate(startDate, endDate)
             },
         });
     }
@@ -84,8 +94,7 @@ const qrcodelist = props => {
                 targetType: record.targetType,
                 buildingId: record.buildingId,
                 visitPersons: record.visitPersons,
-                startDate,
-                endDate,
+                ...formatDate(startDate, endDate)
             },
         });
     }
@@ -95,7 +104,7 @@ const qrcodelist = props => {
      */
     const exportExcel = () => {
         // console.log('fieldsValue', ...props.form.getFieldsValue())
-        request({ ...apis.channelList.getIntroductionListExport, params: { channelId: id, ...props.form.getFieldsValue(), startDate, endDate } })
+        request({ ...apis.channelList.getIntroductionListExport, params: { channelId: id, ...props.form.getFieldsValue(), ...formatDate(startDate, endDate) } })
             .then(data => {
                 if (!data) {
                     return
@@ -124,7 +133,7 @@ const qrcodelist = props => {
         // }
         // sortField, sortOrder
         // getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue(), startDate, endDate, sorter.columnKey, sorter.order })
-        getList({ channelId: id, ...props.form.getFieldsValue(), startDate, endDate, sortField: sorter.columnKey, sortOrder: sorter.order })
+        getList({ channelId: id, ...props.form.getFieldsValue(), ...formatDate(startDate, endDate), sortField: sorter.columnKey, sortOrder: sorter.order })
     };
 
     /**
@@ -186,7 +195,7 @@ const qrcodelist = props => {
 
 
     const changePageNum = pageNumber => {
-        getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue(), startDate, endDate })
+        getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue(), ...formatDate(startDate, endDate) })
     }
 
 
@@ -197,7 +206,7 @@ const qrcodelist = props => {
         props.form.validateFields((err, values) => {
             if (!err) {
                 console.log(values, 'values')
-                getList({ pageNum: 1, pageSize: 10, ...values, startDate, endDate })
+                getList({ pageNum: 1, pageSize: 10, ...values, ...formatDate(startDate, endDate) })
             }
         });
     }
@@ -207,7 +216,7 @@ const qrcodelist = props => {
         props.form.resetFields();
         setEndDate(new Date())
         setStartDate(moment().subtract(7, 'day').toDate())
-        getList({ pageNum: 1, pageSize: 10, startDate: moment().subtract(7, 'day').toDate(), endDate: new Date() })
+        getList({ pageNum: 1, pageSize: 10, ...formatDate(moment().subtract(7, 'day').toDate(), new Date()) })
     }
 
     function onChangetime(dates, dateStrings) {
@@ -223,7 +232,7 @@ const qrcodelist = props => {
         setEndDate(new Date())
         setStartDate(moment().subtract(days, 'day').toDate())
 
-        getList({ pageNum: 1, pageSize: 10, startDate: moment().subtract(days, 'day').toDate(), endDate: new Date() })
+        getList({ pageNum: 1, pageSize: 10, ...formatDate(moment().subtract(days, 'day').toDate(), new Date()) })
         // userResource({ startDate: moment().subtract(days, 'day').toDate(), endDate: new Date() })
     }
 

src/pages/news/list/editNewsList.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message } from 'antd';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../../style/GoodsList.less';
 import apis from '../../../services/apis';
@@ -7,7 +7,7 @@ import moment from 'moment';
 import router from 'umi/router';
 import BuildSelect from '../../../components/SelectButton/BuildSelect2'
 import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
-import { FieldTypes, createForm } from '../../../components/XForm';
+import  { FieldTypes, createForm } from '../../../components/XForm';
 import Wangedit from '../../../components/Wangedit/Wangedit'
 import request from '../../../utils/request'
 import ImageUploader from '../../../components/XForm/ImageUpload';
@@ -22,7 +22,7 @@ import Prompt from 'umi/prompt';
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
 
-let detailVisible = true;
+let detailVisible = false;
 let urlVisible = false;
 
 const setExtraData = (data) => {
@@ -31,12 +31,12 @@ const setExtraData = (data) => {
 }
 
 const handleFormValueChange = (props, changedValues, allValues) => {
-  setExtraData(allValues)
+    setExtraData(allValues)
 }
 
 const XForm = createForm({ onValuesChange: handleFormValueChange })
 
-const cancelPage = () => {
+const cancelPage = () =>{
   router.push({
     pathname: '/news/list/NewsList',
   });
@@ -44,7 +44,7 @@ const cancelPage = () => {
 
 const Basic = (props) => {
   const { data: dynamicData } = props
-  const [changeBuildingId, setChangeBuildingIdData] = useState('')
+  const [ changeBuildingId, setChangeBuildingIdData ] = useState('')
 
   const handleBuildingChange = (e) => {
     console.log(e)
@@ -55,10 +55,10 @@ const Basic = (props) => {
     {
       label: '意向项目',
       name: 'buildingId',
-      render: <BuildSelect onChange={(e => handleBuildingChange(e))} />,
+      render: <BuildSelect onChange={(e => handleBuildingChange(e))}/>,
       value: dynamicData.buildingId,
       rules: [
-        { required: true, message: '请选择所属项目' },
+        {required: true, message: '请选择所属项目'},
       ]
     },
     {
@@ -68,7 +68,7 @@ const Basic = (props) => {
       value: dynamicData.newsImg,
       help: '建议图片尺寸：320*240px，比例5:4,格式：jpg，用于资讯列表',
       rules: [
-        { required: true, message: '请选择资讯列表' },
+        {required: true, message: '请选择资讯列表'},
       ]
     },
     {
@@ -77,28 +77,28 @@ const Basic = (props) => {
       type: FieldTypes.Text,
       value: dynamicData.newsName,
       rules: [
-        { required: true, message: '请输入资讯标题' },
+        {required: true, message: '请输入资讯标题'},
       ]
     },
     {
       label: '资讯类型',
       name: 'newsTypeId',
-      render: <NewsTypeSelect buildingId={changeBuildingId || dynamicData.buildingId} />,
+      render: <NewsTypeSelect buildingId={changeBuildingId || dynamicData.buildingId}/>,
       value: dynamicData.newsTypeId,
       rules: [
-        { required: true, message: '请选择资讯类型' },
+        {required: true, message: '请选择资讯类型'},
       ]
     },
     {
       label: '资讯详情',
       name: 'newsDetailType',
-      render: <Radio.Group >
-        <Radio value={1}>自定义</Radio>
-        <Radio value={0}>公众号链接</Radio>
-      </Radio.Group>,
-      value: dynamicData.newsDetailType === undefined ? 1 : dynamicData.newsDetailType - 0,
+      render: <Radio.Group> 
+              <Radio value={1}>自定义</Radio>
+              <Radio value={0}>公众号链接</Radio>
+              </Radio.Group>,
+      value: dynamicData.newsDetailType - 0,
       rules: [
-        { required: true, message: '请选择资讯类型' },
+        {required: true, message: '请选择资讯类型'},
       ]
     },
     {
@@ -108,7 +108,7 @@ const Basic = (props) => {
       hidden: () => !detailVisible,
       value: dynamicData.newsDetail,
       rules: [
-        { required: true, message: '请输入详情内容' },
+        {required: true, message: '请输入详情内容'},
       ]
     },
     {
@@ -119,48 +119,48 @@ const Basic = (props) => {
       value: dynamicData.newsDetail,
       help: "只能填写同一主体公众号的文章链接",
       rules: [
-        { required: true, message: '请输入公众号链接' },
+        {required: true, message: '请输入公众号链接'},
       ]
     },
   ]
 
-  const handleSubmit = val => {
-    console.log(dynamicData, '12312345')
-    let { ...submitValue } = val
-
-    if (dynamicData.newsId) {
+  const handleSubmit = val => { 
+    console.log(dynamicData,'12312345')
+    let {...submitValue} = val
+    
+    if(dynamicData.newsId){
       submitValue.newsId = dynamicData.newsId
-      request({ ...apis.news.put, urlData: { id: dynamicData.newsId }, data: { ...submitValue }, }).then((data) => {
+      request({ ...apis.news.put, urlData: {id: dynamicData.newsId}, data: { ...submitValue },}).then((data) => {
         // cancelPage();
         message.info("保存成功")
-        console.log(data, 'data1')
+        console.log(data,'data1')
       }).catch((err) => {
         message.info(err.msg || err.message)
       })
-    } else {
-      request({ ...apis.news.post, data: { ...submitValue }, }).then((data) => {
+    }else{
+      request({ ...apis.news.post, data: { ...submitValue },}).then((data) => {
         // cancelPage();
         message.info("保存成功")
         router.push({
           pathname: '/news/list/editNewsList',
           query: {
-            newsId: data.newsId
+            newsId:data.newsId
           },
         });
-        console.log(data, 'data2')
+        console.log(data,'data2')
       }).catch((err) => {
         message.info(err.msg || err.message)
       })
     }
   }
 
-  const cancelPage = () => {
+  const cancelPage = () =>{
     router.push({
       pathname: '/news/list/NewsList',
     });
   }
-
-  return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  
+  return <XForm onSubmit={handleSubmit} onCancel={cancelPage}  fields={fields}></XForm>
 }
 
 /**
@@ -169,20 +169,20 @@ const Basic = (props) => {
  * @param {*} props
  * @returns
  */
-const Edit = (props) => {
-  const [tab, changeTab] = useState('basic')
+ const Edit = (props) => {
+  const [ tab, changeTab ] = useState('basic')
   const newsId = props.location.query.newsId
-  const [dynamicData, setDynamicData] = useState({})
+  const [ dynamicData, setDynamicData ] = useState({})
 
-  useEffect(() => {
-    if (newsId) {
-      getDynamicData(newsId);
-    }
-  }, [newsId])
+    useEffect(() => {
+      if(newsId){
+        getDynamicData(newsId);
+      }
+    },[newsId])
 
   // 查询列表
   const getDynamicData = (newsId) => {
-    request({ ...apis.news.get, urlData: { id: newsId }, }).then((data) => {
+    request({ ...apis.news.get, urlData: { id: newsId },}).then((data) => {
       setDynamicData(data)
       setExtraData(data)
       // detailVisible = data.newsDetailType == '1'
@@ -191,7 +191,7 @@ const Edit = (props) => {
       console.log(err)
       message.info(err.msg || err.message)
     })
-  }
+    }
 
   const Poster = (props) => {
     const [inputValue, changeInput] = useState('')
@@ -199,11 +199,11 @@ const Edit = (props) => {
     const [imgValue, changeImg] = useState('')
     const [posterId, setPosterId] = useState('')
 
-    useEffect(() => {
-      if (newsId) {
-        request({ ...apis.activity.poster, params: { targetId: newsId, targetType: 'news' } }).then((data) => {
-          console.log(data, "2222")
-          if (data.length > 0) {
+    if(newsId){
+      useEffect(() => {
+        request({ ...apis.activity.poster, params: {targetId: newsId,targetType: 'news'} }).then((data) => {
+          console.log(data,"2222")
+          if(data.length > 0){
             setPosterId(data[0].posterId)
             changeImg(data[0].posterImg)
             changeTextArea(data[0].posterDescription)
@@ -213,59 +213,40 @@ const Edit = (props) => {
           message.info(err.msg || err.message)
         })
         getMiniappName()
-      } else {
-        getMiniappName()
-      }
-    }, [])
-
-    // if(newsId){
-    //   useEffect(() => {
-    //     request({ ...apis.activity.poster, params: {targetId: newsId,targetType: 'news'} }).then((data) => {
-    //       console.log(data,"2222")
-    //       if(data.length > 0){
-    //         setPosterId(data[0].posterId)
-    //         changeImg(data[0].posterImg)
-    //         changeTextArea(data[0].posterDescription)
-    //         changeInput(data[0].posterTitle)
-    //       }
-    //     }).catch((err) => {
-    //       message.info(err.msg || err.message)
-    //     })
-    //     getMiniappName()
-    //   }, [])
-    // }else{
-    //   getMiniappName()
-    // }
+      }, [])
+    }else{
+      getMiniappName()
+    }
 
     // 获取小程序名称
-    const [miniappName, setMiniappName] = useState('')
-    function getMiniappName() {
+  const [miniappName, setMiniappName] = useState('')
+  function getMiniappName() {
 
-      request({ ...apis.building.getMiniappName }).then(res => {
-
-        setMiniappName(res)
-
-      })
-    }
-    const submitPoster = () => {
-      if (newsId) {
-        if (posterId) {
-          request({ ...apis.activity.updatePoster, urlData: { id: posterId }, data: { targetId: newsId, targetType: 'news', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+    request({ ...apis.building.getMiniappName }).then(res => {
+    
+      setMiniappName(res)
+     
+    })
+  }
+    const submitPoster  = () => {
+       if(newsId){
+        if(posterId){
+          request({ ...apis.activity.updatePoster, urlData: {id: posterId}, data: {targetId: newsId,targetType: 'news',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},}).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
-        } else {
-          request({ ...apis.activity.addPoster, data: { targetId: newsId, targetType: 'news', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue }, }).then((data) => {
+         }else{
+          request({ ...apis.activity.addPoster, data: {targetId: newsId,targetType: 'news',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},}).then((data) => {
             setPosterId(data.posterId)
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
-        }
-      } else {
+         }
+       }else{
         message.warn("请先保存基本信息数据")
-      }
+       }
     }
 
     return <div>
@@ -297,12 +278,12 @@ const Edit = (props) => {
               overflow: 'hidden',
               textOverflow: 'ellipsis'
             }}>{textAreaValue ? textAreaValue : '海报描述'}</p>
-            <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc', position: 'relative' }}>
-              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>长按识别小程序码</p>
-              <p style={{ margin: '0', fontSize: '18px', color: '#888' }}>进入资讯查看详情</p>
-              <img style={{ width: '80px', position: 'absolute', right: '30px', top: '10px' }} src={xiaochengxu} alt="" />
-            </div>
-
+               <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc',position:'relative' }}>
+            <p style={{margin:'0',fontSize:'18px',color:'#888'}}>长按识别小程序码</p>
+            <p style={{margin:'0',fontSize:'18px',color:'#888'}}>进入资讯查看详情</p>
+            <img style={{ width: '80px',position: 'absolute',right:'30px',top:'10px' }} src={xiaochengxu} alt="" />
+          </div>
+      
           </div>
           <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
         </div>
@@ -312,7 +293,7 @@ const Edit = (props) => {
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>资讯海报图</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
-          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px' }}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于资讯海报</p>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于资讯海报</p>
           <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
             <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
@@ -329,17 +310,17 @@ const Edit = (props) => {
     </div>
 
   }
-
+ 
   const Share = (props) => {
     const [inputValue, changeInput] = useState('')
     const [imgValue, changeImg] = useState('')
     const [shareContentId, setShareContentId] = useState('')
-
-    if (newsId) {
+    
+    if(newsId){
       useEffect(() => {
-        request({ ...apis.activity.shareContent, params: { targetId: newsId, targetType: 'news' }, }).then((data) => {
-          console.log(data, "2222")
-          if (data.length > 0) {
+        request({ ...apis.activity.shareContent, params: {targetId: newsId,targetType: 'news'},}).then((data) => {
+          console.log(data,"2222")
+          if(data.length > 0){
             setShareContentId(data[0].shareContentId)
             changeImg(data[0].shareContentImg)
             changeInput(data[0].shareContentTitle)
@@ -351,24 +332,24 @@ const Edit = (props) => {
     }
 
     const submitShare = () => {
-      if (newsId) {
-        if (shareContentId) {
-          request({ ...apis.activity.updateShareContent, urlData: { id: shareContentId }, data: { targetId: newsId, shareContentType: 'news', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+      if(newsId){
+        if(shareContentId){
+          request({ ...apis.activity.updateShareContent, urlData: {id: shareContentId},data: {targetId: newsId,shareContentType: 'news',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
-        } else {
-          request({ ...apis.activity.addShareContent, data: { targetId: newsId, shareContentType: 'news', shareContentImg: imgValue, shareContentTitle: inputValue }, }).then((data) => {
+         }else{
+          request({ ...apis.activity.addShareContent, data: {targetId: newsId,shareContentType: 'news',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
             setShareContentId(data.shareContentId)
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
-        }
-      } else {
+         }
+       }else{
         message.warn("请先保存基本信息数据")
-      }
+       }
     }
 
     return <div style={{ padding: '20px' }}>
@@ -404,17 +385,17 @@ const Edit = (props) => {
         </Radio.Group>
       </div>
       <div>
-        {tab === 'basic' && <Basic data={dynamicData} />}
-        {tab === 'poster' && <Poster />}
-        {tab === 'share' && <Share />}
+        { tab === 'basic' && <Basic data={dynamicData} /> }
+        { tab === 'poster' && <Poster /> }
+        { tab === 'share' && <Share /> }
       </div>
       <Prompt message={location =>
-        location.pathname.startsWith("/news/list")
-          ? true
-          : localStorage.removeItem("newsPageParams")} />
+                          location.pathname.startsWith("/news/list")
+                            ? true
+                            : localStorage.removeItem("newsPageParams")} />
     </div>
   );
-}
+ }