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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/goodsItem/index.module.scss
View File

@ -1,8 +1,8 @@
.goodsBox {
display: flex;
margin-bottom: 32px;
// justify-content: space-between;
// justify-content: space-between;
.pic {
width: 118px;
height: 118px;

13
src/components/shoppingCart/index.module.scss
View File

@ -20,7 +20,8 @@
.line {
margin-bottom: 24px;
width: 686px;
// width: 686px;
margin-right: 32px;
height: 1px;
background: #000000;
opacity: 0.1;
@ -102,7 +103,9 @@
}
.searchBox {
width: 686px;
// margin-left: 32px;
margin-right: 32px;
// width: 686px;
margin-bottom: 32px;
}
@ -145,4 +148,10 @@
z-index: 999;
bottom: env(safe-area-inset-bottom);
}
}
.scrllStyle {
height: 900px;
}

2
src/components/shoppingCart/index.tsx
View File

@ -120,7 +120,7 @@ export default memo(forwardRef((props: prosObj, ref) => {
return (
<Popup showTitle={false} show={showPopup} onClose={() => closePopup?.()}>
<ScrollView style={{ height: '1000rpx' }} scrollY>
<ScrollView className={styles.scrllStyle} scrollY>
<View className={styles.shopcartBox}>
<View className={styles.topTitle}>{obj?.code}# {obj?.name}</View>
<View className={styles.selectFont}>已选 1 种面料，{selectTotal} 个颜色，共 {selectNums} {showModefont}</View>

8
src/pages/customerPage/index.module.scss
View File

@ -7,7 +7,7 @@ page {
.searchBox {
position: sticky;
top: 0;
width: 750px;
width: 100%;
height: 96px;
background: #FFFFFF;
display: flex;
@ -26,7 +26,8 @@ page {
.itemBox {
margin-left: 24px;
width: 702px;
margin-right: 24px;
// width: 702px;
height: 104px;
background: #FFFFFF;
border-radius: 16px;
@ -67,7 +68,8 @@ page {
.acticveitemBox {
margin-left: 24px;
width: 702px;
margin-right: 24px;
// width: 702px;
height: 104px;
background: #FFFFFF;
border-radius: 16px;

23
src/pages/order/components/PayPopup/index.module.scss
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;
@ -174,3 +179,11 @@
.safeBox {
height: 200px;
}
.scrollStyle {
height: 900px;
}
.scroStyle {
height: 900px;
}

4
src/pages/order/components/PayPopup/index.tsx
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>

28
src/pages/order/components/itemList/index.module.scss
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;

10
src/pages/order/components/itemList/index.tsx
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 >
)
})

20
src/pages/order/index.module.scss
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));
// }
}

4
src/pages/order/index.tsx
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

3
src/pages/orderDetails/components/addressDetailBox/index.module.scss
View File

@ -1,5 +1,6 @@
.addressBox {
width: 702px;
margin-right: 24px;
// width: 702px;
height: 223px;
background: #FFFFFF;
border-radius: 16px;

22
src/pages/refundPage/components/itemList/index.module.scss
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;

6
src/pages/refundPage/components/itemList/index.tsx
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}>

6
src/pages/refundPage/index.module.scss
View File

@ -46,9 +46,13 @@
}
}
.scrllStyle {
height: 500px;
}
.popupBox {
padding-bottom: env(safe-area-inset-bottom);
width: 100%;

101
src/pages/refundPage/index.tsx
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>

8
src/pages/saleuserPage/index.module.scss
View File

@ -7,7 +7,7 @@ page {
.searchBox {
position: sticky;
top: 0;
width: 750px;
width: 100%;
height: 96px;
background: #FFFFFF;
display: flex;
@ -26,7 +26,8 @@ page {
.itemBox {
margin-left: 24px;
width: 702px;
margin-right: 24px;
// width: 702px;
height: 104px;
background: #FFFFFF;
border-radius: 16px;
@ -67,7 +68,8 @@ page {
.acticveitemBox {
margin-left: 24px;
width: 702px;
margin-right: 24px;
// width: 702px;
height: 104px;
background: #FFFFFF;
border-radius: 16px;

2
src/use/useHttp.ts
View File

@ -146,7 +146,7 @@ export const useRequest = (
...{
header: {
Platform: 3,
Appid: WX_APPID,
// Appid: WX_APPID,
Authorization: token || stateRef.current.token,
},
},