From 79a3364b5f1c779db9dcea5ba982d10719f496e6 Mon Sep 17 00:00:00 2001 From: Haiyi <1021441632@qq.com> Date: Mon, 10 Oct 2022 17:14:21 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=E8=A7=A3=E5=86=B3=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E5=85=BC=E5=AE=B9=E6=80=A7=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/goodsItem/index.module.scss | 2 +- src/components/shoppingCart/index.module.scss | 13 ++- src/components/shoppingCart/index.tsx | 2 +- src/pages/customerPage/index.module.scss | 8 +- .../components/PayPopup/index.module.scss | 23 +++- src/pages/order/components/PayPopup/index.tsx | 4 +- .../components/itemList/index.module.scss | 28 +++-- src/pages/order/components/itemList/index.tsx | 10 +- src/pages/order/index.module.scss | 20 ++-- src/pages/order/index.tsx | 4 +- .../addressDetailBox/index.module.scss | 3 +- .../components/itemList/index.module.scss | 22 ++-- .../refundPage/components/itemList/index.tsx | 6 +- src/pages/refundPage/index.module.scss | 6 +- src/pages/refundPage/index.tsx | 101 +++++++++--------- src/pages/saleuserPage/index.module.scss | 8 +- src/use/useHttp.ts | 2 +- 17 files changed, 156 insertions(+), 106 deletions(-) diff --git a/src/components/goodsItem/index.module.scss b/src/components/goodsItem/index.module.scss index 51fd2d3..cab787a 100644 --- a/src/components/goodsItem/index.module.scss +++ b/src/components/goodsItem/index.module.scss @@ -1,8 +1,8 @@ .goodsBox { display: flex; margin-bottom: 32px; - // justify-content: space-between; + // justify-content: space-between; .pic { width: 118px; height: 118px; diff --git a/src/components/shoppingCart/index.module.scss b/src/components/shoppingCart/index.module.scss index 32943ae..7d79b4c 100644 --- a/src/components/shoppingCart/index.module.scss +++ b/src/components/shoppingCart/index.module.scss @@ -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; } \ No newline at end of file diff --git a/src/components/shoppingCart/index.tsx b/src/components/shoppingCart/index.tsx index bb35c66..43d87b4 100644 --- a/src/components/shoppingCart/index.tsx +++ b/src/components/shoppingCart/index.tsx @@ -120,7 +120,7 @@ export default memo(forwardRef((props: prosObj, ref) => { return ( closePopup?.()}> - + {obj?.code}# {obj?.name} 已选 1 种面料,{selectTotal} 个颜色,共 {selectNums} {showModefont} diff --git a/src/pages/customerPage/index.module.scss b/src/pages/customerPage/index.module.scss index 9d8704f..3afac6d 100644 --- a/src/pages/customerPage/index.module.scss +++ b/src/pages/customerPage/index.module.scss @@ -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; diff --git a/src/pages/order/components/PayPopup/index.module.scss b/src/pages/order/components/PayPopup/index.module.scss index 740395e..d983f3f 100644 --- a/src/pages/order/components/PayPopup/index.module.scss +++ b/src/pages/order/components/PayPopup/index.module.scss @@ -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; } \ No newline at end of file diff --git a/src/pages/order/components/PayPopup/index.tsx b/src/pages/order/components/PayPopup/index.tsx index a4ab22b..3a6ee44 100644 --- a/src/pages/order/components/PayPopup/index.tsx +++ b/src/pages/order/components/PayPopup/index.tsx @@ -106,7 +106,7 @@ export default memo((props: Props) => { return ( popupClose?.()}> - + { showSide && @@ -175,7 +175,7 @@ export default memo((props: Props) => { } { !showSide && - + showImage()}> diff --git a/src/pages/order/components/itemList/index.module.scss b/src/pages/order/components/itemList/index.module.scss index c64a221..49fd41b 100644 --- a/src/pages/order/components/itemList/index.module.scss +++ b/src/pages/order/components/itemList/index.module.scss @@ -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; diff --git a/src/pages/order/components/itemList/index.tsx b/src/pages/order/components/itemList/index.tsx index 221c5d5..2992d88 100644 --- a/src/pages/order/components/itemList/index.tsx +++ b/src/pages/order/components/itemList/index.tsx @@ -21,7 +21,6 @@ export default memo((props: propsObj) => { }) } - return ( navTo(e)}> @@ -31,9 +30,12 @@ export default memo((props: propsObj) => { {props?.obj?.purchaser_name} - - 颜色 ({props?.obj?.total_colors}) + + + 颜色 ({props?.obj?.total_colors}) + + @@ -75,6 +77,6 @@ export default memo((props: propsObj) => { toPay={(e) => props?.toPay?.(e, props?.obj)} > - + ) }) \ No newline at end of file diff --git a/src/pages/order/index.module.scss b/src/pages/order/index.module.scss index 14d39ae..7e9da40 100644 --- a/src/pages/order/index.module.scss +++ b/src/pages/order/index.module.scss @@ -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)); + // } } \ No newline at end of file diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx index e7e5a72..1389c45 100644 --- a/src/pages/order/index.tsx +++ b/src/pages/order/index.tsx @@ -628,7 +628,7 @@ export default () => { ) })} - + {/* */} closePopup()}> @@ -683,7 +683,7 @@ export default () => { {isDisabled} - + {/* */} - - + + + + + {/* */} diff --git a/src/pages/saleuserPage/index.module.scss b/src/pages/saleuserPage/index.module.scss index 4de4ecc..ada2c52 100644 --- a/src/pages/saleuserPage/index.module.scss +++ b/src/pages/saleuserPage/index.module.scss @@ -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; diff --git a/src/use/useHttp.ts b/src/use/useHttp.ts index 3a6cf56..4ce0db3 100644 --- a/src/use/useHttp.ts +++ b/src/use/useHttp.ts @@ -146,7 +146,7 @@ export const useRequest = ( ...{ header: { Platform: 3, - Appid: WX_APPID, + // Appid: WX_APPID, Authorization: token || stateRef.current.token, }, },