diff --git a/src/card/index.less b/src/card/index.less index 86df44a08..d9bbedee6 100644 --- a/src/card/index.less +++ b/src/card/index.less @@ -64,11 +64,16 @@ display: inline-block; color: @card-price-color; font-weight: @font-weight-bold; + font-size: @card-price-font-size; + } - &--integer { - font-size: @card-price-integer-font-size; - font-family: @card-price-font-family; - } + &__price-integer { + font-size: @card-price-integer-font-size; + font-family: @card-price-font-family; + } + + &__price-decimal { + font-family: @card-price-font-family; } &__origin-price { diff --git a/src/card/index.tsx b/src/card/index.tsx index 2dc3cc48e..bb34138a9 100644 --- a/src/card/index.tsx +++ b/src/card/index.tsx @@ -101,7 +101,11 @@ function Card( } if (props.title) { - return
{props.title}
; + return ( +
+ {props.title} +
+ ); } } @@ -118,11 +122,11 @@ function Card( function PriceContent() { const priceArr = props.price!.toString().split('.'); return ( -
- {props.currency} - {priceArr[0]}. - {priceArr[1]} -
+
+ {props.currency} + {priceArr[0]}. + {priceArr[1]} +
); } @@ -149,7 +153,11 @@ function Card( function Num() { if (showNum) { - return
{slots.num ? slots.num() : `x${props.num}`}
; + return ( +
+ {slots.num ? slots.num() : `x${props.num}`} +
+ ); } } diff --git a/src/card/test/__snapshots__/demo.spec.js.snap b/src/card/test/__snapshots__/demo.spec.js.snap index 77352ba68..fe11d3433 100644 --- a/src/card/test/__snapshots__/demo.spec.js.snap +++ b/src/card/test/__snapshots__/demo.spec.js.snap @@ -17,7 +17,7 @@ exports[`renders demo correctly 1`] = `
-
¥2.00
+
¥2.00
x2
@@ -41,7 +41,7 @@ exports[`renders demo correctly 1`] = `
-
¥2.00
+
¥2.00
¥ 10.00
x2
@@ -70,7 +70,7 @@ exports[`renders demo correctly 1`] = `
-
¥2.00
+
¥2.00
x2
diff --git a/src/style/var.less b/src/style/var.less index fc6ba8556..cba87fc95 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -42,7 +42,7 @@ @font-size-md: 14px; @font-size-lg: 16px; @font-weight-bold: 500; -@price-integer-font-family: Avenir-Heavy PingFang SC, Helvetica Neue, Arial, sans-serif; +@price-integer-font-family: Avenir-Heavy, PingFang SC, Helvetica Neue, Arial, sans-serif; // Animation @animation-duration-base: .3s; @@ -148,6 +148,7 @@ @card-origin-price-color: @gray-6; @card-num-color: @gray-6; @card-origin-price-font-size: @font-size-xs; +@card-price-font-size: @font-size-sm; @card-price-integer-font-size: @font-size-lg; @card-price-font-family: @price-integer-font-family;