diff --git a/src/pages/orderDetails/components/addressDetailBox/index.module.scss b/src/pages/orderDetails/components/addressDetailBox/index.module.scss index 9fd8924..fd11846 100644 --- a/src/pages/orderDetails/components/addressDetailBox/index.module.scss +++ b/src/pages/orderDetails/components/addressDetailBox/index.module.scss @@ -90,7 +90,7 @@ .reatBox { position: relative; - margin-right: 32px; + margin-left: 32px; .updateBtn { width: 200px; diff --git a/src/pages/orderDetails/index.module.scss b/src/pages/orderDetails/index.module.scss index 603cc99..7832ddb 100644 --- a/src/pages/orderDetails/index.module.scss +++ b/src/pages/orderDetails/index.module.scss @@ -255,6 +255,54 @@ page { } } } + + .product_goods { + padding-right: 32px; + // width: 100%; + margin-top: 32px; + display: flex; + align-items: center; + margin-bottom: 24px; + justify-content: space-between; + .prodct_name { + height: 32px; + font-size: 26px; + font-weight: 400; + color: #3a3a3a; + margin-left: 32px; + max-width: 224px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + .product_right { + display: flex; + align-items: center; + .lastBox { + min-width: 120px; + font-size: 26px; + text-decoration: line-through; + color: #7f7f7f; + margin-right: 24px; + text-align: left; + } + .itemMoney { + min-width: 120px; + font-size: 28px; + margin-right: 10px; + color: #757575; + margin-right: 40px; + text-align: left; + } + .itemMoneyOne { + width: 100px; + font-size: 26px; + font-weight: 500; + color: #4f4f4f; + text-align: left; + } + } + } } .goodsBox:last-child { diff --git a/src/pages/orderDetails/index.tsx b/src/pages/orderDetails/index.tsx index 283f9bd..50c0aa4 100644 --- a/src/pages/orderDetails/index.tsx +++ b/src/pages/orderDetails/index.tsx @@ -95,27 +95,43 @@ const GoodsItem = (porps: PropGoods) => { { item.product_colors.map((it, inx) => { return ( - - - - - {/* */} - - - {formatHashTag(it.code, it.name)} - x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'} - - - - ¥{formatPriceDiv(it.sale_price)}/{obj?.sale_mode === 1 ? 'm' : 'kg'} - { - obj?.sale_mode === 0 && it?.sale_price !== it?.standard_sale_price && ¥{it?.standard_sale_price / 100}/{obj?.sale_mode === 1 ? 'm' : 'kg'} - } - - ¥{formatPriceDiv(it.total_sale_price)} - + // {/* 第一个版本的样式 */} + + // + // + // + // + // + // + // {formatHashTag(it.code, it.name)} + // x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'} + // + // + // + // ¥{formatPriceDiv(it.sale_price)}/{obj?.sale_mode === 1 ? 'm' : 'kg'} + // { + // obj?.sale_mode === 0 && it?.sale_price !== it?.standard_sale_price && ¥{it?.standard_sale_price / 100}/{obj?.sale_mode === 1 ? 'm' : 'kg'} + // } + // + // ¥{formatPriceDiv(it.total_sale_price)} + // + // + // + + // {/* 第二个版本的样式 */} + + + {formatHashTag(it.code, it.name)} x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'} + + + { + obj?.sale_mode === 0 && it?.sale_price !== it?.standard_sale_price && ¥{it?.standard_sale_price / 100}/{obj?.sale_mode === 1 ? 'm' : 'kg'} + } + ¥{formatPriceDiv(it.sale_price)}/{obj?.sale_mode === 1 ? 'm' : 'kg'} + ¥{formatPriceDiv(it.total_sale_price)} + ) }) }