diff --git a/src/pages/order/components/kindList/index.module.scss b/src/pages/order/components/kindList/index.module.scss index 052a8b5..4946493 100644 --- a/src/pages/order/components/kindList/index.module.scss +++ b/src/pages/order/components/kindList/index.module.scss @@ -1,123 +1,135 @@ - -.orders_list_title{ - padding: 20px 20px 10px 20px; - color: $color_font_two; - font-size: $font_size_medium; +.orders_list_title { + padding: 20px 20px 10px 20px; + color: $color_font_two; + font-size: $font_size_medium; } -.orders_list_con{ - - background-color: #fff; - border-radius: 20px; - padding: 20px; - .order_list{ - &:nth-child(n+2) { - margin-top: 30px; +.orders_list_con { + background-color: #fff; + border-radius: 20px; + padding: 20px; + .order_list { + &:nth-child(n + 2) { + margin-top: 30px; + } + .order_list_title { + display: flex; + align-items: center; + .tag { + font-size: $font_size_min; + background-color: #cde5ff; + padding: 5px 10px; + border-radius: 6px; + color: $color_main; + } + .title { + font-weight: 700; + font-size: $font_size; + margin-left: 20px; + flex: 1; + } + .num { + color: $color_font_two; + font-size: $font_size_min; + } + } + } + .order_list_scroll { + margin-top: 30px; + + .order_list_item { + display: flex; + &:nth-child(n + 2) { + margin-top: 30px; + } + .order_list_item_img { + width: 126px; + height: 126px; + border-radius: 20px; + } + .order_list_item_con { + display: flex; + width: 100%; + flex: 1; + border-bottom: 1px solid #f0f0f0; + height: 150px; + padding-top: 20px; + box-sizing: border-box; + } + .order_list_item_des { + flex: 1; + box-sizing: border-box; + padding-left: 30px; + .order_list_item_title { + font-weight: 700; + font-size: $font_size; + margin-bottom: 15px; + text { + height: 30px; + background: #f0f0f0; + border-radius: 6px; + color: #ababab; + font-size: 24px; + padding: 0 10px; + margin-left: 20px; + font-weight: normal; + line-height: 30px; + } } - .order_list_title{ + .order_list_item_price { + display: flex; + align-items: center; + font-size: 26px; + color: #000000; + .lastPrice { + margin-right: 10px; + font-size: 26px; + // font-weight: 500; + text-decoration: line-through; + color: #7f7f7f; + } + .order_list_item_price_dg { + font-size: 26px; + color: $color_font_three; display: flex; align-items: center; - .tag{ - font-size: $font_size_min; - background-color: #CDE5FF; - padding: 5px 10px; - border-radius: 6px; - color: $color_main; - } - .title{ - font-weight: 700; - font-size: $font_size; - margin-left: 20px; - flex:1; - } - .num{ - color: $color_font_two; - font-size: $font_size_min; + + Text { + padding-left: 13px; } + } } - } - .order_list_scroll{ - margin-top: 30px; - - .order_list_item { - display: flex; - &:nth-child(n + 2) { - margin-top: 30px; - } - .order_list_item_img{ - width: 126px; - height: 126px; - border-radius: 20px; - } - .order_list_item_con{ - display: flex; - width: 100%; - flex:1; - border-bottom: 1px solid #f0f0f0; - height: 150px; - padding-top: 20px; - box-sizing: border-box; - } - .order_list_item_des{ - flex:1; - box-sizing: border-box; - padding-left: 30px; - .order_list_item_title{ - font-weight: 700; - font-size: $font_size; - margin-bottom: 15px; - text{ - height: 30px; - background: #f0f0f0; - border-radius: 6px; - color: #ABABAB; - font-size: 24px; - padding: 0 10px; - margin-left: 20px; - font-weight: normal; - line-height: 30px; - } - } - .order_list_item_price, .order_list_item_price_dg{ - font-size: 26px; - color: $color_font_three; - display: flex; - align-items: center; - Text{ - padding-left: 13px; - } - } - } - .order_list_item_count{ - display: flex; - flex-direction: column; - align-items: flex-end; - .count_num{ - color: $color_main; - font-size: $font_size; - margin-bottom: 15px; - font-weight: 400; - text{ - font-size: $font_size_min; - } - } - .count_price { - font-size: $font_size; - font-weight: 700; - text{ - font-size: $font_size_min; - } - } - } - } - } - .order_estimated_amount{ + } + .order_list_item_count { display: flex; - align-items: flex-end; flex-direction: column; - padding: 30px 0; - .order_price_des{ - font-size: $font_size_medium; - color: $color_font_two; + align-items: flex-end; + .count_num { + color: $color_main; + font-size: $font_size; + margin-bottom: 15px; + font-weight: 400; + text { + font-size: $font_size_min; + } } + .count_price { + font-size: $font_size; + font-weight: 700; + text { + font-size: $font_size_min; + } + } + } } + } + .order_estimated_amount { + display: flex; + align-items: flex-end; + flex-direction: column; + padding: 30px 0; + .order_price_des { + font-size: $font_size_medium; + color: $color_font_two; + } + } } diff --git a/src/pages/order/components/kindList/index.tsx b/src/pages/order/components/kindList/index.tsx index 90e553d..efc4092 100644 --- a/src/pages/order/components/kindList/index.tsx +++ b/src/pages/order/components/kindList/index.tsx @@ -212,8 +212,13 @@ const KindList = ({ order, comfirm = false }: Param) => { {colorItem?.apply_return_roll > 0 && {`待退${colorItem?.apply_return_roll}条`}} + { + order?.sale_mode === 0 && colorItem?.standard_sale_price > colorItem.sale_price && ¥{standardPrice(colorItem.standard_sale_price)} + } + <> ¥{standardPrice(colorItem.sale_price)} - {aboutWeight(colorItem.estimate_weight)} + {aboutWeight(colorItem.estimate_weight)} +