🐞 fix(#1000663#15#21): 修复提货列表|提货详情模块的样式问题

src/pages/takeDelivery/components/ItemList/index.module.scss

@@ -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;
+    font-weight: bold;
   }
   &__orderStatus {
-    font-weight: 550;
+    font-weight: bold;
     &--finished{
       color: $color_font_three;
     }

src/pages/takeDelivery/components/ItemList/index.tsx

@@ -52,7 +52,7 @@ const ItemList:FC<PropsType> = (props) => {
     <LayoutBlock circle customClassName={styles.layoutBlock}>
       <View className={styles.topBar}>
         <View className={styles.topBar__orderNo}>
-          <View>单号：{itemData?.take_goods_order_no}</View>
+          <View className={styles.orderNo}>单号：{itemData?.take_goods_order_no}</View>
           {itemData?.take_goods_status === 0 && (
             <View className={classnames(styles.topBar__orderStatus, styles['topBar__orderStatus--takingGoods'])}>提货中</View>
           )}
@@ -60,18 +60,17 @@ const ItemList:FC<PropsType> = (props) => {
         </View>
         <Text className={styles.topBar__orderType}>{itemData?.take_goods_order_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>
           <View className={styles.content__row__right}>
             <SaleModeTag saleMode={itemData.sale_mode} size='small' customClassName={styles.tag}></SaleModeTag>
-            {/* TODO: 面料字段、颜色字段 */}
             {itemData.delivery_product_nums}种面料，{itemData.delivery_product_color_nums}种颜色，共
             {itemData?.sale_mode === EnumSaleMode.Bulk ? `${itemData?.take_roll}条` : `${formatMeterDiv(itemData?.take_meters)}米`}
           </View>
         </View>
-        <View className={styles.content__row}>
+        <View className={classnames(styles.content__row, styles.bord)}>
           <View className={styles.content__row__left}>供应信息：</View>
           <View className={styles.content__row__right}>{itemData?.supplier_name || '空'}</View>
         </View>
@@ -85,7 +84,7 @@ const ItemList:FC<PropsType> = (props) => {
           customClassName={styles.bottomBar__button}
           type='info'
           plain
-          customStyles={{ color: '#8e8e8e', borderColor: '#8e8e8e' }}
+          customStyles={{ color: '#636363', borderColor: '#c8c8c8' }}
           round
           onClick={() => handleDetail(itemData)}>
           查看详情

src/pages/takeDelivery/index.module.scss

@@ -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/takeDelivery/index.tsx

@@ -14,6 +14,8 @@ import DeliveryStatusList from './components/DeliveryStatusList'
 import Popup from '@/components/popup'
 import DeliveryFilter, { SearchField } from './components/Filter'
 import TimePickerPopup from '@/components/timePickerPopup'
+import Empty from '@/components/empty'
+import { LIST_EMPTY_IMAGE } from '@/common/constant'
 
 type SearchData = {
   take_goods_order_no?: string // 提货单号
@@ -41,7 +43,7 @@ const Delivery: FC = () => {
   const { fetchData: FetchDeliveryOrderList, state: orderState } = TakeGoodsOrderList()
   //数据加载状态
   const statusMore = useMemo(() => {
-    return dataLoadingStatus({ list: takeDeliveryOrderList.list, total: takeDeliveryOrderList.total, status: orderState.loading })
+    return dataLoadingStatus({ list: takeDeliveryOrderList.list, total: takeDeliveryOrderList.total, status: orderState.loading! })
   }, [takeDeliveryOrderList, orderState])
 
   //输入搜索关键字
@@ -175,6 +177,7 @@ const Delivery: FC = () => {
 
       <View className={styles.listBox}>
         <InfiniteScroll
+          emptySlot={<Empty picUrl={LIST_EMPTY_IMAGE} text='暂无数据'/>}
           statusMore={statusMore}
           selfonScrollToLower={getScrollToLower}
           refresherEnabled={true}