diff --git a/src/packages/calendar/calendar.scss b/src/packages/calendar/calendar.scss index 7a394555d6..9ac08b7527 100644 --- a/src/packages/calendar/calendar.scss +++ b/src/packages/calendar/calendar.scss @@ -127,9 +127,20 @@ font-weight: $calendar-day-font-weight; margin-bottom: 4px; + // 部分 Taro 机型下子节点不会稳定继承父级 color,颜色直接落到最内层文案。 + &-day, + &-info-curr { + color: $color-title; + } + &:nth-child(7n + 0), &:nth-child(7n + 1) { color: $color-primary; + + .nut-calendar-day-day, + .nut-calendar-day-info-curr { + color: $color-primary; + } } &-info, @@ -173,11 +184,21 @@ .nut-calendar-day-info { color: $color-primary-text; } + + .nut-calendar-day-day, + .nut-calendar-day-info-curr { + color: $color-primary-text; + } } &-disabled { color: $calendar-disable-color !important; + .nut-calendar-day-day, + .nut-calendar-day-info-curr { + color: $calendar-disable-color; + } + .nut-calendar-day-info-curr { display: none; } @@ -187,10 +208,20 @@ background-color: $calendar-choose-background-color; color: $calendar-choose-color; + .nut-calendar-day-day, + .nut-calendar-day-info-curr { + color: $calendar-choose-color; + } + &-disabled { background-color: $calendar-choose-disable-background-color; color: $calendar-disable-color !important; + .nut-calendar-day-day, + .nut-calendar-day-info-curr { + color: $calendar-disable-color; + } + .nut-calendar-day-info-curr { display: none; } diff --git a/src/packages/calendarcard/calendarcard.scss b/src/packages/calendarcard/calendarcard.scss index 56042a0b92..b824150001 100644 --- a/src/packages/calendarcard/calendarcard.scss +++ b/src/packages/calendarcard/calendarcard.scss @@ -49,6 +49,13 @@ margin-bottom: 4px; text-align: center; + // 部分 Taro 机型下子节点不会稳定继承父级 color,颜色直接落到最内层文案。 + &-top, + &-inner, + &-bottom { + color: $color-title; + } + &.header { cursor: auto; } @@ -66,6 +73,12 @@ &.weekend { color: $calendar-choose-color; + + .nut-calendarcard-day-top, + .nut-calendarcard-day-inner, + .nut-calendarcard-day-bottom { + color: $calendar-choose-color; + } } &.active { diff --git a/src/packages/calendarcard/icon.taro.tsx b/src/packages/calendarcard/icon.taro.tsx index 1223f86495..9ac1e4e3e3 100644 --- a/src/packages/calendarcard/icon.taro.tsx +++ b/src/packages/calendarcard/icon.taro.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react' -import { Image, View } from '@tarojs/components' +import { Image } from '@tarojs/components' let left = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOCIgaGVpZ2h0PSIxOCIgdmlld0JveD0iMCAwIDE4IDE4Ij48cGF0aCBkPSJNNi42MDUgOS40OWEuNzcxLjc3MSAwIDAgMSAwLS45OGwzLjYtNC4zNzJhLjc3MS43NzEgMCAwIDEgMS4xOS45ODFMOC4yIDlsMy4xOTcgMy44ODFhLjc3MS43NzEgMCAxIDEtMS4xOTEuOThsLTMuNi00LjM3eiIvPjwvc3ZnPg==' @@ -30,15 +30,10 @@ if (process.env.TARO_ENV === 'jdharmony_cpp') { const Icon: FC = ({ url }) => { const style = { - background: `url('${url}') no-repeat center`, - backgroundSize: '100% 100%', width: 18, height: 18, } - if (process.env.TARO_ENV === 'jdharmony_cpp') { - return - } - return + return } export const ArrowLeft: FC = () =>