xuan/TestRestructureWechatLymarketDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨ feat:解决一些兼容性的问题

Browse Source
This commit is contained in:
Haiyi
2022-10-10 17:14:21 +08:00
parent fe16a473a2
commit 79a3364b5f
17 changed files with 156 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/order/components/PayPopup/index.module.scss
+18 -5
View File
@@ -5,12 +5,13 @@
bottom: 0;
.contBox {
width: 670px;
width: 100%;
// width: 670px;
padding-bottom: 30px;
// height: 739px;
background: #FFFFFF;
margin-top: 32px;
margin-left: 40px;
// margin-left: 40px;
overflow: hidden;
.topMoney {
@@ -47,7 +48,8 @@
}
.line {
width: 590px;
margin-right: 40px;
// width: 590px;
height: 1px;
background: #000000;
opacity: 0.1;
@@ -152,7 +154,8 @@
.sure {
// margin-top: 35px;
margin-left: 40px;
width: 670px;
margin-right: 40px;
// width: 670px;
height: 80px;
background: #337FFF;
border-radius: 44px;
@@ -165,7 +168,9 @@
}
.pic {
width: 702px;
margin-left: 24px;
margin-right: 24px;
// width: 702px;
height: 1500px;
border-radius: 16px;
border: 1px solid #f7f7f7;
@@ -173,4 +178,12 @@
.safeBox {
height: 200px;
}
.scrollStyle {
height: 900px;
}
.scroStyle {
height: 900px;
}
src/pages/order/components/PayPopup/index.tsx
+2 -2
View File
@@ -106,7 +106,7 @@ export default memo((props: Props) => {
return (
<View className={styles.popupBox}>
<Popup show={showPopup} title={title} onClose={() => popupClose?.()}>
<ScrollView enhanced scrollY style={{ height: '900rpx' }}>
<ScrollView enhanced scrollY className={styles.scrollStyle} >
{
showSide &&
<View className={styles.contBox}>
@@ -175,7 +175,7 @@ export default memo((props: Props) => {
}
{
!showSide &&
<ScrollView enhanced scrollY style={{ height: '700rpx', marginLeft: '24rpx' }}>
<ScrollView enhanced scrollY className={styles.scroStyle}>
<View className={styles.pic}>
<Image lazyLoad mode='widthFix' style={{ width: '100%', height: '100%' }} src={picUrl} onClick={() => showImage()}></Image>
</View>
src/pages/order/components/itemList/index.module.scss
+18 -10
View File
@@ -1,10 +1,9 @@
.itemBox {
margin-top: 38px;
overflow: hidden;
// width: 702px;
// margin-left: 24px;
margin-right: 24px;
height: 560px;
// height: 560px;
padding-bottom: 20px;
background: #FFFFFF;
border-radius: 16px;
margin-left: 24px;
@@ -44,7 +43,8 @@
.line {
margin-left: 32px;
width: 638px;
// width: 638px;
margin-right: 32px;
height: 1px;
background: #000000;
opacity: 0.1;
@@ -53,15 +53,17 @@
}
.contBox {
width: 638px;
// padding-right: 32px;
// width: 100%;
// width: 638rpx;
margin-left: 32px;
display: flex;
justify-content: space-between;
.leftCont {
// min-width: 24%;
width: 134px;
height: 134px;
// background: #000000;
border-radius: 8px;
position: relative;
@@ -83,13 +85,15 @@
}
.rightCont {
min-width: 76%;
margin-left: 24px;
.rightTop {
display: flex;
align-items: center;
justify-content: space-between;
width: 480px;
min-width: 76%;
// width: 480px;
margin-bottom: 32px;
.productBox {
@@ -97,7 +101,7 @@
align-items: center;
.productName {
width: 285px;
max-width: 285px;
height: 34px;
overflow: hidden;
white-space: nowrap;
@@ -124,6 +128,7 @@
}
.shipMode {
margin-right: 60px;
font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
@@ -132,9 +137,11 @@
}
.colorsBox {
padding-right: 60px;
display: flex;
align-items: center;
width: 480px;
// width: 480px;
// margin-right: 32px;
margin-bottom: 8px;
.colorNameOne {
@@ -175,7 +182,8 @@
}
.lineOne {
width: 638px;
// width: 638px;
margin-right: 32px;
height: 1px;
background: #000000;
opacity: 0.1;
src/pages/order/components/itemList/index.tsx
+6 -4
View File
@@ -21,7 +21,6 @@ export default memo((props: propsObj) => {
})
}
return (
<View className={styles.itemBox} onClick={(e) => navTo(e)}>
<View className={styles.topItem}>
@@ -31,9 +30,12 @@ export default memo((props: propsObj) => {
<View className={styles.pussName}>{props?.obj?.purchaser_name}</View>
<View className={styles.line}></View>
<View className={styles.contBox}>
<View className={styles.leftCont} style={{ backgroundColor: `rgb(${props?.obj?.product_list[0]?.product_colors[0]?.rgb?.r} ${props?.obj?.product_list[0]?.product_colors[0]?.rgb?.g} ${props?.obj?.product_list[0]?.product_colors[0]?.rgb?.b})` }}>
<View className={styles.leftContNums}>颜色 ({props?.obj?.total_colors})</View>
<View style={{ minWidth: '24%' }}>
<View className={styles.leftCont} style={{ backgroundColor: `rgb(${props?.obj?.product_list[0]?.product_colors[0]?.rgb?.r} ${props?.obj?.product_list[0]?.product_colors[0]?.rgb?.g} ${props?.obj?.product_list[0]?.product_colors[0]?.rgb?.b})` }}>
<View className={styles.leftContNums}>颜色 ({props?.obj?.total_colors})</View>
</View>
</View>
<View className={styles.rightCont}>
<View className={styles.rightTop}>
<View className={styles.productBox}>
@@ -75,6 +77,6 @@ export default memo((props: propsObj) => {
toPay={(e) => props?.toPay?.(e, props?.obj)}
></BottomBtns>
</View>
</View>
</View >
)
})
src/pages/order/index.module.scss
+9 -11
View File
@@ -191,14 +191,16 @@
}
.bottomBox {
width: 750px;
width: 100%;
// width: 750px;
height: 160px;
background: #FFFFFF;
position: fixed;
bottom: calc($customTabBarHeight + env(safe-area-inset-bottom));
// position: fixed;
// bottom: calc($customTabBarHeight + env(safe-area-inset-bottom));
z-index: 99;
display: flex;
padding-top: 16px;
align-items: center;
justify-content: space-between;
.resetBox {
@@ -253,14 +255,10 @@
.order_list {
height: calc(100vh - $customTabBarHeight + env(safe-area-inset-bottom) - 345px);
height: calc(100vh - $customTabBarHeight + env(safe-area-inset-bottom) - 230px);
background: #f7f7f7;
.bigBpx {
height: 200px;
}
.kongboxTwo {
height: calc($customTabBarHeight + env(safe-area-inset-bottom));
}
// .kongboxTwo {
// height: calc($customTabBarHeight + env(safe-area-inset-bottom));
// }
}
src/pages/order/index.tsx
+2 -2
View File
@@ -628,7 +628,7 @@ export default () => {
)
})}
</InfiniteScroll>
<View className={styles.kongboxTwo}></View>
{/* <View className={styles.kongboxTwo}></View> */}
</View>
<Popup title={'筛选订单'} show={showPopup} onClose={() => closePopup()}>
<View className={styles.popupBox}>
@@ -683,7 +683,7 @@ export default () => {
</View>
</View>
<View>{isDisabled}</View>
<View style={{ height: '160rpx' }}></View>
{/* <View style={{ height: '160rpx' }}></View> */}
<View className={styles.bottomBox}>
<Button