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/refundPage/components/itemList/index.module.scss
+15 -7
View File
@@ -2,7 +2,8 @@
margin-top: 38px;
overflow: hidden;
margin: 24px;
height: 416px;
// height: 416px;
padding-bottom: 20px;
background: #FFFFFF;
border-radius: 16px;
margin-left: 24px;
@@ -42,7 +43,8 @@
.line {
margin-left: 32px;
width: 638px;
margin-right: 32px;
// width: 638px;
height: 1px;
background: #000000;
opacity: 0.1;
@@ -51,12 +53,13 @@
}
.contBox {
width: 638px;
// width: 638px;
margin-left: 32px;
display: flex;
justify-content: space-between;
.leftCont {
// min-width: 24%;
width: 134px;
height: 134px;
// background: #000000;
@@ -82,12 +85,14 @@
.rightCont {
margin-left: 24px;
min-width: 76%;
.rightTop {
min-width: 76%;
display: flex;
align-items: center;
justify-content: space-between;
width: 480px;
// width: 480px;
margin-bottom: 32px;
.productBox {
@@ -95,7 +100,7 @@
align-items: center;
.productName {
width: 285px;
max-width: 285px;
height: 34px;
overflow: hidden;
white-space: nowrap;
@@ -126,13 +131,15 @@
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #000000;
margin-right: 30px;
}
}
.colorsBox {
padding-right: 60px;
display: flex;
align-items: center;
width: 480px;
// width: 480px;
margin-bottom: 8px;
.colorNameOne {
@@ -173,8 +180,9 @@
}
.lineOne {
width: 638px;
// width: 638px;
height: 1px;
margin-right: 32px;
background: #000000;
opacity: 0.1;
margin-left: 32px;
src/pages/refundPage/components/itemList/index.tsx
+4 -2
View File
@@ -38,8 +38,10 @@ 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}>
src/pages/refundPage/index.module.scss
+5 -1
View File
@@ -46,9 +46,13 @@
}
}
.scrllStyle {
height: 500px;
}
.popupBox {
padding-bottom: env(safe-area-inset-bottom);
width: 100%;
src/pages/refundPage/index.tsx
+51 -50
View File
@@ -1,4 +1,4 @@
import { View, Input, Button } from '@tarojs/components'
import { View, Input, Button, ScrollView } from '@tarojs/components'
import { useCallback, useEffect, useMemo, useRef, useState, } from 'react'
import Search from '@/components/search'
import { dataLoadingStatus, getFilterData } from '@/common/util'
@@ -337,61 +337,62 @@ export default () => {
</View>
<Popup title={'筛选订单'} show={showPopup} onClose={() => closePopup()}>
<View className={styles.popupBox}>
<View className={styles.thirdBox}>
<View className={styles.thirdTopfont}>售后状态</View>
<View className={styles.flexModebox}>
{
stageList.map((item, index) => {
return (
<View onClick={() => { handCheckStange(item) }} className={classnames(item.checked ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name}</View>
)
})
}
</View>
</View>
<View className={styles.thirdBox}>
<View className={styles.thirdTopfont}>订单类型</View>
<View className={styles.flexModebox}>
{
modeList.map((item, index) => {
return (
<View onClick={() => { handCheckMode(item) }} className={classnames(item.checked ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name}</View>
)
})
}
</View>
</View>
<View className={styles.thirdBox}>
<View className={styles.thirdTopfont}>退款类型</View>
<View className={styles.flexModebox}>
{
typeList.map((item, index) => {
return (
<View onClick={() => { handType(item) }} className={classnames(item.checked ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name}</View>
)
})
}
</View>
</View>
<View className={styles.thirdBox}>
<View className={styles.thirdTopfont}>售后时间</View>
<View className={styles.timeBox2} onClick={() => { setShowTime(true) }}>{timeArea}
<View className={styles.more}>
<ScrollView className={styles.scrllStyle} scrollY>
<View className={styles.thirdBox}>
<View className={styles.thirdTopfont}>售后状态</View>
<View className={styles.flexModebox}>
{
timeArea == '自定义起始时间' &&
<IconFont name={'icon-chakanquanbukehu'} color={'#000000'} size={40} customClassName={styles['more']}></IconFont>
stageList.map((item, index) => {
return (
<View onClick={() => { handCheckStange(item) }} className={classnames(item.checked ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name}</View>
)
})
}
</View>
</View>
</View>
<View style={{ height: '100rpx' }}></View>
<View className={styles.thirdBox}>
<View className={styles.thirdTopfont}>订单类型</View>
<View className={styles.flexModebox}>
{
modeList.map((item, index) => {
return (
<View onClick={() => { handCheckMode(item) }} className={classnames(item.checked ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name}</View>
)
})
}
</View>
</View>
<View className={styles.thirdBox}>
<View className={styles.thirdTopfont}>退款类型</View>
<View className={styles.flexModebox}>
{
typeList.map((item, index) => {
return (
<View onClick={() => { handType(item) }} className={classnames(item.checked ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name}</View>
)
})
}
</View>
</View>
<View className={styles.thirdBox}>
<View className={styles.thirdTopfont}>售后时间</View>
<View className={styles.timeBox2} onClick={() => { setShowTime(true) }}>{timeArea}
<View className={styles.more}>
{
timeArea == '自定义起始时间' &&
<IconFont name={'icon-chakanquanbukehu'} color={'#000000'} size={40} customClassName={styles['more']}></IconFont>
}
</View>
</View>
</View>
<View style={{ height: '100rpx' }}></View>
<View className={styles.bottomBox}>
<Button className={styles.resetBox} onClick={() => { handReset() }}> 重置</Button >
<Button className={classnames(isDisabled ? styles.button : styles.activeButton)} disabled={isDisabled} onClick={() => handSure()}> 确认</Button >
</View>
<View className={styles.bottomBox}>
<Button className={styles.resetBox} onClick={() => { handReset() }}> 重置</Button >
<Button className={classnames(isDisabled ? styles.button : styles.activeButton)} disabled={isDisabled} onClick={() => handSure()}> 确认</Button >
</View>
</ScrollView>
{/* <View className={styles.areaBox}></View> */}
</View>
</Popup>