fix(countdown): update the v15 style (#2843)

irisSong · xiaoyatong · web-flow · commit 23798330ea31 · 2024-12-11T13:33:04.000+08:00
* fix(countdown): 适配v14 &amp;&amp; type增加text类型

* fix(countdown): 判断是否补0

* fix(countdown): add test

* fix: cr update

* fix: test update

* feat: add v14适配标识

* fix: update icons-react-taro version

* chore: update pnpm-lock.yaml

* fix: modify ts

* fix: delete harmony css

* fix: delete harmony css

* fix: types

---------

Co-authored-by: hanyuxinting &lt;hanyuxinting@sina.cn&gt;
Co-authored-by: xiaoyatong &lt;84436086+xiaoyatong@users.noreply.github.com&gt;
diff --git a/src/packages/countdown/countdown.scss b/src/packages/countdown/countdown.scss
@@ -12,26 +12,45 @@
     align-items: center;
     justify-content: center;
     height: $countdown-height;
+    box-sizing: border-box;
     font-weight: $coutdown-font-weight;
     font-size: $countdown-font-size;
+    line-height: calc($countdown-font-size + 2px);
+    font-family: 'JD';
   }
   &-number,
   &-number-primary {
+    position: relative;
     min-width: $countdown-width;
     padding: $countdown-number-padding;
     border-radius: $countdown-number-border-radius;
     margin: $countdown-number-margin;
     text-align: center;
+    &::after {
+      content: '';
+      position: absolute;
+      top: -50%;
+      bottom: -50%;
+      left: -50%;
+      right: -50%;
+      transform: scale(0.5);
+      border-radius: calc($countdown-number-border-radius * 2);
+    }
   }
   &-number {
-    border: 1px solid $countdown-number-border-color;
     background-color: $countdown-number-background-color;
     color: $countdown-number-color;
+    &::after {
+      border: 1px solid $countdown-number-border-color;
+    }
   }
+
   &-number-primary {
-    border: 1px solid $countdown-number-primary-border-color;
     background-color: $countdown-number-primary-background-color;
     color: $countdown-number-primary-color;
+    &::after {
+      border: 1px solid $countdown-number-primary-border-color;
+    }
   }
   &-number-text {
     border: 0;
diff --git a/src/packages/countdown/countdown.taro.tsx b/src/packages/countdown/countdown.taro.tsx
@@ -281,7 +281,7 @@ const InternalCountDown: ForwardRefRenderFunction<
                 [`${classPrefix}-number-text`]: type === 'text',
               })}
             >
-              {unit ? padZero(time) : time}
+              {unit && unit !== 'DD' ? padZero(time) : time}
             </View>
             {unit ? (
               <View className={`${classPrefix}-unit`}>{getUnit(unit)}</View>
diff --git a/src/styles/theme-dark.scss b/src/styles/theme-dark.scss
@@ -34,6 +34,7 @@ page {
   --nutui-color-primary-disabled-special: var(--nutui-brand-3);
   // 品牌主色调镂空背景点击态
   --nutui-color-primary-light-pressed: var(--nutui-brand-1);
+  --nutui-color-primary-specialdisabled: var(--nutui-red-3);
 
   // service color
   --nutui-golden-1: #fff2e0;
@@ -65,6 +66,7 @@ page {
   // danger color
   --nutui-red-1: #ffebef;
   --nutui-red-2: #ff0f23;
+  --nutui-red-3: #ffadbe;
   --nutui-red-6: #ff3b3b;
 
   // danger color 语义化
diff --git a/src/styles/theme-default.scss b/src/styles/theme-default.scss
@@ -33,6 +33,7 @@ page {
   --nutui-color-primary-disabled-special: var(--nutui-brand-3);
   // 品牌主色调镂空背景点击态
   --nutui-color-primary-light-pressed: var(--nutui-brand-1);
+  --nutui-color-primary-specialdisabled: var(--nutui-red-3);
 
   // service color
   --nutui-golden-1: #fff2e0;
@@ -63,6 +64,7 @@ page {
 
   // danger color
   --nutui-red-1: #ffebef;
+  --nutui-red-3: #ffadbe;
   --nutui-red-2: #ff0f23;
   --nutui-red-6: #ff3333;
 
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
@@ -20,6 +20,10 @@ $color-primary-gradient-1: linear-gradient(
 ) !default;
 $color-primary-icon: var(--nutui-red-6, #ff3333) !default;
 $color-primary-icon-disabled: var(--nutui-gray-8, #dadce0) !default;
+$color-primary-specialdisabled: var(
+  --nutui-color-primary-specialdisabled,
+  #ffadbe
+) !default;
 
 // 默认色
 $color-default: var(--nutui-color-default) !default;
@@ -799,7 +803,7 @@ $countdown-number-background-color: var(
 ) !default;
 $countdown-number-border-color: var(
   --nutui-countdown-number-border-color,
-  $color-primary-light-pressed
+  $color-primary-specialdisabled
 ) !default;
 $countdown-number-primary-color: var(
   --nutui-countdown-number-primary-color,

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ const InternalCountDown: ForwardRefRenderFunction<`
`281`	`281`	[`${classPrefix}-number-text`]: type === 'text',
`282`	`282`	`})}`
`283`	`283`	`>`
`284`		`- {unit ? padZero(time) : time}`
	`284`	`+ {unit && unit !== 'DD' ? padZero(time) : time}`
`285`	`285`	`</View>`
`286`	`286`	`{unit ? (`
`287`	`287`	<View className={`${classPrefix}-unit`}>{getUnit(unit)}</View>