Commit c44c3fe4 authored by gaodapeng's avatar gaodapeng

增加了字体

parent 3eb8c104
@font-face {
font-family: DINPro-Regular;
src: url('/font/DINPro-Regular.otf');
}
@font-face {
font-family: DINPro-Medium;
src: url('/font/DINPro-Medium.ttf');
}
@font-face {
font-family: DINPro-Bold;
src: url('/font/DINPro-Bold.ttf');
}
@font-face {
font-family: DINPro-CondBold;
src: url('/font/DINPro-CondBold.otf');
}
@font-face {
font-family: DINPro-Light;
src: url('/font/DINPro-Light.ttf');
}
@font-face {
font-family: DINPro-Black;
src: url('/font/DINPro-Black.otf');
}
.login-waiting-page { .login-waiting-page {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -650,6 +680,7 @@ ...@@ -650,6 +680,7 @@
height: 100%; height: 100%;
left: 0rpx; left: 0rpx;
top: 0rpx; top: 0rpx;
background: #FFFFFF;
} }
.waitOperateBackButton { .waitOperateBackButton {
...@@ -667,7 +698,6 @@ ...@@ -667,7 +698,6 @@
position: relative; position: relative;
width: 750rpx; width: 750rpx;
height: 60rpx; height: 60rpx;
background: rgba(255, 255, 255, 1);
/* border: 2px solid red; */ /* border: 2px solid red; */
box-shadow: 0rpx 2rpx 7rpx 0rpx rgba(153, 153, 153, 0.16); box-shadow: 0rpx 2rpx 7rpx 0rpx rgba(153, 153, 153, 0.16);
} }
...@@ -680,7 +710,6 @@ ...@@ -680,7 +710,6 @@
height: 362rpx; height: 362rpx;
box-sizing: border-box; box-sizing: border-box;
align-items: center; align-items: center;
background: #FFFFFF;
} }
.leftBody { .leftBody {
...@@ -712,7 +741,6 @@ ...@@ -712,7 +741,6 @@
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
align-items: center; align-items: center;
background: #ffffff;
} }
.remindText { .remindText {
...@@ -726,29 +754,29 @@ ...@@ -726,29 +754,29 @@
.totalPrice { .totalPrice {
font-size: 22rpx; font-size: 22rpx;
font-family: Helvetica; font-family: DINPro-Regular;
color: rgba(51, 51, 51, 0.85); color: rgba(51, 51, 51, 0.85);
line-height: 22rpx; line-height: 22rpx;
} }
.totalCoupon { .totalCoupon {
font-size: 22rpx; font-size: 21rpx;
font-family: PingFangSC-Semibold, PingFang SC; font-family: DINPro-Regular;
font-weight: 600; font-weight: 600;
color: rgba(255, 0, 0, 1); color: rgba(255, 0, 0, 1);
line-height: 22rpx; line-height: 21rpx;
} }
.moneySign { .moneySign {
font-size: 38rpx; font-size: 38rpx;
font-family: AlibabaPuHuiTiB; font-family: DINPro-Bold;
color: rgba(0, 122, 255, 1); color: rgba(0, 122, 255, 1);
line-height: 53rpx; line-height: 52rpx;
} }
.payPrice { .payPrice {
font-size: 36rpx; font-size: 36rpx;
font-family: DINAlternate-Bold, DINAlternate; font-family: DINPro-Regular;
font-weight: bold; font-weight: bold;
color: rgba(0, 122, 255, 1); color: rgba(0, 122, 255, 1);
line-height: 26rpx; line-height: 26rpx;
......
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
</view> </view>
<view class="contentLine" style="margin-top: 14.5rpx;" hidden="{{flowType!='collections'}}"> <view class="contentLine" style="margin-top: 14.5rpx;" hidden="{{flowType!='collections'}}">
<view class="descText">商家优惠:</view> <view class="descText">商家优惠:</view>
<view class="totalCoupon">¥{{discCouponPrice}}</view> <view class="totalCoupon">-¥{{discCouponPrice}}</view>
</view> </view>
<view style="position: absolute;display: flex;flex-direction: row;align-items: baseline;bottom:22rpx;left:0rpx;padding-left: 29rpx;"> <view style="position: absolute;display: flex;flex-direction: row;align-items: baseline;bottom:22rpx;left:0rpx;padding-left: 29rpx;">
<view class="descText">{{waitOperateMoneyRemind}}</view> <view class="descText">{{waitOperateMoneyRemind}}</view>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment