debug

src/components/Card/LogCard/index.jsx

@@ -14,28 +14,28 @@ const Index = (props) => {
                             {/*className="todo-tag-png"*/}
                             {/*src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1591252471425&di=85236ae603ca74553adaca6e8c161a39&imgtype=0&src=http%3A%2F%2Fhbimg.b0.upaiyun.com%2Fb912bf96dc19b3b23530ae2259b60eb6cf70083f6680b-H9l0ri_fw658"*/}
                         {/*/>*/}
-                        {data.TYPE}
+                        {data.WD_MOD_NAME}
                     </div>
-                    <p>{data.TITLE}</p>
+                    <p>{data.WD_TITLE}</p>
                 </div>
                 <span>
                     <img
                         alt=""
                         className="todo-read-png"
-                        src={props.data && props.data.FLAG === 'D' ? '/img/read.png' : '/img/unread.png'}
+                        src={props.data && props.data.WD_FLAG === 'D' ? '/img/read.png' : '/img/unread.png'}
                     />
                 </span>
             </div>
             <div className="todo-content">
-                <p>当前状态：{data.STATUS}</p>
-                <p style={{marginTop: 15}}>发送人员：{data.FROMUSER_ALIASED}</p>
+                <p>当前状态：{data.WD_STATUS}</p>
+                <p style={{marginTop: 15}}>发送人员：{data.WD_FROMUSER_ALIASED}</p>
             </div>
             <div className="todo-footer">
                <div>
-                   <p className="pos-aline"><img alt="" src="/img/time.png" className="footer-mes-img"/>更新时间：{data.RECEIVEDATE ? moment(data.RECEIVEDATE).format("YYYY-MM-DD HH:mm:ss") : ''}</p>
-                   <p className="pos-aline footer-mes-sec"><img alt="" src="/img/time-2.png" className="footer-mes-img"/>发起时间：{data.SENDTIME ? moment(data.SENDTIME).format("YYYY-MM-DD HH:mm:ss") : ''}</p>
+                   <p className="pos-aline"><img alt="" src="/img/time.png" className="footer-mes-img"/>更新时间：{data.WD_RECEIVEDATE ? moment(data.WD_RECEIVEDATE).format("YYYY-MM-DD HH:mm:ss") : ''}</p>
+                   <p className="pos-aline footer-mes-sec"><img alt="" src="/img/time-2.png" className="footer-mes-img"/>发起时间：{data.WD_SENDDATE ? moment(data.WD_SENDDATE).format("YYYY-MM-DD HH:mm:ss") : ''}</p>
                </div>
-                {data && data.JJCD !=='无' && data.JJCD ==='紧急' &&  (
+                {data && data.WD_JJCD !=='无' && data.WD_JJCD ==='紧急' &&  (
                     <img
                         alt=""
                         className="todo-footer-img"

src/layout/Footer.jsx

@@ -14,7 +14,7 @@ const Footer = (props) => {
     const getData = () => {
         axiosRequest({
             method: 'post',
-            url: '/idtAppServiceV6//oApp/getUnDone',
+            url: '/idtAppServiceV6/oApp/getWaitDealList',
         }).then(res => {
             setBadge(res.total)
         });

src/pages/Backlog/Backlog.jsx

@@ -32,14 +32,14 @@ const Backlog = (props) => {
         scroll && current > 0 && window.scrollTo(0, document.body.scrollHeight);
         axiosRequest({
             method: 'post',
-            url: '/idtAppServiceV6/oApp/getUnDone',
+            url: '/idtAppServiceV6/oApp/getWaitDealList',
             body: pageMap,
         }).then(res => {
             setStart(false);
-            setEnd(res.rows && res.rows.length >= 10)
-            let result = end && res.rows ? data.concat(res.rows) : data;
-            res.rows && res.rows.length >= 10 && setCurrent(current + 1);
-            current > 0 && res.rows && res.rows.length === 0 && setCurrent(current - 1);
+            setEnd(res.dataList && res.dataList.length >= 10)
+            let result = end && res.dataList ? data.concat(res.dataList) : data;
+            res.dataList && res.dataList.length >= 10 && setCurrent(current + 1);
+            current > 0 && res.dataList && res.dataList.length === 0 && setCurrent(current - 1);
             setData(result);
             setLoading(false);
         });
@@ -72,32 +72,36 @@ const Backlog = (props) => {
     return (
         <Document title="待办">
             <WingBlank>
-                <WhiteSpace/>
-                <TopSearch onSearch={wordSearch}/>
-                <WhiteSpace/>
-                {start ? <div> <WhiteSpace/><Skeleton/><WhiteSpace/><Skeleton/><WhiteSpace/><Skeleton/></div> : (!start && (
-                    data.length > 0 ? data.map((item, index) => (
-                        <div key={index}>
-                            <WhiteSpace/>
-                            <TodoCard data={item} onClick={() => checkLog(item.OPERATEID, item.UUID, item.FLOWTBID)}/>
-                        </div>
+               <div className="notice-box-content">
+                   <WhiteSpace/>
+                   <TopSearch onSearch={wordSearch}/>
+                   <WhiteSpace/>
+                   {start ? <div> <WhiteSpace/><Skeleton/><WhiteSpace/><Skeleton/><WhiteSpace/><Skeleton/></div> : (!start && (
+                       data.length > 0 ? data.map((item, index) => (
+                           <div key={index}>
+                               <WhiteSpace/>
+                               <TodoCard data={item} onClick={() => checkLog(item.WD_OPERATE_ID, item.WD_UUID, item.WD_FLOWTBID)}/>
+                           </div>
 
-                    )) : <Empty/>
-                ))}
+                       )) : <Empty/>
+                   ))}
 
-                <WhiteSpace/>
-                {loading && (
-                    <div className="pos-line content-loading">
-                        <Loading/>
-                        <WhiteSpace/>
-                        <WhiteSpace/>
-                    </div>
-                )}
-                {!loading && !end && data.length > 0 && (
-                    <div className="content-end">
-                        ——————  我是有底线的  ——————
-                    </div>
-                )}
+                   <WhiteSpace/>
+                   {loading && (
+                       <div className="pos-line content-loading">
+                           <Loading/>
+                           <WhiteSpace/>
+                           <WhiteSpace/>
+                       </div>
+                   )}
+                   {!loading && !end && data.length > 0 && (
+                       <div className="extra-content">
+                           <div className="content-end">
+                               ——————  我是有底线的  ——————
+                           </div>
+                       </div>
+                   )}
+               </div>
 
             </WingBlank>
         </Document>

src/pages/Backlog/index.less

+.notice-box-content{
+  min-height: 600px;
+  position: relative;
+}
+.extra-content{
+  height: 40px;
+}
 .content-end{
-  width: 100%;
   text-align: center;
   color: rgba(67, 67, 67, 0.2);
-  margin-top: 20px;
+  position: absolute;
+  bottom: 65px; right: 0;left: 0;
 }
 .content-loading{
   margin-top: 15px;
 }
+
+

src/pages/EventProcessing/commponents/Goods.jsx

@@ -3,7 +3,6 @@ import './index.less'
 
 const Index = (props) => {
     const {data, list, onClick} = props;
-    console.log(list)
     return (
         <div className="address-box">
             {data && data.length > 0 && data.map((item, index) => (

src/pages/Notice/Notice.jsx

@@ -20,19 +20,19 @@ const Notice = (props) => {
     const [data, setData] = useState([]);
 
     const getData = (scroll) => {
-        const pageMap ={searchWord, nowPage: current + 1, pageSize: 10, FLAG: tab};
+        const pageMap ={searchWord, nowPage: current + 1, pageSize: 10, WD_FLAG: tab};
         setLoading(true);
         scroll && current > 0 && window.scrollTo(0, document.body.scrollHeight)
         axiosRequest({
             method: 'post',
-            url: '/idtAppServiceV6/oApp/getUnDone',
+            url: '/idtAppServiceV6/oApp/getWaitDealList',
             body: pageMap,
         }).then(res => {
             setStart(false);
-            setEnd(res.rows && res.rows.length >= 10)
-            let result = end && res.rows ? data.concat(res.rows) : data;
-            res.rows && res.rows.length >= 10 && setCurrent(current + 1);
-            current > 0 && res.rows && res.rows.length === 0 && setCurrent(current - 1);
+            setEnd(res.dataList && res.dataList.length >= 10)
+            let result = end && res.dataList ? data.concat(res.dataList) : data;
+            res.dataList && res.dataList.length >= 10 && setCurrent(current + 1);
+            current > 0 && res.dataList && res.dataList.length === 0 && setCurrent(current - 1);
             setData(result);
             setLoading(false);
         });
@@ -92,30 +92,34 @@ const Notice = (props) => {
     return (
         <Document title="通知">
             <WingBlank>
-                <WhiteSpace/>
-                <TopNotice onSearch={tabSearch} tabChange={tabChange}/>
-                { start ? <div> <WhiteSpace/><Skeleton/><WhiteSpace/><Skeleton/><WhiteSpace/><Skeleton/></div> : ( !start && (
-                    data.length > 0 ? data.map((item, index) => (
-                        <div key={index}>
+                <div className="notice-box-content">
+                    <WhiteSpace/>
+                    <TopNotice onSearch={tabSearch} tabChange={tabChange}/>
+                    { start ? <div> <WhiteSpace/><Skeleton/><WhiteSpace/><Skeleton/><WhiteSpace/><Skeleton/></div> : ( !start && (
+                        data.length > 0 ? data.map((item, index) => (
+                            <div key={index}>
+                                <WhiteSpace/>
+                                <TodoCard data={item} onClick={() => checkLog(item.WD_OPERATE_ID, item.WD_UUID, item.WD_FLOWTBID)}/>
+                            </div>
+
+                        )) : <Empty/>
+                    ))}
+                    <WhiteSpace/>
+                    {loading && (
+                        <div className="pos-line content-loading">
+                            <Loading/>
+                            <WhiteSpace/>
                             <WhiteSpace/>
-                            <TodoCard data={item} onClick={() => checkLog(item.OPERATEID, item.UUID, item.FLOWTBID)}/>
                         </div>
-
-                    )) : <Empty/>
-                ))}
-                <WhiteSpace/>
-                {loading && (
-                    <div className="pos-line content-loading">
-                        <Loading/>
-                        <WhiteSpace/>
-                        <WhiteSpace/>
-                    </div>
-                )}
-                {!loading && !end && data.length > 0 && (
-                    <div className="content-end">
-                        ——————  我是有底线的  ——————
-                    </div>
-                )}
+                    )}
+                    {!loading && !end && data.length > 0 && (
+                        <div className="extra-content">
+                            <div className="content-end">
+                                ——————  我是有底线的  ——————
+                            </div>
+                        </div>
+                    )}
+                </div>
 
             </WingBlank>
         </Document>

src/pages/Notice/index.less

+
+.content-loading{
+  margin-top: 15px;
+}
+
+.notice-box-content{
+  position: relative;
+}
+.extra-content{
+  height: 40px;
+}
 .content-end{
-  width: 100%;
   text-align: center;
   color: rgba(67, 67, 67, 0.2);
-  margin-top: 20px;
-}
-.content-loading{
-  margin-top: 15px;
+  position: absolute;
+  bottom: 5px; right: 0;left: 0;
 }

src/pages/Work/WorkDetail.jsx

@@ -8,6 +8,7 @@ import Document from 'react-document-title'
 import Empty from '../Empty'
 import Loading from "../../components/Loading";
 import queryString from 'query-string'
+import './index.less'
 
 const Notice = (props) => {
     const {type, name} = props.match.params;
@@ -104,33 +105,38 @@ const Notice = (props) => {
         }
         setTabData(menuG);
     }, []);
+    console.log(!loading && !end && data.length > 0 )
     return (
         <Document title="通知">
             <WingBlank>
-                <WhiteSpace/>
-                <TopNotice tabs={tabData} onSearch={tabSearch} tabChange={tabChange}/>
-                { start ? <div> <WhiteSpace/><Skeleton/><WhiteSpace/><Skeleton/><WhiteSpace/><Skeleton/></div> : ( !start && (
-                    data.length > 0 ? data.map((item, index) => (
-                        <div key={index}>
+                <div className="notice-box-content">
+                    <WhiteSpace/>
+                    <TopNotice tabs={tabData} onSearch={tabSearch} tabChange={tabChange}/>
+                    { start ? <div> <WhiteSpace/><Skeleton/><WhiteSpace/><Skeleton/><WhiteSpace/><Skeleton/></div> : ( !start && (
+                        data.length > 0 ? data.map((item, index) => (
+                            <div key={index}>
+                                <WhiteSpace/>
+                                <TodoCard name={name} data={item} onClick={() => checkLog(tab, item.UUID, item.FLOWTBID)}/>
+                            </div>
+
+                        )) : <Empty/>
+                    ))}
+                    <WhiteSpace/>
+                    {loading && (
+                        <div className="pos-line content-loading">
+                            <Loading/>
+                            <WhiteSpace/>
                             <WhiteSpace/>
-                            <TodoCard name={name} data={item} onClick={() => checkLog(tab, item.UUID, item.FLOWTBID)}/>
                         </div>
-
-                    )) : <Empty/>
-                ))}
-                <WhiteSpace/>
-                {loading && (
-                    <div className="pos-line content-loading">
-                        <Loading/>
-                        <WhiteSpace/>
-                        <WhiteSpace/>
-                    </div>
-                )}
-                {!loading && !end && data.length > 0 && (
-                    <div className="content-end">
-                        ——————  我是有底线的  ——————
-                    </div>
-                )}
+                    )}
+                    {!loading && !end && data.length > 0 && (
+                        <div className="extra-content">
+                            <div className="content-end">
+                                ——————  我是有底线的  ——————
+                            </div>
+                        </div>
+                    )}
+                </div>
 
             </WingBlank>
         </Document>

src/pages/Work/index.less

@@ -4,3 +4,15 @@
   overflow: auto;
   padding-bottom: 10px
 }
+.notice-box-content{
+  position: relative;
+}
+.extra-content{
+  height: 40px;
+}
+.content-end{
+  text-align: center;
+  color: rgba(67, 67, 67, 0.2);
+  position: absolute;
+  bottom: 5px; right: 0;left: 0;
+}

src/utils/instance.js

@@ -31,7 +31,7 @@ export const createAPI = (baseURL) => {
     return (conf = {}) => {
         let opts = conf.opts || {};
         let urlParams = '';
-        console.log(conf);
+        // console.log(conf);
 
         let headers = { ...defaultHeaders, ...opts.headers };
         if (conf.opts) {