Merge branch 'liumei_font'

Tevin

2022-01-25 fb6f9653160ceea412eaca81856f42aa78856bea

Merge branch 'liumei_font'

# Conflicts:
#	common/custom.scss

 common/custom.scss

@@ -95,6 +95,12 @@
    }
    .at-list {
        position: unset;
        .item-content__info-note {
            font-size: 34px;
        }
        .item-extra__info {
            font-size: 36px;
        }
    }
    .at-tabs.at-tabs--horizontal {
        height: 100%;
@@ -211,6 +217,25 @@
            font-size: 36px;
        }
    }
    .at-divider {
        .at-divider__content {
            font-size: 36px;
        }
    }
    .at-card {
        .at-card__header-title {
            font-size: 36px;
        }
        .at-card__header-extra {
            font-size: 36px;
        }
        .at-card__content-info {
            font-size: 36px;
        }
    }
    .at-tag {
        font-size: 36px;
    }
}

.taro__toast,

 forms/input/cInputPhoneCode.scss

@@ -6,8 +6,10 @@
@import "../../common/sassMixin";

.c-input-phone-code {
    .c-input-phone-btn {
    .at-button.c-input-phone-btn {
        padding: 0 12px;
        margin-right: 20px;
        line-height: 54px;
        border: none;
        background: #2093df;
        .at-button__text {

 layout/h5Page/cNavBar.scss

@@ -88,16 +88,15 @@
            .box {
                position: relative;
                z-index: 2;
                width: 187px;
                width: 200px;
                padding: 9px 0;
                background-color: #f7f8fa;
                border-radius: 5px;
                box-shadow: rgba(#000, 0.1) 0 1PX 1PX 1PX;
                .item {
                    padding: 0 21px;
                    text-align: center;
                    line-height: 75px;
                    font-size: 30px;
                    line-height: 80px;
                    font-size: 36px;
                    @include ellipsis(100%);
                    box-sizing: border-box;
                    border-bottom: #edf0f8 1PX solid;