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", {