feat(theme): 添加超小字体变量并优化预览页面样式
- 在CustomTheme中添加--text-xxs字体变量用于超小字体显示 - 为nutuiTabbarTextFontSize设置使用新的超小字体变量 - 修复购买流程中生产预览页面的按钮样式问题 - 修复购买流程中市场预览页面的按钮样式问题 - 优化预览页面按钮的类名配置,移除冗余样式定义 - 调整购买状态判断逻辑,允许预览状态在最后一步时显示
This commit is contained in:
parent
fffb0c7269
commit
d5fa404c36
@ -27,6 +27,7 @@ export function CustomTheme(props: CustomThemeProps) {
|
|||||||
style={{
|
style={{
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
"--scale-factor": scaleFactor,
|
"--scale-factor": scaleFactor,
|
||||||
|
"--text-xxs": `calc(${Taro.pxTransform(10 * 2)} * var(--scale-factor))`,
|
||||||
"--text-xs": `calc(${Taro.pxTransform(12 * 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-sm": `calc(${Taro.pxTransform(14 * 2)} * var(--scale-factor))`,
|
||||||
"--text-base": `calc(${Taro.pxTransform(16 * 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
|
// --nutui-tabbar-height
|
||||||
nutuiTabbarHeight: "calc(92rpx * var(--scale-factor))",
|
nutuiTabbarHeight: "calc(92rpx * var(--scale-factor))",
|
||||||
|
nutuiTabbarTextFontSize: "var(--text-xxs)",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
|
|||||||
@ -72,11 +72,11 @@ const supplierSlug = {
|
|||||||
|
|
||||||
const isPreview = (purchaseVO: BusinessAPI.OrderVO) => {
|
const isPreview = (purchaseVO: BusinessAPI.OrderVO) => {
|
||||||
if (purchaseVO.type === "PRODUCTION_PURCHASE") {
|
if (purchaseVO.type === "PRODUCTION_PURCHASE") {
|
||||||
return purchaseVO.active === madeSteps.length;
|
return purchaseVO.active >= madeSteps.length - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (purchaseVO.type === "MARKET_PURCHASE") {
|
if (purchaseVO.type === "MARKET_PURCHASE") {
|
||||||
return purchaseVO.active === marketSteps.length;
|
return purchaseVO.active >= marketSteps.length - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@ -53,7 +53,6 @@ export default hocAuth(function Page(props: CommonComponent) {
|
|||||||
block
|
block
|
||||||
type={"default"}
|
type={"default"}
|
||||||
size={"large"}
|
size={"large"}
|
||||||
className="flex-1 bg-gray-200 text-gray-700"
|
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
Taro.switchTab({
|
Taro.switchTab({
|
||||||
url: buildUrl("/pages/main/index/index"),
|
url: buildUrl("/pages/main/index/index"),
|
||||||
@ -70,7 +69,6 @@ export default hocAuth(function Page(props: CommonComponent) {
|
|||||||
block
|
block
|
||||||
type={"default"}
|
type={"default"}
|
||||||
size={"large"}
|
size={"large"}
|
||||||
className="flex-1 bg-gray-200 text-gray-700"
|
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
Taro.redirectTo({
|
Taro.redirectTo({
|
||||||
url: buildUrl("/pages/purchase/made/create", {
|
url: buildUrl("/pages/purchase/made/create", {
|
||||||
|
|||||||
@ -53,7 +53,6 @@ export default hocAuth(function Page(props: CommonComponent) {
|
|||||||
block
|
block
|
||||||
type={"default"}
|
type={"default"}
|
||||||
size={"large"}
|
size={"large"}
|
||||||
className="flex-1 bg-gray-200 text-gray-700"
|
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
Taro.switchTab({
|
Taro.switchTab({
|
||||||
url: buildUrl("/pages/main/index/index"),
|
url: buildUrl("/pages/main/index/index"),
|
||||||
@ -70,7 +69,6 @@ export default hocAuth(function Page(props: CommonComponent) {
|
|||||||
block
|
block
|
||||||
type={"default"}
|
type={"default"}
|
||||||
size={"large"}
|
size={"large"}
|
||||||
className="flex-1 bg-gray-200 text-gray-700"
|
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
Taro.redirectTo({
|
Taro.redirectTo({
|
||||||
url: buildUrl("/pages/purchase/market/create", {
|
url: buildUrl("/pages/purchase/market/create", {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user