diff --git a/src/components/infiniteScroll/index.module.scss b/src/components/infiniteScroll/index.module.scss
index be3ffd3..d72d954 100644
--- a/src/components/infiniteScroll/index.module.scss
+++ b/src/components/infiniteScroll/index.module.scss
@@ -1,6 +1,7 @@
.scroll_main{
height: 100%;
+
.infinite_scroll{
font-size: $font_size_medium;
color: $color_font_two;
diff --git a/src/components/infiniteScroll/index.tsx b/src/components/infiniteScroll/index.tsx
index 1624ad8..aeb35c3 100644
--- a/src/components/infiniteScroll/index.tsx
+++ b/src/components/infiniteScroll/index.tsx
@@ -7,6 +7,7 @@ type Params = {
styleObj?: Object,
selfonScrollToLower?: () => void,
hasMore?: false|true,
+ moreStatus?: false|true,
children?: ReactNode,
lowerThresholdNum?: number,
selfOnScrollToUpper?:() => void
@@ -17,7 +18,7 @@ type Params = {
selfOnRefresherAbort?: () => void
paddingBottom?: number,
refresherTriggered?: true|false,
- refresherEnabled?: true|false
+ refresherEnabled?: true|false,
}
export default memo(({
styleObj,
@@ -33,7 +34,8 @@ export default memo(({
lowerThresholdNum = 5,
paddingBottom = 0,
refresherTriggered = false,
- refresherEnabled = false
+ refresherEnabled = false,
+ moreStatus = true
}: Params) => {
const scrollToLower = () => {
selfonScrollToLower?.()
@@ -77,12 +79,12 @@ export default memo(({
>
{children}
-
+ {moreStatus&&
{
hasMore&&加载中||
没有更多了
}
-
+ }
diff --git a/src/components/moveBtn/index.module.scss b/src/components/moveBtn/index.module.scss
index 9400687..f04d5be 100644
--- a/src/components/moveBtn/index.module.scss
+++ b/src/components/moveBtn/index.module.scss
@@ -12,6 +12,7 @@
display: flex;
justify-content: center;
align-items: center;
+ z-index:999;
.shop_icon{
font-size: 50px;
color: $color_main;
diff --git a/src/pages/searchList/components/selectData/index.module.scss b/src/pages/searchList/components/selectData/index.module.scss
index 2f0bc2d..0d19650 100644
--- a/src/pages/searchList/components/selectData/index.module.scss
+++ b/src/pages/searchList/components/selectData/index.module.scss
@@ -15,7 +15,7 @@
flex:1;
display: inline-block;
font-size: 24rpx;
- background-color: #F0F0F0;
+ background-color: #ecf5ff;
border-radius: 24rpx;
min-width: 126rpx;
height: 46.93rpx;
@@ -23,12 +23,14 @@
line-height: 46.93rpx;
color: #707070;
margin-right: 20px;
+ border: 2px solid #cde5ff;
.tabs_item_con{
height: 100%;
display: flex;
align-items: center;
justify-content: center;
font-size: $font_size_medium;
+
}
.tabs_index{
height: 5px;