Commit dce66cbc authored by 崔佳豪's avatar 崔佳豪

fix: 修复一页够展示10条时无法滚动问题

parent 23b07ac3
Pipeline #56380 passed with stages
in 2 minutes 24 seconds
...@@ -36,6 +36,7 @@ const CheckAllMessage = props => { ...@@ -36,6 +36,7 @@ const CheckAllMessage = props => {
const [isRes, setIsRes] = useState(false); const [isRes, setIsRes] = useState(false);
const total = useRef(0); const total = useRef(0);
const pageIndex = useRef(1); const pageIndex = useRef(1);
const pageSize = useRef(20);
const infoType = useRef('全部'); const infoType = useRef('全部');
useEffect(() => { useEffect(() => {
loadMoreData(); loadMoreData();
...@@ -61,7 +62,7 @@ const CheckAllMessage = props => { ...@@ -61,7 +62,7 @@ const CheckAllMessage = props => {
obj = { obj = {
userID: window.globalConfig.userInfo.OID, userID: window.globalConfig.userInfo.OID,
pageIndex: pageIndex.current, pageIndex: pageIndex.current,
pageSize: 10, pageSize: pageSize.current,
sort: sortType sort: sortType
} }
} else { } else {
...@@ -69,7 +70,7 @@ const CheckAllMessage = props => { ...@@ -69,7 +70,7 @@ const CheckAllMessage = props => {
type: infoType.current, type: infoType.current,
userID: window.globalConfig.userInfo.OID, userID: window.globalConfig.userInfo.OID,
pageIndex: pageIndex.current, pageIndex: pageIndex.current,
pageSize: 10, pageSize: pageSize.current,
sort: sortType sort: sortType
} }
} }
...@@ -129,7 +130,7 @@ const CheckAllMessage = props => { ...@@ -129,7 +130,7 @@ const CheckAllMessage = props => {
obj = { obj = {
userID: window.globalConfig.userInfo.OID, userID: window.globalConfig.userInfo.OID,
pageIndex: pageIndex.current, pageIndex: pageIndex.current,
pageSize: 10, pageSize: pageSize.current,
sort: sortType sort: sortType
} }
} else { } else {
...@@ -137,7 +138,7 @@ const CheckAllMessage = props => { ...@@ -137,7 +138,7 @@ const CheckAllMessage = props => {
type: infoType.current, type: infoType.current,
userID: window.globalConfig.userInfo.OID, userID: window.globalConfig.userInfo.OID,
pageIndex: pageIndex.current, pageIndex: pageIndex.current,
pageSize: 10, pageSize: pageSize.current,
sort: sortType sort: sortType
} }
} }
...@@ -206,7 +207,7 @@ const CheckAllMessage = props => { ...@@ -206,7 +207,7 @@ const CheckAllMessage = props => {
obj = { obj = {
userID: window.globalConfig.userInfo.OID, userID: window.globalConfig.userInfo.OID,
pageIndex: pageIndex.current, pageIndex: pageIndex.current,
pageSize: 10, pageSize: pageSize.current,
sort: value sort: value
}; };
} else { } else {
...@@ -214,7 +215,7 @@ const CheckAllMessage = props => { ...@@ -214,7 +215,7 @@ const CheckAllMessage = props => {
type: infoType.current, type: infoType.current,
userID: window.globalConfig.userInfo.OID, userID: window.globalConfig.userInfo.OID,
pageIndex: pageIndex.current, pageIndex: pageIndex.current,
pageSize: 10, pageSize: pageSize.current,
sort: value sort: value
}; };
} }
...@@ -253,7 +254,7 @@ const CheckAllMessage = props => { ...@@ -253,7 +254,7 @@ const CheckAllMessage = props => {
obj = { obj = {
userID: window.globalConfig.userInfo.OID, userID: window.globalConfig.userInfo.OID,
pageIndex: pageIndex.current, pageIndex: pageIndex.current,
pageSize: 10, pageSize: pageSize.current,
sort: sortType sort: sortType
}; };
} else { } else {
...@@ -261,7 +262,7 @@ const CheckAllMessage = props => { ...@@ -261,7 +262,7 @@ const CheckAllMessage = props => {
type: infoType.current, type: infoType.current,
userID: window.globalConfig.userInfo.OID, userID: window.globalConfig.userInfo.OID,
pageIndex: pageIndex.current, pageIndex: pageIndex.current,
pageSize: 10, pageSize: pageSize.current,
sort: sortType sort: sortType
}; };
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.contentPage { .contentPage {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: url('@{imgSrc}/messageBg.png') no-repeat; background: url('@{imgSrc}/messageBg.png') center/100% 100% no-repeat;
// padding: 20px 300px 0 300px; // padding: 20px 300px 0 300px;
.messageBox { .messageBox {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment