debug

.idea/workspace.xml

@@ -2,19 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="a6d092de-b4f8-454d-99f5-4dac3ce112e5" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/NoticeTab/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/NoticeTab/index.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/components/TopSearch/index.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/TopSearch/index.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/layout/Footer.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/layout/Footer.jsx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Communicate/AddressBook.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Communicate/Communicate.jsx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/pages/Notice/Notice.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Notice/Notice.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/pages/Work/Work.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Work/Work.jsx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/utils/instance.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/utils/instance.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -30,8 +20,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="370">
-              <caret line="44" column="6" lean-forward="true" selection-start-line="19" selection-start-column="2" selection-end-line="44" selection-end-column="6" />
+            <state relative-caret-position="-25">
+              <caret line="29" column="96" selection-start-line="29" selection-start-column="96" selection-end-line="29" selection-end-column="96" />
               <folding>
                 <element signature="e#0#49#0" expanded="true" />
               </folding>
@@ -42,8 +32,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="348">
-              <caret line="39" column="6" selection-start-line="39" selection-start-column="6" selection-end-line="39" selection-end-column="6" />
+            <state relative-caret-position="156">
+              <caret line="57" column="39" lean-forward="true" selection-start-line="57" selection-start-column="3" selection-end-line="57" selection-end-column="39" />
               <folding>
                 <element signature="e#0#49#0" expanded="true" />
               </folding>
@@ -54,8 +44,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="298">
-              <caret line="38" column="6" selection-start-line="38" selection-start-column="6" selection-end-line="38" selection-end-column="6" />
+            <state relative-caret-position="206">
+              <caret line="56" column="39" selection-start-line="56" selection-start-column="39" selection-end-line="56" selection-end-column="39" />
               <folding>
                 <element signature="e#0#49#0" expanded="true" />
               </folding>
@@ -76,8 +66,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>option-text</find>
-      <find>textClick</find>
       <find>Row</find>
       <find>ackground</find>
       <find>variable</find>
@@ -105,7 +93,9 @@
       <find>parent</find>
       <find>operate</find>
       <find>console</find>
+      <find>common-content</find>
       <find>setEnd</find>
+      <find>tabChange</find>
     </findStrings>
     <replaceStrings>
       <replace>this.props</replace>
@@ -219,6 +209,12 @@
               <item name="components" type="462c0819:PsiDirectoryNode" />
               <item name="TopSearch" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
+              <item name="create-react-app" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="layout" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="create-react-app" type="b2602c69:ProjectViewProjectNode" />
               <item name="create-react-app" type="462c0819:PsiDirectoryNode" />
@@ -290,12 +286,12 @@
       <workItem from="1591493817957" duration="11217000" />
       <workItem from="1591579020550" duration="32744000" />
       <workItem from="1591665260536" duration="37378000" />
-      <workItem from="1591751569364" duration="11230000" />
+      <workItem from="1591751569364" duration="11875000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="184167000" />
+    <option name="totallyTimeSpent" value="184812000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="784" extended-state="6" />
@@ -371,16 +367,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/layout/BlankLayout.jsx">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
-          <folding>
-            <element signature="e#0#26#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/layout/CommonLayout.jsx">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -692,10 +678,20 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/layout/BlankLayout.jsx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="125">
+          <caret line="5" column="12" selection-start-line="5" selection-start-column="12" selection-end-line="5" selection-end-column="12" />
+          <folding>
+            <element signature="e#0#26#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/pages/Backlog/Backlog.jsx">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="370">
-          <caret line="44" column="6" lean-forward="true" selection-start-line="19" selection-start-column="2" selection-end-line="44" selection-end-column="6" />
+        <state relative-caret-position="-25">
+          <caret line="29" column="96" selection-start-line="29" selection-start-column="96" selection-end-line="29" selection-end-column="96" />
           <folding>
             <element signature="e#0#49#0" expanded="true" />
           </folding>
@@ -704,8 +700,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/pages/Notice/Notice.jsx">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="348">
-          <caret line="39" column="6" selection-start-line="39" selection-start-column="6" selection-end-line="39" selection-end-column="6" />
+        <state relative-caret-position="156">
+          <caret line="57" column="39" lean-forward="true" selection-start-line="57" selection-start-column="3" selection-end-line="57" selection-end-column="39" />
           <folding>
             <element signature="e#0#49#0" expanded="true" />
           </folding>
@@ -714,8 +710,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/pages/Work/WorkDetail.jsx">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="298">
-          <caret line="38" column="6" selection-start-line="38" selection-start-column="6" selection-end-line="38" selection-end-column="6" />
+        <state relative-caret-position="206">
+          <caret line="56" column="39" selection-start-line="56" selection-start-column="39" selection-end-line="56" selection-end-column="39" />
           <folding>
             <element signature="e#0#49#0" expanded="true" />
           </folding>

src/components/NoticeTab/index.jsx

@@ -8,7 +8,7 @@ const tabs = [
 ]
 
 const Index = (props) => {
-    const {tabChange, onSearch} = props;
+    const {tabChange} = props;
 
     const [status, setStatus] = useState(false);
 

src/pages/Backlog/Backlog.jsx

 import React, {useState, useEffect} from 'react';
-import {WhiteSpace, WingBlank, ActivityIndicator} from 'antd-mobile'
+import {WhiteSpace, WingBlank, ActivityIndicator, Toast} from 'antd-mobile'
 import TodoCard from '../../components/LogCard'
 import TopSearch from '../../components/TopSearch';
 import axiosRequest from '../../utils/request';
@@ -27,7 +27,8 @@ const Backlog = (props) => {
         }).then(res => {
             setLoading(false);
             let result = end && res.rows ? data.concat(res.rows) : data;
-            res.rows && res.rows.length >= 10 ? setCurrent(current + 1) : setEnd(false);
+            res.rows && res.rows.length >= 10 ? setCurrent(current + 1) : Toast.info('已经到达底部', 1);
+            setEnd(res.rows && res.rows.length >= 10)
             setData(result);
         });
     };

src/pages/Notice/Notice.jsx

 import React, {useEffect, useState} from 'react';
-import {ActivityIndicator, WhiteSpace, WingBlank} from 'antd-mobile'
+import {ActivityIndicator, Toast, WhiteSpace, WingBlank} from 'antd-mobile'
 import TodoCard from '../../components/LogCard'
 import TopNotice from '../../components/NoticeTab'
 import axiosRequest from '../../utils/request';
@@ -22,7 +22,8 @@ const Notice = (props) => {
         }).then(res => {
             setLoading(false);
             let result = end && res.rows ? data.concat(res.rows) : data;
-            res.rows && res.rows.length >= 10 ? setCurrent(current + 1) : setEnd(false);
+            res.rows && res.rows.length >= 10 ? setCurrent(current + 1) : Toast.info('已经到达底部', 1);
+            setEnd(res.rows && res.rows.length >= 10)
             setData(result);
         });
     };

src/pages/Work/WorkDetail.jsx

 import React, {useEffect, useState} from 'react';
-import {ActivityIndicator, WhiteSpace, WingBlank} from 'antd-mobile'
+import {ActivityIndicator, Toast, WhiteSpace, WingBlank} from 'antd-mobile'
 import TodoCard from '../../components/LogCard'
 import TopNotice from '../../components/NoticeTab'
 import axiosRequest from '../../utils/request';
 import './index.less'
+import Empty from '../Empty'
 
 const WorkDetail = (props) => {
     const [loading, setLoading] = useState(false);
@@ -21,7 +22,8 @@ const WorkDetail = (props) => {
         }).then(res => {
             setLoading(false);
             let result = end && res.rows ? data.concat(res.rows) : data;
-            res.rows && res.rows.length >= 10 ? setCurrent(current + 1) : setEnd(false);
+            res.rows && res.rows.length >= 10 ? setCurrent(current + 1) : Toast.info('已经到达底部', 1);
+            setEnd(res.rows && res.rows.length >= 10)
             setData(result);
         });
     };
@@ -29,7 +31,7 @@ const WorkDetail = (props) => {
     //下拉加载
     const [end, setEnd] = useState(true)
     const handleScroll = () => {
-        const event = document.getElementById("common-content")
+        const event = document.getElementById("work-content")
         const top = event.scrollTop;
         const scrollHeight = event.scrollHeight;
         const clientHeight = event.clientHeight;
@@ -53,10 +55,10 @@ const WorkDetail = (props) => {
     }, []);
 
     //tab已读未读切换
-    const [tab, setTab] = useState('')
+    const [tab, setTab] = useState('N')
     const tabChange = val => {
-        setTab(val)
-        console.log(val)
+        setTab(val);
+        setData([])
     };
 
     useEffect(() => {
@@ -73,13 +75,13 @@ const WorkDetail = (props) => {
                 <WhiteSpace/>
                 <TopNotice onSearch={setSearchWord} tabChange={tabChange}/>
                 {
-                    data.map((item, index) => (
+                    data.length > 0 ? data.map((item, index) => (
                         <div key={index}>
                             <WhiteSpace/>
                             <TodoCard data={item} onClick={checkLog}/>
                         </div>
 
-                    ))
+                    )) : <Empty/>
                 }
             </WingBlank>
         </div>