From b9bb41ee722cf1c40009db5aba1f606bc70aa4f4 Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Tue, 7 Feb 2023 18:37:50 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf(=E8=A1=A5=E5=85=85=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E9=85=8D=E5=A5=97=E8=9E=BA=E7=BA=B9?= =?UTF-8?q?=E6=A0=87=E8=AF=86):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/constant.ts | 4 ++-- src/pages/order/components/kindList/index.module.scss | 9 +++++++++ src/pages/order/components/kindList/index.tsx | 4 +++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/common/constant.ts b/src/common/constant.ts index 7633c55..926374a 100644 --- a/src/common/constant.ts +++ b/src/common/constant.ts @@ -5,7 +5,7 @@ // export const BASE_URL = `http://192.168.0.89:40001/lymarket` // export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞 // export const BASE_URL = 'https://test.zzfzyc.com/lymarket' // 测试环境 -export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布 +// export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布 // export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发 // export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发 @@ -13,7 +13,7 @@ export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布 // export const BASE_URL = 'https://www.zzfzyc.com/lymarket' // 正式环境 // export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞 // export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添 -// export const BASE_URL = 'http://192.168.1.28:50001/lymarket' // 婷 +export const BASE_URL = 'http://192.168.1.28:50001/lymarket' // 婷 // export const BASE_URL = 'http://192.168.1.42:50002/lymarket' // 杰 // CDN diff --git a/src/pages/order/components/kindList/index.module.scss b/src/pages/order/components/kindList/index.module.scss index 4946493..b452580 100644 --- a/src/pages/order/components/kindList/index.module.scss +++ b/src/pages/order/components/kindList/index.module.scss @@ -31,6 +31,15 @@ color: $color_font_two; font-size: $font_size_min; } + .label { + width: 112px; + height: 34px; + background: #fcf4e9; + border-radius: 4px; + font-size: 24px; + text-align: center; + color: #c57c26ff; + } } } .order_list_scroll { diff --git a/src/pages/order/components/kindList/index.tsx b/src/pages/order/components/kindList/index.tsx index efc4092..b21ebb7 100644 --- a/src/pages/order/components/kindList/index.tsx +++ b/src/pages/order/components/kindList/index.tsx @@ -195,7 +195,9 @@ const KindList = ({ order, comfirm = false }: Param) => { {order.sale_mode_name} {formatHashTag(item.code, item.name)} - 共{item?.product_colors.length}种 + {!item.is_screw_recommend + ? 共{item?.product_colors.length}种 + : 配套螺纹} {item?.product_colors?.map((colorItem) => {