diff --git a/src/components/product/index.module.scss b/src/components/product/index.module.scss index e6face5..0100b9b 100644 --- a/src/components/product/index.module.scss +++ b/src/components/product/index.module.scss @@ -7,16 +7,18 @@ width: 100%; background-color: #fff; border-radius: 20px; - padding: 20px; + padding: 10px; box-sizing: border-box; display: flex; + // height: 160px; + box-sizing: border-box; justify-content: space-between; &:nth-child(n + 2) { margin-top: 16px; } .item_img { - width: 198px; - height: 198px; + width: 160px; + height: 160px; position: relative; image { width: 100%; @@ -79,5 +81,33 @@ margin-top: 16px; @include common_ellipsis($params: 2); } + .header_label { + width: 212px; + height: 40px; + background: #fcf4e9; + border-radius: 5px; + font-size: 24px; + display: flex; + text { + display: inline-block; + height: 100%; + display: flex; + justify-content: center; + align-items: center; + &:nth-child(1) { + width: 80px; + height: 40px; + background: #fee5cd; + border-radius: 5px 0px 0px 5px; + color: #522b0fff; + } + &:nth-child(2) { + flex: 1; + background: #fcf4e9ff; + border-radius: 0px 5px 5px 0px; + color: #c57c26ff; + } + } + } } } diff --git a/src/components/product/index.tsx b/src/components/product/index.tsx index 822c257..dd1b7c4 100644 --- a/src/components/product/index.tsx +++ b/src/components/product/index.tsx @@ -1,4 +1,4 @@ -import { Image, View } from '@tarojs/components' +import { Image, Text, View } from '@tarojs/components' import Taro from '@tarojs/taro' import { useCallback, useMemo } from 'react' import LabAndImg from '../LabAndImg' @@ -35,8 +35,10 @@ const Product = ({ desStatus = true, productList = [] }: Params) => { {item.width} {item.weight_density} - {`${item.craft};${item.component}`} - {desStatus && {item.describe}} + {!!item.product_screw_id && + 推荐 + 配套螺纹 + } ) diff --git a/src/pages/shopCar/components/recommendProduct/index.module.scss b/src/pages/shopCar/components/recommendProduct/index.module.scss index e50913b..c245010 100644 --- a/src/pages/shopCar/components/recommendProduct/index.module.scss +++ b/src/pages/shopCar/components/recommendProduct/index.module.scss @@ -23,7 +23,7 @@ bottom: 0; right: 0; background-color: #fff; - z-index: 1600; + z-index: 1800; border-radius: 16px; padding: 32px; box-sizing: border-box; @@ -54,6 +54,6 @@ height: 100vh; width: 100vh; background: rgba(0, 0, 0, 0.6); - z-index: 1500; + z-index: 1700; } }