diff --git a/src/pages/shopping/components/bottomEditBar/index.module.scss b/src/pages/shopping/components/bottomEditBar/index.module.scss
index 3ff314d..8678f19 100644
--- a/src/pages/shopping/components/bottomEditBar/index.module.scss
+++ b/src/pages/shopping/components/bottomEditBar/index.module.scss
@@ -5,7 +5,7 @@
justify-content: space-between;
background-color: white;
padding: 16px 24px;
-
+ box-shadow: 0 1px 2px 1px #c2c2c2;
.bottomLeft {
margin-left: 12px;
.moneyText {
@@ -26,5 +26,4 @@
flex-flow: row nowrap;
align-items: center;
}
-
}
diff --git a/src/pages/shopping/components/bottomSettleBar/index.module.scss b/src/pages/shopping/components/bottomSettleBar/index.module.scss
index 54db43b..13ba2bc 100644
--- a/src/pages/shopping/components/bottomSettleBar/index.module.scss
+++ b/src/pages/shopping/components/bottomSettleBar/index.module.scss
@@ -6,37 +6,33 @@
background-color: white;
padding: 16px 24px;
box-shadow: 0 1px 2px 1px #c2c2c2;
- .bottomLeft{
- margin-left: 12px;
- .moneyText{
+ .bottomLeft {
+ margin-left: 12px;
+ .moneyText {
font-size: 28px;
font-family: $font_family;
font-weight: 400;
color: rgba($color: #000000, $alpha: 0.6);
}
- .moneyNumber{
-
+ .moneyNumber {
font-size: 28px;
font-family: $font_family;
font-weight: 550;
color: $color_money;
}
}
- .bottomRight{
-
+ .bottomRight {
}
-
.bottomButton {
-
}
}
-.unit{
+.unit {
font-size: 22px;
- transform: scale(.7);
+ transform: scale(0.7);
margin-right: 10px;
}
-.money{
+.money {
font-size: 36px;
}
diff --git a/src/pages/shopping/index.module.scss b/src/pages/shopping/index.module.scss
index b9d1bcb..0e604e7 100644
--- a/src/pages/shopping/index.module.scss
+++ b/src/pages/shopping/index.module.scss
@@ -8,12 +8,17 @@
}
&--context {
justify-content: space-between;
+ overflow: hidden;
height: 100%;
- .shopping__list__container{
+ .shopping__list__container {
flex: 0 1 auto;
overflow: hidden;
}
}
+ .bottomBar{
+ position: relative;
+ z-index: 999;
+ }
}
.flexBox {
display: flex;
diff --git a/src/pages/shopping/index.tsx b/src/pages/shopping/index.tsx
index d755346..a7928e8 100644
--- a/src/pages/shopping/index.tsx
+++ b/src/pages/shopping/index.tsx
@@ -90,21 +90,21 @@ const ShoppingCartContainer: FC = () => {
console.log('useLayoutEffect')
await fetchData(getFilterData(searchOptions))
isFirst.current = false
- const query = Taro.createSelectorQuery()
- console.log('query', query)
- query.select('#shoppingContainer').boundingClientRect()
- query.select('#topBar').boundingClientRect()
- query.select('#bottomBar').boundingClientRect()
- query.exec((res) => {
- console.log('res==>', res)
- const containerHeight = res[0].height
- const topBarHeight = res[1].height
- const bottomBarHeight = res[2].height
- const listHeight = containerHeight - topBarHeight - bottomBarHeight
- listHeightRef.current = `${listHeight}px`
- // 强制刷新
- setForceUpdate({})
- })
+ // const query = Taro.createSelectorQuery()
+ // console.log('query', query)
+ // query.select('#shoppingContainer').boundingClientRect()
+ // query.select('#topBar').boundingClientRect()
+ // query.select('#bottomBar').boundingClientRect()
+ // query.exec((res) => {
+ // console.log('res==>', res)
+ // const containerHeight = res[0].height
+ // const topBarHeight = res[1].height
+ // const bottomBarHeight = res[2].height
+ // const listHeight = containerHeight - topBarHeight - bottomBarHeight
+ // listHeightRef.current = `${listHeight}px`
+ // // 强制刷新
+ // setForceUpdate({})
+ // })
})()
}, [])
@@ -222,7 +222,7 @@ const ShoppingCartContainer: FC = () => {
-
+
{
!!shoppingCartData?.list?.length
&& shoppingCartData?.list?.map((item, index) => {
@@ -231,20 +231,20 @@ const ShoppingCartContainer: FC = () => {
}
-
-
- {isManageStatus
- ? (
- handleSelectAllCheckbox(isAll)}
- >
- )
- : (
-
- )}
+
+ {isManageStatus
+ ? (
+ handleSelectAllCheckbox(isAll)}
+ >
+ )
+ : (
+
+ )}
+
)