From b9dd27ebb702efab36aa08901101a6c3c5d681d0 Mon Sep 17 00:00:00 2001 From: xuan Date: Thu, 8 Dec 2022 21:59:00 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf(=E6=8F=90=E8=B4=A7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95):=20=E4=BC=98=E5=8C=96UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/refundPage/index.module.scss | 334 +++++++++--------- .../components/Filter/index.module.scss | 7 +- src/pages/takeDelivery/index.tsx | 2 +- 3 files changed, 172 insertions(+), 171 deletions(-) diff --git a/src/pages/refundPage/index.module.scss b/src/pages/refundPage/index.module.scss index 869d693..9fdb468 100644 --- a/src/pages/refundPage/index.module.scss +++ b/src/pages/refundPage/index.module.scss @@ -1,201 +1,199 @@ .flexBox { - display: flex; - width: 200px; - align-items: center; - justify-content: flex-end; + display: flex; + align-items: center; + justify-content: flex-end; + margin-left: 20px; } .icon_shaixuan { - color: #0D7CFF; - font-size: 35px !important; - margin-right: 10px; + color: #0d7cff; + font-size: 35px !important; + margin-right: 10px; } .activeshaixuan { - color: #000; - font-size: 35px !important; - margin-right: 10px; + color: #000; + font-size: 35px !important; + margin-right: 10px; } .shaixuan { - margin-right: 32px; - font-size: 28px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #000000; + margin-right: 32px; + font-size: 28px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #000000; } .activeshai { - color: #0D7CFF; - margin-right: 32px; - font-size: 28px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; + color: #0d7cff; + margin-right: 32px; + font-size: 28px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; } .order_list { - height: calc(100vh - 300px); - background: #f7f7f7; + height: calc(100vh - 300px); + background: #f7f7f7; - .bigBpx { - height: 200px; - } + .bigBpx { + height: 200px; + } - .kongboxTwo { - height: 100px; - } + .kongboxTwo { + height: 100px; + } } .scrllStyle { - height: 500px; + height: 500px; } .safeBox { - height: 100px; + height: 100px; } .popupBox { - padding-bottom: env(safe-area-inset-bottom); + padding-bottom: env(safe-area-inset-bottom); + width: 100%; + + .thirdBox { + margin-top: 20px; + padding-left: 48px; + + .thirdTopfont { + font-size: 28px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #000000; + } + + .timeBox2 { + margin-top: 24px; + background-color: #f6f6f6; + height: 68px; + background: #e9e9e9; + border-radius: 8px; + margin-right: 48px; + text-align: center; + line-height: 68px; + position: relative; + font-size: 28px; + font-weight: 400; + color: #000000; + + .more { + position: absolute; + right: 30px; + top: 5px; + font-size: 40px; + } + } + + .flexModebox { + margin-top: 24px; + display: flex; + flex-wrap: wrap; + + .activemodeBox { + margin-bottom: 16px; + margin-right: 16px; + // width: 152px; + // height: 68px; + padding: 17px 34px 17px 34px; + background: rgba(51, 127, 255, 0.1); + border-radius: 8px; + font-size: 28px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #337fff; + text-align: center; + // line-height: 68px; + border: 1px solid #337fff; + box-sizing: border-box; + } + + .modeBox { + margin-bottom: 16px; + margin-right: 16px; + padding: 17px 34px 17px 34px; + // width: 152px; + // height: 68px; + background: #f6f6f6; + border-radius: 8px; + font-size: 28px; + font-family: PingFangSC-Regular, PingFang SC; + font-weight: 400; + color: #000000; + border: 1px solid #f6f6f6; + text-align: center; + // line-height: 68px; + box-sizing: border-box; + // opacity: 0.4; + } + } + } + + .bottomBox { width: 100%; + // width: 750px; + height: 160px; + background: #ffffff; + position: fixed; + bottom: 0; + z-index: 99; + display: flex; + padding-top: 16px; + align-items: center; + justify-content: space-between; - - - .thirdBox { - margin-top: 20px; - padding-left: 48px; - - .thirdTopfont { - font-size: 28px; - font-family: PingFangSC-Medium, PingFang SC; - font-weight: 500; - color: #000000; - } - - .timeBox2 { - margin-top: 24px; - background-color: #f6f6f6; - height: 68px; - background: #E9E9E9; - border-radius: 8px; - margin-right: 48px; - text-align: center; - line-height: 68px; - position: relative; - font-size: 28px; - font-weight: 400; - color: #000000; - - .more { - position: absolute; - right: 30px; - top: 5px; - font-size: 40px; - } - } - - .flexModebox { - margin-top: 24px; - display: flex; - flex-wrap: wrap; - - .activemodeBox { - margin-bottom: 16px; - margin-right: 16px; - // width: 152px; - // height: 68px; - padding: 17px 34px 17px 34px; - background: rgba(51, 127, 255, 0.1); - border-radius: 8px; - font-size: 28px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #337FFF; - text-align: center; - // line-height: 68px; - border: 1px solid #337FFF; - box-sizing: border-box; - } - - .modeBox { - margin-bottom: 16px; - margin-right: 16px; - padding: 17px 34px 17px 34px; - // width: 152px; - // height: 68px; - background: #f6f6f6; - border-radius: 8px; - font-size: 28px; - font-family: PingFangSC-Regular, PingFang SC; - font-weight: 400; - color: #000000; - border: 1px solid #f6f6f6; - text-align: center; - // line-height: 68px; - box-sizing: border-box; - // opacity: 0.4; - } - } + .resetBox { + margin-left: 48px; + width: 311px; + height: 80px; + border-radius: 44px; + border: 1px solid #087eff; + font-size: 28px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #337fff; + text-align: center; + line-height: 80px; + background-color: #fff; } - .bottomBox { - width: 100%; - // width: 750px; - height: 160px; - background: #FFFFFF; - position: fixed; - bottom: 0; - z-index: 99; - display: flex; - padding-top: 16px; - align-items: center; - justify-content: space-between; - - .resetBox { - margin-left: 48px; - width: 311px; - height: 80px; - border-radius: 44px; - border: 1px solid #087EFF; - font-size: 28px; - font-family: PingFangSC-Medium, PingFang SC; - font-weight: 500; - color: #337FFF; - text-align: center; - line-height: 80px; - background-color: #fff; - } - - .button2 { - margin-right: 32px; - width: 311px; - height: 80px; - background: #68b4ff; - border-radius: 44px; - font-size: 32px; - font-family: PingFangSC-Medium, PingFang SC; - font-weight: 500; - color: #FFFFFF; - text-align: center; - line-height: 80px; - } - - .activeButton { - margin-right: 32px; - width: 311px; - height: 80px; - background: #337FFF; - border-radius: 44px; - font-size: 32px; - font-family: PingFangSC-Medium, PingFang SC; - font-weight: 500; - color: #fff; - text-align: center; - line-height: 80px; - } + .button2 { + margin-right: 32px; + width: 311px; + height: 80px; + background: #68b4ff; + border-radius: 44px; + font-size: 32px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #ffffff; + text-align: center; + line-height: 80px; } - // .areaBox { - // height: calc($customTabBarHeight + env(safe-area-inset-bottom)); - // width: 100%; - // } -} \ No newline at end of file + .activeButton { + margin-right: 32px; + width: 311px; + height: 80px; + background: #337fff; + border-radius: 44px; + font-size: 32px; + font-family: PingFangSC-Medium, PingFang SC; + font-weight: 500; + color: #fff; + text-align: center; + line-height: 80px; + } + } + + // .areaBox { + // height: calc($customTabBarHeight + env(safe-area-inset-bottom)); + // width: 100%; + // } +} diff --git a/src/pages/takeDelivery/components/Filter/index.module.scss b/src/pages/takeDelivery/components/Filter/index.module.scss index 7bafc2b..b42bac0 100644 --- a/src/pages/takeDelivery/components/Filter/index.module.scss +++ b/src/pages/takeDelivery/components/Filter/index.module.scss @@ -39,8 +39,11 @@ padding-bottom: constant(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom); - btn:hover{ - filter: blur(.7); + .btn { + width: 40%; + &:hover { + filter: blur(0.7); + } } .rest_btn { diff --git a/src/pages/takeDelivery/index.tsx b/src/pages/takeDelivery/index.tsx index 2219446..3fd8275 100644 --- a/src/pages/takeDelivery/index.tsx +++ b/src/pages/takeDelivery/index.tsx @@ -80,7 +80,7 @@ const Delivery: FC = () => { setRefresherTriggeredStatus(() => false) } - const [currentStatus, setCurrentStatus] = useState('待提货') + const [currentStatus, setCurrentStatus] = useState('提货中') const handleChangeStatus = ({ id: statusId, name: statusName }) => { setCurrentStatus(statusName)