From d5fa404c36176ef08c66dbc29025bc80920d1863 Mon Sep 17 00:00:00 2001 From: shenyifei Date: Sat, 27 Dec 2025 15:29:18 +0800 Subject: [PATCH] =?UTF-8?q?feat(theme):=20=E6=B7=BB=E5=8A=A0=E8=B6=85?= =?UTF-8?q?=E5=B0=8F=E5=AD=97=E4=BD=93=E5=8F=98=E9=87=8F=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E9=A2=84=E8=A7=88=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在CustomTheme中添加--text-xxs字体变量用于超小字体显示 - 为nutuiTabbarTextFontSize设置使用新的超小字体变量 - 修复购买流程中生产预览页面的按钮样式问题 - 修复购买流程中市场预览页面的按钮样式问题 - 优化预览页面按钮的类名配置,移除冗余样式定义 - 调整购买状态判断逻辑,允许预览状态在最后一步时显示 --- packages/app-client/src/components/biz/CustomTheme.tsx | 2 ++ packages/app-client/src/constant/purchase.ts | 4 ++-- packages/app-client/src/pages/purchase/made/preview.tsx | 2 -- packages/app-client/src/pages/purchase/market/preview.tsx | 2 -- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/app-client/src/components/biz/CustomTheme.tsx b/packages/app-client/src/components/biz/CustomTheme.tsx index 9ad68fd..8ff8231 100644 --- a/packages/app-client/src/components/biz/CustomTheme.tsx +++ b/packages/app-client/src/components/biz/CustomTheme.tsx @@ -27,6 +27,7 @@ export function CustomTheme(props: CustomThemeProps) { style={{ // @ts-ignore "--scale-factor": scaleFactor, + "--text-xxs": `calc(${Taro.pxTransform(10 * 2)} * var(--scale-factor))`, "--text-xs": `calc(${Taro.pxTransform(12 * 2)} * var(--scale-factor))`, "--text-sm": `calc(${Taro.pxTransform(14 * 2)} * var(--scale-factor))`, "--text-base": `calc(${Taro.pxTransform(16 * 2)} * var(--scale-factor))`, @@ -98,6 +99,7 @@ export function CustomTheme(props: CustomThemeProps) { // --nutui-tabbar-height nutuiTabbarHeight: "calc(92rpx * var(--scale-factor))", + nutuiTabbarTextFontSize: "var(--text-xxs)", }} > {children} diff --git a/packages/app-client/src/constant/purchase.ts b/packages/app-client/src/constant/purchase.ts index 2ba02e9..44c32ac 100644 --- a/packages/app-client/src/constant/purchase.ts +++ b/packages/app-client/src/constant/purchase.ts @@ -72,11 +72,11 @@ const supplierSlug = { const isPreview = (purchaseVO: BusinessAPI.OrderVO) => { if (purchaseVO.type === "PRODUCTION_PURCHASE") { - return purchaseVO.active === madeSteps.length; + return purchaseVO.active >= madeSteps.length - 1; } if (purchaseVO.type === "MARKET_PURCHASE") { - return purchaseVO.active === marketSteps.length; + return purchaseVO.active >= marketSteps.length - 1; } return false; diff --git a/packages/app-client/src/pages/purchase/made/preview.tsx b/packages/app-client/src/pages/purchase/made/preview.tsx index 04922be..80b130a 100644 --- a/packages/app-client/src/pages/purchase/made/preview.tsx +++ b/packages/app-client/src/pages/purchase/made/preview.tsx @@ -53,7 +53,6 @@ export default hocAuth(function Page(props: CommonComponent) { block type={"default"} size={"large"} - className="flex-1 bg-gray-200 text-gray-700" onClick={() => { Taro.switchTab({ url: buildUrl("/pages/main/index/index"), @@ -70,7 +69,6 @@ export default hocAuth(function Page(props: CommonComponent) { block type={"default"} size={"large"} - className="flex-1 bg-gray-200 text-gray-700" onClick={() => { Taro.redirectTo({ url: buildUrl("/pages/purchase/made/create", { diff --git a/packages/app-client/src/pages/purchase/market/preview.tsx b/packages/app-client/src/pages/purchase/market/preview.tsx index 7b22e31..62b4a88 100644 --- a/packages/app-client/src/pages/purchase/market/preview.tsx +++ b/packages/app-client/src/pages/purchase/market/preview.tsx @@ -53,7 +53,6 @@ export default hocAuth(function Page(props: CommonComponent) { block type={"default"} size={"large"} - className="flex-1 bg-gray-200 text-gray-700" onClick={() => { Taro.switchTab({ url: buildUrl("/pages/main/index/index"), @@ -70,7 +69,6 @@ export default hocAuth(function Page(props: CommonComponent) { block type={"default"} size={"large"} - className="flex-1 bg-gray-200 text-gray-700" onClick={() => { Taro.redirectTo({ url: buildUrl("/pages/purchase/market/create", {