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

🎈 perf(提货订单): 优化UI

Browse Source
This commit is contained in:
xuan 2022-12-08 21:59:00 +08:00
parent 435d71400a
commit b9dd27ebb7
3 changed files with 172 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,201 +1,199 @@
.flexBox { .flexBox {
display: flex; display: flex;
width: 200px; align-items: center;
align-items: center; justify-content: flex-end;
justify-content: flex-end; margin-left: 20px;
} }
.icon_shaixuan { .icon_shaixuan {
color: #0D7CFF; color: #0d7cff;
font-size: 35px !important; font-size: 35px !important;
margin-right: 10px; margin-right: 10px;
} }
.activeshaixuan { .activeshaixuan {
color: #000; color: #000;
font-size: 35px !important; font-size: 35px !important;
margin-right: 10px; margin-right: 10px;
} }
.shaixuan { .shaixuan {
margin-right: 32px; margin-right: 32px;
font-size: 28px; font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
} }
.activeshai { .activeshai {
color: #0D7CFF; color: #0d7cff;
margin-right: 32px; margin-right: 32px;
font-size: 28px; font-size: 28px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
} }
.order_list { .order_list {
height: calc(100vh - 300px); height: calc(100vh - 300px);
background: #f7f7f7; background: #f7f7f7;
.bigBpx { .bigBpx {
height: 200px; height: 200px;
} }
.kongboxTwo { .kongboxTwo {
height: 100px; height: 100px;
} }
} }
.scrllStyle { .scrllStyle {
height: 500px; height: 500px;
} }
.safeBox { .safeBox {
height: 100px; height: 100px;
} }
.popupBox { .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: 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;
.thirdBox { width: 311px;
margin-top: 20px; height: 80px;
padding-left: 48px; border-radius: 44px;
border: 1px solid #087eff;
.thirdTopfont { font-size: 28px;
font-size: 28px; font-family: PingFangSC-Medium, PingFang SC;
font-family: PingFangSC-Medium, PingFang SC; font-weight: 500;
font-weight: 500; color: #337fff;
color: #000000; text-align: center;
} line-height: 80px;
background-color: #fff;
.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 { .button2 {
width: 100%; margin-right: 32px;
// width: 750px; width: 311px;
height: 160px; height: 80px;
background: #FFFFFF; background: #68b4ff;
position: fixed; border-radius: 44px;
bottom: 0; font-size: 32px;
z-index: 99; font-family: PingFangSC-Medium, PingFang SC;
display: flex; font-weight: 500;
padding-top: 16px; color: #ffffff;
align-items: center; text-align: center;
justify-content: space-between; line-height: 80px;
.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;
}
} }
// .areaBox { .activeButton {
// height: calc($customTabBarHeight + env(safe-area-inset-bottom)); margin-right: 32px;
// width: 100%; 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%;
// }
}

7
src/pages/takeDelivery/components/Filter/index.module.scss
View File

@ -39,8 +39,11 @@
padding-bottom: constant(safe-area-inset-bottom); padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom);
btn:hover{ .btn {
filter: blur(.7); width: 40%;
&:hover {
filter: blur(0.7);
}
} }
.rest_btn { .rest_btn {

2
src/pages/takeDelivery/index.tsx
View File

@ -80,7 +80,7 @@ const Delivery: FC = () => {
setRefresherTriggeredStatus(() => false) setRefresherTriggeredStatus(() => false)
} }
const [currentStatus, setCurrentStatus] = useState('待提货') const [currentStatus, setCurrentStatus] = useState('提货中')
const handleChangeStatus = ({ id: statusId, name: statusName }) => { const handleChangeStatus = ({ id: statusId, name: statusName }) => {
setCurrentStatus(statusName) setCurrentStatus(statusName)