From 86cb179226d66a376105b79300d21fe8eb7c31d9 Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Tue, 29 Oct 2024 18:57:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(tag):=20=E8=A7=A3=E5=86=B3taro-h5?= =?UTF-8?q?=E5=9B=BE=E6=96=87demo=E4=B8=8D=E5=B1=95=E7=A4=BA=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E9=97=AE=E9=A2=98+harmonycpp=E9=80=82=E9=85=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/tag/demos/taro/demo4.tsx | 15 +++++---------- src/packages/tag/tag.harmony.css | 2 ++ src/packages/tag/tag.scss | 2 ++ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/packages/tag/demos/taro/demo4.tsx b/src/packages/tag/demos/taro/demo4.tsx index e40d4ccb7a..8f06f01466 100644 --- a/src/packages/tag/demos/taro/demo4.tsx +++ b/src/packages/tag/demos/taro/demo4.tsx @@ -1,15 +1,9 @@ import React from 'react' import { Cell, Tag } from '@nutui/nutui-react-taro' import { Image, Text, View } from '@tarojs/components' -import Taro from '@tarojs/taro' +import pxTransform from '@/utils/px-transform' const Demo4 = () => { - const convertSize = (size: number) => { - if (Taro.getEnv() === Taro.ENV_TYPE.RN) { - return size - } - return `${size}px` - } return ( <> { > diff --git a/src/packages/tag/tag.harmony.css b/src/packages/tag/tag.harmony.css index 4295ac3c95..6da7fd6002 100644 --- a/src/packages/tag/tag.harmony.css +++ b/src/packages/tag/tag.harmony.css @@ -53,6 +53,8 @@ align-items: center; justify-content: center; font-size: 10px; + color: #ffffff; + margin-left: 4px; } .nut-tag-plain { background-color: #fff; diff --git a/src/packages/tag/tag.scss b/src/packages/tag/tag.scss index e581270fa6..5956360c02 100644 --- a/src/packages/tag/tag.scss +++ b/src/packages/tag/tag.scss @@ -67,6 +67,8 @@ align-items: center; justify-content: center; font-size: $tag-font-size; + color: $tag-color; + margin-left: 4px; } &-plain { From 9d07dafb0d0494909363383ab56ffa87502a8fbd Mon Sep 17 00:00:00 2001 From: songchenglin3 <353833373@qq.com> Date: Wed, 30 Oct 2024 14:36:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=20tag=20=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=AD=97=E4=BD=93=E4=B8=BA10px?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/tag/tag.harmony.css | 4 ++-- src/styles/variables.scss | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/packages/tag/tag.harmony.css b/src/packages/tag/tag.harmony.css index 6da7fd6002..6066f36a99 100644 --- a/src/packages/tag/tag.harmony.css +++ b/src/packages/tag/tag.harmony.css @@ -28,7 +28,7 @@ background: #fa2c19; } .nut-tag-info { - background: #1988fa; + background: #0073ff; } .nut-tag-success { background: #4fc08d; @@ -37,7 +37,7 @@ background: #ff0f23; } .nut-tag-warning { - background: #c47600; + background: #ffbf00; } .nut-tag-round { border-radius: 8px; diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 4ee0ac33c4..cf74f9beac 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1545,7 +1545,7 @@ $timeselect-time-background: var( //tag(✅) $tag-padding: var(--nutui-tag-padding, 0px 2px) !default; -$tag-font-size: var(--nutui-tag-font-size, $font-size-xs) !default; +$tag-font-size: var(--nutui-tag-font-size, $font-size-xxs) !default; $tag-border-radius: var(--nutui-tag-border-radius, 2px) !default; $tag-height: var(--nutui-tag-height, 14px) !default; $tag-color: var(--nutui-tag-color, #ffffff) !default; @@ -1584,7 +1584,7 @@ $badge-background-color: var( $color-primary-gradient-1 ) !default; $badge-color: var(--nutui-badge-color, #fff) !default; -$badge-font-size: var(--nutui-badge-font-size, $font-size-xs) !default; +$badge-font-size: var(--nutui-badge-font-size, $font-size-xxs) !default; $badge-border: var( --nutui-badge-border, 0px solid $color-primary-text