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

🐞 fix(#1000663#16#17#18#19#20): 修复发货列表|发货详情的样式问题

Browse Source
This commit is contained in:
xuan
2022-11-11 11:42:31 +08:00
parent 10a304a791
commit 851902873b
18 changed files with 320 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/delivery/components/Filter/index.module.scss
+8 -4
View File
@@ -48,11 +48,12 @@
font-size: 28px;
height: 72px;
&--text {
color: #909090;
color: #696969;
display: flex;
flex-flow: row nowrap;
justify-content: center;
align-items: center;
font-weight: lighter;
}
&:hover {
opacity: 0.7;
@@ -62,6 +63,7 @@
background-color: #eaf2ff;
.filterButton--text {
color: $color_main;
font-weight: 550;
}
}
}
@@ -74,11 +76,13 @@
justify-content: space-around;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
.btn {
width: 40%;
&:hover{
filter: blur(.7);
}
btn:hover{
filter: blur(.7);
}
.rest_btn {
font-size: 28px;
}
src/pages/delivery/components/ItemList/index.module.scss
+8 -4
View File
@@ -1,5 +1,6 @@
.layoutBlock{
margin: 24px;
margin: 20px;
padding: 24px;
}
.topBar {
font-size: 28px;
@@ -8,13 +9,16 @@
flex-flow: row nowrap;
justify-content: space-between;
color: $color_font_one;
.orderNo{
font-weight: bold;
}
}
&__orderType {
color: rgba($color: #000000, $alpha: 0.6);
font-weight: 550;
color: #6e6e6e;
font-weight: bold;
}
&__orderStatus {
font-weight: 550;
font-weight: bold;
&--toBeAudited{
color: #e42945;
}
src/pages/delivery/components/ItemList/index.tsx
+3 -3
View File
@@ -53,13 +53,13 @@ const ItemList:FC<PropsType> = (props) => {
<LayoutBlock circle customClassName={styles.layoutBlock}>
<View className={styles.topBar}>
<View className={styles.topBar__orderNo}>
<View>单号：{itemData?.order_no}</View>
<View className={styles.orderNo}>单号：{itemData?.order_no}</View>
{itemData?.status === 1 && <View className={classnames(styles.topBar__orderStatus, styles['topBar__orderStatus--finish'])}>已审核</View>}
{itemData?.status === 0 && <View className={classnames(styles.topBar__orderStatus, styles['topBar__orderStatus--toBeAudited'])}>待审核</View>}
</View>
<Text className={styles.topBar__orderType}>{itemData?.type_name}</Text>
</View>
<Divider direction='horizontal' customStyles={{ margin: '30rpx 0' }}></Divider>
<Divider direction='horizontal' customStyles={{ margin: '20rpx 0 10rpx 0' }}></Divider>
<View className={styles.content}>
<View className={classnames(styles.content__row, styles.bord)}>
<View className={styles.content__row__left}>货品信息：</View>
@@ -83,7 +83,7 @@ const ItemList:FC<PropsType> = (props) => {
customClassName={styles.bottomBar__button}
plain
type='info'
customStyles={{ color: '#8e8e8e', borderColor: '#8e8e8e' }}
customStyles={{ color: '#636363', borderColor: '#c8c8c8' }}
round
onClick={() => handleDetail(itemData)}>
查看详情
src/pages/delivery/index.module.scss
+1 -1
View File
@@ -25,7 +25,7 @@ page {
height: 100%;
&--total {
display: block;
margin-top: 24px;
margin-top: 20px;
padding: 0 24px;
font-size: 24px;
color: #9d9d9d;
src/pages/delivery/index.tsx
+1 -1
View File
@@ -41,7 +41,7 @@ const Delivery: FC = () => {
const { fetchData: FetchDeliveryOrderList, state: orderState } = DeliverNoticeOrderList()
//数据加载状态
const statusMore = useMemo(() => {
return dataLoadingStatus({ list: deliveryOrderList.list, total: deliveryOrderList.total, status: orderState.loading })
return dataLoadingStatus({ list: deliveryOrderList.list, total: deliveryOrderList.total, status: orderState.loading! })
}, [deliveryOrderList, orderState])
//输入搜索关键字
src/pages/deliveryDetail/index.module.scss
+7 -1
View File
@@ -38,6 +38,8 @@ page {
justify-content: space-between;
align-items: center;
font-size: 28px;
font-weight: bold;
color: #424242;
padding: 10px 0;
}
&--detail {
@@ -47,6 +49,7 @@ page {
align-items: center;
padding: 10px 0;
font-size: 28px;
color: #6e6e6e;
}
&--name{
@@ -69,19 +72,22 @@ page {
.orderNo {
font-size: 28px;
font-weight: 550;
color: #424242;
}
.status {
font-size: 28px;
&--toBeAudit {
color: $color_danger;
font-weight: bold;
}
&--audited {
color: $color_main;
font-weight: bold;
}
}
.divider {
margin: 24px 0;
margin: 20px 0 10px 0;
}
.total {
margin-top: 24px;
src/pages/deliveryDetail/index.tsx
+7 -7
View File
@@ -132,7 +132,7 @@ const DeliveryDetail: FC = () => {
return (
<View className={styles.deliveryDetail}>
<View className={styles.content}>
<LayoutBlock circle>
<LayoutBlock circle customStyle={{padding: '24rpx'}}>
<View className={styles.detailTop}>
<View className={styles.orderNo}>发货单号：{detailInfo?.order_no}</View>
{detailInfo?.status === 0 ? <View className={styles['status--toBeAudit']}>待审核</View> : <View className={styles['status--audited']}>已完成</View>}
@@ -147,17 +147,17 @@ const DeliveryDetail: FC = () => {
</Text>
</View>
</LayoutBlock>
<LayoutBlock circle>
<LayoutBlock circle customStyle={{padding: '24rpx'}}>
<View className={styles.orderInfoTop}>订单信息</View>
<Divider direction='horizontal' customClassName={styles.divider}></Divider>
<View className='orderInfoDetail'>
<Cell title='订单备注：' desc={detailInfo?.sale_order_remark}></Cell>
<Cell title='创建时间：' desc={formatDateTime(detailInfo?.create_time)}></Cell>
<Cell title='发货方式：' desc={detailInfo?.shipment_mode_name}></Cell>
<Cell title='发货地址：' desc={`${detailInfo.province_name}${detailInfo.city_name}${detailInfo.district_name}${detailInfo.address_detail}`}></Cell>
<Cell title='订单备注：' desc={detailInfo?.sale_order_remark || '暂无备注信息'}></Cell>
<Cell title='创建时间：' desc={formatDateTime(detailInfo?.create_time) || '暂无创建时间'}></Cell>
<Cell title='发货方式：' desc={detailInfo?.shipment_mode_name || '暂无发货方式'}></Cell>
<Cell title='发货地址：' desc={`${detailInfo.province_name}${detailInfo.city_name}${detailInfo.district_name}${detailInfo.address_detail}` || '暂无发货地址'}></Cell>
</View>
</LayoutBlock>
<LayoutBlock circle>
<LayoutBlock circle customStyle={{padding: '24rpx'}}>
<View className={styles.orderInfoTop}>附件</View>
<Divider direction='horizontal' customClassName={styles.divider}></Divider>
<UploadImage onlyRead={detailInfo?.status !== 0} onChange={handleUploadChange} defaultList={detailInfo?.delivery_appendix_url}></UploadImage>