显示格式优化

src/pages/order-list/index.tsx

@@ -5,7 +5,8 @@ import { Empty, Popup } from '@antmjs/vantui'
 import useAuthStore from '@/stores/auth/useAuthStore'
 import { cancelOrderApi, getOrderDetailApi, getOrderListApi } from '@/services/order'
 import { ORDER_STATUS_FILTERS, ORDER_STATUS_TEXT } from '@/types/order'
-import { resolveFileUrl } from '@/utils/format'
+import { formatSpec, resolveFileUrl } from '@/utils/format'
+import PriceText from '@/components/PriceText'
 import type { OrderDetail, OrderListItem, OrderStatus } from '@/types/order'
 import './index.less'
 
@@ -184,8 +185,8 @@ export default function OrderListPage() {
                   )}
                   <View className='order-item__goods-info'>
                     <Text className='order-item__goods-name'>{i.product_name}</Text>
-                    {!!i.product_spec && (
-                      <Text className='order-item__goods-spec'>{i.product_spec} {i.unit}</Text>
+                    {!!formatSpec(i.product_spec, i.unit) && (
+                      <Text className='order-item__goods-spec'>{formatSpec(i.product_spec, i.unit)}</Text>
                     )}
                   </View>
                   <Text className='order-item__goods-qty'>×{i.quantity} </Text>
@@ -262,7 +263,8 @@ export default function OrderListPage() {
                   <View className='detail-popup__item-info'>
                     <Text className='detail-popup__item-name'>{item.product_name}</Text>
                     <Text className='detail-popup__item-spec'>
-                      {item.product_spec ? `${item.product_spec}${item.unit} ` : ''}￥{item.price} × {item.quantity}
+                      {formatSpec(item.product_spec, item.unit)}{' '}
+                      <PriceText price={item.price} spec={item.product_spec} /> × {item.quantity}
                     </Text>
                   </View>
                   <Text className='detail-popup__item-amount'>￥{item.amount}</Text>