diff --git a/pages/account-opened/account-opened.wxss b/pages/account-opened/account-opened.wxss index 6e0beba..6a4cb81 100644 --- a/pages/account-opened/account-opened.wxss +++ b/pages/account-opened/account-opened.wxss @@ -17,7 +17,7 @@ button.withdrawal-button{ width: 160rpx; height: 60rpx; line-height: 60rpx; - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #fff; background: #FCC565; @@ -38,7 +38,7 @@ button::after{ text-align: center; } .limit-symbol{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #fff; } @@ -50,7 +50,7 @@ button::after{ margin-left: 10rpx; } .Withdrawable-text{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #fff; text-align: center; @@ -72,14 +72,14 @@ image.withdrawal-line{ display: flex; justify-content: center; align-items: center; - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #fff; text-align: center; margin-top: 30rpx; } .total-withdrawal{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #fff; text-align: center; @@ -87,7 +87,7 @@ image.withdrawal-line{ padding-bottom: 30rpx; } .credited-text{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 28rpx; color: #fff; } @@ -98,7 +98,7 @@ image.withdrawal-line{ margin: 0 60rpx; } .withdrawal-in-progress{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: rpx; color: #fff; } @@ -120,7 +120,7 @@ image.alipay-account{ background-size: cover; } .account-left-text{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 28rpx; color: #454545; font-weight: bold; @@ -155,7 +155,7 @@ span.style-text{ margin-left: 20rpx; } .right-withdrawal-amount{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #454545; font-weight: bold; @@ -169,7 +169,7 @@ button.withdrawal-button-style{ width: 120rpx; height: 48rpx; line-height: 48rpx; - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #fff; border-radius: 100rpx; diff --git a/pages/home-page/home-page.wxss b/pages/home-page/home-page.wxss index 1649bd8..fe4cb78 100644 --- a/pages/home-page/home-page.wxss +++ b/pages/home-page/home-page.wxss @@ -23,13 +23,13 @@ image.default-avatar{ margin-left: 30rpx; } .information-name{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 32rpx; color: #fff; font-weight: bold; } .address-text{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #fff; margin-top: 15rpx; @@ -53,7 +53,7 @@ image.default-avatar{ align-items: baseline; } .character-style{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #454545; } @@ -65,7 +65,7 @@ image.default-avatar{ margin-left: 10rpx; } .character-text{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 28rpx; color: #454545; font-weight: bold; @@ -104,7 +104,7 @@ image.title-stlye{ margin-right: 20rpx; } .title-text{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #454545; font-weight: bold; @@ -113,7 +113,7 @@ image.title-stlye{ padding-bottom: 30rpx; } .order-number{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 26rpx; color: #454545; padding: 0 30rpx; @@ -140,23 +140,23 @@ image.order-chart{ margin-left: 30rpx; } .ordering-text-title{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #454545; } .amount-of-money{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #999; padding: 10rpx 0; } span.price-style{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #F52F3E; } .order-time{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #999; } @@ -170,8 +170,8 @@ span.price-style{ button.refund-button{ width: 120rpx; height: 48rpx; - line-height: 48rpx; - font-family: "Microsoft YaHei"; + line-height: 44rpx; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #454545; border-color: #E5E5E5; @@ -184,8 +184,8 @@ button.refund-button{ button.refunded-button-style{ width: 130rpx; height: 48rpx; - line-height: 48rpx; - font-family: "Microsoft YaHei"; + line-height: 44rpx; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #999 !important; background: #fff; diff --git a/pages/merchant-login/merchant-login.wxss b/pages/merchant-login/merchant-login.wxss index 757e39d..0bb3dab 100644 --- a/pages/merchant-login/merchant-login.wxss +++ b/pages/merchant-login/merchant-login.wxss @@ -27,7 +27,7 @@ image.login-copy-style{ } input.phone-input{ width: 690rpx; - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #999; } @@ -44,12 +44,12 @@ input.phone-input{ } input.mobile-verification{ width: 400rpx; - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #999; } button.verification-button{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #454545; background: none; @@ -64,7 +64,7 @@ button.login-button{ width: 690rpx; height: 88rpx; line-height: 88rpx; - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #fff; font-weight: bold; @@ -80,7 +80,7 @@ button.login-button{ margin-top: 36rpx; } .agree-style{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #999; margin-left: 10rpx; diff --git a/pages/queuing-information/queuing-information.wxss b/pages/queuing-information/queuing-information.wxss index f6b6bcd..aebebc4 100644 --- a/pages/queuing-information/queuing-information.wxss +++ b/pages/queuing-information/queuing-information.wxss @@ -29,6 +29,7 @@ page{ font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #454545; + font-weight: bold; } .flex-grow-1 view.active text{ diff --git a/pages/user-orders/user-orders.wxss b/pages/user-orders/user-orders.wxss index 5349e43..119f7fb 100644 --- a/pages/user-orders/user-orders.wxss +++ b/pages/user-orders/user-orders.wxss @@ -17,7 +17,7 @@ button.withdrawal-button{ width: 160rpx; height: 60rpx; line-height: 60rpx; - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #fff; background: #FCC565; @@ -38,7 +38,7 @@ button::after{ text-align: center; } .limit-symbol{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #fff; } @@ -50,7 +50,7 @@ button::after{ margin-left: 10rpx; } .Withdrawable-text{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #fff; text-align: center; @@ -69,7 +69,7 @@ image.withdrawal-line{ background-size: cover; } .to-be-credited{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #fff; text-align: center; @@ -96,7 +96,7 @@ image.title-stlye { margin-right: 20rpx; } .title-text { - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #454545; font-weight: bold; @@ -111,18 +111,18 @@ image.title-stlye { margin-top: 30rpx; } .item-content-titie{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #454545; font-weight: bold; } .item-content-text{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #666; } span.style-text{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #F52F3E; font-weight: bold; @@ -135,7 +135,7 @@ span.style-text{ margin-top: 30rpx; } .see-more-text{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #F52F3E; } @@ -156,7 +156,7 @@ span.style-text{ padding-top: 0; } .order-number { - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 26rpx; color: #454545; padding: 30rpx 0; @@ -177,23 +177,23 @@ image.order-chart { margin-left: 30rpx; } .ordering-text-title { - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #454545; } .amount-of-money { - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #999; padding: 10rpx 0; } span.price-style { - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #F52F3E; } .order-time { - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #999; } diff --git a/pages/withdrawal-management/withdrawal-management.wxss b/pages/withdrawal-management/withdrawal-management.wxss index b42e6b3..c250c97 100644 --- a/pages/withdrawal-management/withdrawal-management.wxss +++ b/pages/withdrawal-management/withdrawal-management.wxss @@ -17,7 +17,7 @@ button.withdrawal-button{ width: 160rpx; height: 60rpx; line-height: 60rpx; - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #fff; background: #FCC565; @@ -38,7 +38,7 @@ button::after{ text-align: center; } .limit-symbol{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #fff; } @@ -50,7 +50,7 @@ button::after{ margin-left: 10rpx; } .Withdrawable-text{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #fff; text-align: center; @@ -72,14 +72,14 @@ image.withdrawal-line{ display: flex; justify-content: center; align-items: center; - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #fff; text-align: center; margin-top: 30rpx; } .total-withdrawal{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 30rpx; color: #fff; text-align: center; @@ -87,7 +87,7 @@ image.withdrawal-line{ padding-bottom: 30rpx; } .credited-text{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 28rpx; color: #fff; } @@ -98,7 +98,7 @@ image.withdrawal-line{ margin: 0 60rpx; } .withdrawal-in-progress{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: rpx; color: #fff; } @@ -120,7 +120,7 @@ image.alipay-account{ background-size: cover; } .account-left-text{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 28rpx; color: #454545; font-weight: bold; @@ -132,7 +132,7 @@ image.alipay-account{ align-items: center; } .account-right-text{ - font-family: "Microsoft YaHei"; + font-family: PingFangSC-Regular, sans-serif; font-size: 24rpx; color: #999; }