10.12.9

libs/i18n/lang/cn.json

@@ -97,7 +97,9 @@
 		"u15": "余额",
 		"u16": "去充值",
 		"u17": "已完成",
-		"u18": "详情"
+		"u18": "详情",
+		"u19": "秒",
+		"u20": "5分线"
 	},
 	"userinfo": {
 		"u1": "收款地址",

libs/i18n/lang/en.json

@@ -98,7 +98,9 @@
 		"u15": "Balance",
 		"u16": "Recharge",
 		"u17": "Finished",
-		"u18": "Details"
+		"u18": "Details",
+		"u19": "S",
+		"u20": "Quincle"
 	},
 	"money": {
 		"a1": "wallet",

libs/i18n/lang/tw.json

@@ -97,7 +97,9 @@
 		"u15": "餘額",
 		"u16": "去充值",
 		"u17": "已完成",
-		"u18": "詳情"
+		"u18": "詳情",
+		"u19": "秒",
+		"u20": "5分線"
 	},
 	"userinfo": {
 		"u1": "收款地址",

pages/details/details.vue

@@ -75,7 +75,6 @@
 	height: 22rpx;
 	float: length($list: 231rpx);
 	font-size: 28rpx;
-	font-family: PingFang SC;
 	font-weight: 500;
 	color: #999999;
 }
@@ -84,7 +83,6 @@
 	margin-left: 290rpx;
 	height: 26rpx;
 	font-size: 28rpx;
-	font-family: PingFang SC;
 	font-weight: 500;
 	color: #999999;
 	float: length($list: 54rpx);
@@ -111,7 +109,6 @@
 }
 .left {
 	font-size: 28rpx;
-	font-family: PingFang SC;
 	font-weight: 500;
 	color: #999999;
 	margin-left: 36rpx;
@@ -119,7 +116,6 @@
 }
 .leftT {
 	font-size: 28rpx;
-	font-family: PingFang SC;
 	font-weight: 500;
 	color: #b98134;
 	// margin-left: 10rpx;
@@ -127,7 +123,6 @@
 }
 .right {
 	font-size: 28rpx;
-	font-family: PingFang SC;
 	font-weight: 500;
 	color: #999999;
 	margin-left: 220rpx;
@@ -135,7 +130,6 @@
 }
 .rightT {
 	font-size: 28rpx;
-	font-family: PingFang SC;
 	font-weight: 500;
 	color: #ffffff;
 	margin-top: 30rpx;

pages/index/entertainment.vue

@@ -59,7 +59,7 @@
 			<view class="ri">
 				<view class="ti">
 					<view class="t1">{{$t('enter.u3')}}</view>
-					<view class="t2">60秒</view>
+					<view class="t2">60{{$t('enter.u19')}}</view>
 					<view class="">
 						<image
 							class="ima"
@@ -160,7 +160,7 @@
 			:key="item">
 			<view class="nr1">
 				<view class="tr">TRX</view>
-				<view class="wf">5分線</view>
+				<view class="wf">{{$t('enter.u20')}}</view>
 				<view class="">
 					<image
 						class="zz"
@@ -398,7 +398,6 @@
 		/* width: 256rpx; */
 		height: 24rpx;
 		font-size: 25rpx;
-		font-family: PingFang SC;
 		font-weight: bold;
 		color: #ffffff;
 	}
@@ -406,7 +405,6 @@
 		/* width: 256rpx; */
 		height: 24rpx;
 		font-size: 22rpx;
-		font-family: PingFang SC;
 		font-weight: bold;
 		color: #999999;
 	}
@@ -423,7 +421,6 @@
 		margin-left: 30rpx; */
 		height: 22rpx;
 		font-size: 30rpx;
-		font-family: PingFang SC;
 		font-weight: 800;
 		color: #000000;
 		line-height: 70rpx;
@@ -447,7 +444,6 @@
 	.wz {
 		height: 22rpx;
 		font-size: 29rpx;
-		font-family: PingFang SC;
 		font-weight: bold;
 		color: #ffffff;
 		margin-left: 7rpx;
@@ -455,7 +451,6 @@
 	.qx {
 		height: 24rpx;
 		font-size: 28rpx;
-		font-family: PingFang SC;
 		font-weight: 500;
 		color: #ffffff;
 		margin-left: 10rpx;
@@ -463,7 +458,6 @@
 	.shu {
 		height: 39rpx;
 		font-size: 51rpx;
-		font-family: PingFang SC;
 		font-weight: bold;
 		color: #fdb242;
 	}
@@ -474,7 +468,6 @@
 	.t1 {
 		height: 24rpx;
 		font-size: 26rpx;
-		font-family: PingFang SC;
 		font-weight: bold;
 		color: #ffffff;
 		margin-left: 90rpx;
@@ -482,7 +475,6 @@
 	.t2 {
 		height: 24rpx;
 		font-size: 26rpx;
-		font-family: PingFang SC;
 		font-weight: bold;
 		color: #fdaf41;
 		margin-left: 19rpx;
@@ -504,7 +496,6 @@
 		/* padding-top: 25rpx; */
 		height: 32rpx;
 		font-size: 44rpx;
-		font-family: PingFang SC;
 		font-weight: 800;
 		color: #000000;
 		line-height: 70rpx;
@@ -540,7 +531,6 @@
 	.xia {
 		height: 25rpx;
 		font-size: 28rpx;
-		font-family: PingFang SC;
 		font-weight: 800;
 		color: #ffffff;
 		line-height: 70rpx;
@@ -561,7 +551,6 @@
 	.jl {
 		height: 23rpx;
 		font-size: 24rpx;
-		font-family: PingFang SC;
 		font-weight: 400;
 		color: #999999;
 		margin-top: 45rpx;
@@ -590,7 +579,6 @@
 	.dd {
 		height: 23rpx;
 		font-size: 24rpx;
-		font-family: PingFang SC;
 		font-weight: 800;
 		color: #fff;
 		line-height: 30rpx;
@@ -602,7 +590,6 @@
 	.ls {
 		height: 23rpx;
 		font-size: 24rpx;
-		font-family: PingFang SC;
 		font-weight: 800;
 		color: #fff;
 		line-height: 30rpx;
@@ -671,7 +658,6 @@
 	.tr {
 		height: 21rpx;
 		font-size: 28rpx;
-		font-family: PingFang SC;
 		font-weight: 800;
 		color: #ffffff;
 		line-height: 30rpx;
@@ -679,7 +665,6 @@
 	.wf {
 		height: 17rpx;
 		font-size: 18rpx;
-		font-family: PingFang SC;
 		font-weight: 800;
 		color: #999999;
 		line-height: 30rpx;
@@ -694,7 +679,6 @@
 	.nr2 {
 		height: 20rpx;
 		font-size: 26rpx;
-		font-family: PingFang SC;
 		font-weight: bold;
 		color: #ffffff;
 		line-height: 30rpx;
@@ -705,12 +689,11 @@
 		height: 31rpx;
 		background: #25b287;
 		border-radius: 16rpx;
-		margin-left: 20rpx;
+		margin-left: 18rpx;
 	}
 	.wc {
 		height: 16rpx;
 		font-size: 16rpx;
-		font-family: PingFang SC;
 		font-weight: bold;
 		color: #ffffff;
 		line-height: 30rpx;
@@ -725,12 +708,11 @@
 		height: 31rpx;
 		background: #01ebf6;
 		border-radius: 16rpx;
-		margin-left: 10rpx;
+		margin-left: 8rpx;
 	}
 	.xq {
 		height: 16rpx;
 		font-size: 16rpx;
-		font-family: PingFang SC;
 		font-weight: bold;
 		color: #000000;
 		line-height: 30rpx;
@@ -749,7 +731,6 @@
 	.yue {
 		height: 27rpx;
 		font-size: 28rpx;
-		font-family: PingFang SC;
 		font-weight: bold;
 		color: #ffffff;
 		margin-left: 31rpx;
@@ -758,7 +739,6 @@
 	.yes {
 		height: 27rpx;
 		font-size: 35rpx;
-		font-family: PingFang SC;
 		font-weight: bold;
 		color: #fdaf41;
 		margin-left: 32rpx;
@@ -771,7 +751,6 @@
 	.quc {
 		height: 24rpx;
 		font-size: 26rpx;
-		font-family: PingFang SC;
 		font-weight: 500;
 		color: #ffffff;
 		margin-top: 51rpx;

pages/index/information.vue

@@ -118,7 +118,6 @@
 		margin-top: 30rpx;
 		height: 29rpx;
 		font-size: 30rpx;
-		font-family: PingFang SC;
 		font-weight: bold;
 		color: #FFFFFF;
 		line-height: 39rpx;
@@ -158,7 +157,6 @@
 	text-align: center;
 	height: 46rpx;
 	font-size: 49rpx;
-	font-family: PingFang SC;
 	font-weight: 500;
 	color: #FFFFFF;
 	line-height: 21rpx;

pages/recharge/recharge.vue

@@ -141,7 +141,6 @@
 		width: 168rpx;
 		height: 20rpx;
 		font-size: 26rpx;
-		font-family: PingFang SC;
 		font-weight: bold;
 		color: #feb041;
 		line-height: 24rpx;
@@ -155,7 +154,6 @@
 	.S {
 		height: 31rpx;
 		font-size: 32rpx;
-		font-family: PingFang SC;
 		font-weight: bold;
 		color: #ffffff;
 		line-height: 24rpx;
@@ -165,7 +163,6 @@
 	.SS {
 		height: 20rpx;
 		font-size: 26rpx;
-		font-family: PingFang SC;
 		font-weight: 500;
 		color: #ffffff;
 		line-height: 24rpx;
@@ -194,7 +191,6 @@
 		width: 625rpx;
 		// height: 114rpx;
 		font-size: 26rpx;
-		font-family: PingFang SC;
 		font-weight: 500;
 		color: #ffffff;
 		line-height: 45rpx;

pages/tabulation/tabulation.vue

@@ -93,7 +93,6 @@
 .wenben {
 	height: 27rpx;
 	font-size: 28rpx;
-	font-family: PingFang SC;
 	font-weight: 500;
 	color: #FFFFFF;
 	margin-left: 107rpx;
@@ -103,7 +102,6 @@
 	width: 52rpx;
 	height: 35rpx;
 	font-size: 46rpx;
-	font-family: PingFang SC;
 	font-weight: bold;
 	color: #FEB041;
 	margin-left: 136rpx;
@@ -132,7 +130,6 @@
 .nc {
 	height: 31rpx;
 	font-size: 32rpx;
-	font-family: PingFang SC;
 	font-weight: bold;
 	color: #FFFFFF;
 	margin-left: 35rpx;
@@ -156,7 +153,6 @@
 	height: 22rpx;
 	float: length($list: 231rpx);
 	font-size: 28rpx;
-	font-family: PingFang SC;
 	font-weight: 500;
 	color: #999999;
 }
@@ -200,7 +196,6 @@
 }
 .leftT {
 	font-size: 28rpx;
-	font-family: PingFang SC;
 	font-weight: 500;
 	color: #b98134;
 	// margin-left: 10rpx;
@@ -208,7 +203,6 @@
 }
 .right {
 	font-size: 28rpx;
-	font-family: PingFang SC;
 	font-weight: 500;
 	color: #999999;
 	margin-left: 200rpx;
@@ -216,7 +210,6 @@
 }
 .rightT {
 	font-size: 28rpx;
-	font-family: PingFang SC;
 	font-weight: 500;
 	color: #ffffff;
 	margin-top: 30rpx;

pages/transaction/transaction.vue

@@ -71,7 +71,6 @@
 .jy {
 	height: 29rpx;
 	font-size: 30rpx;
-	font-family: PingFang SC;
 	font-weight: 500;
 	color: #FFFFFF;
 	line-height: 55rpx;
@@ -87,7 +86,6 @@
 .pas {
 	height: 25rpx;
 	font-size: 26rpx;
-	font-family: PingFang SC;
 	font-weight: 500;
 	color: #FFFFFF;
 	line-height: 55rpx;
@@ -97,7 +95,6 @@
 .npas {
 	height: 25rpx;
 	font-size: 26rpx;
-	font-family: PingFangSC;
 	font-weight: 500;
 	color: #999999;
 	line-height: 55rpx;
@@ -107,7 +104,6 @@
 .nepas {
 	height: 25rpx;
 	font-size: 26rpx;
-	font-family: PingFangSC;
 	font-weight: 500;
 	color: #999999;
 	line-height: 55rpx;
@@ -117,7 +113,6 @@
 .yanzheng {
 	height: 25rpx;
 	font-size: 26rpx;
-	font-family: PingFang SC;
 	font-weight: 500;
 	color: #FDB242;
 	line-height: 55rpx;

pages/user/shareQrCode.vue

@@ -106,7 +106,6 @@
 	.li {
 		height: 31rpx;
 		font-size: 32rpx;
-		font-family: PingFang SC;
 		font-weight: bold;
 		color: #FFFFFF;
 		line-height: 47rpx;
@@ -124,7 +123,6 @@
 	.liss {
 		height: 21rpx;
 		font-size: 22rpx;
-		font-family: PingFang SC;
 		font-weight: 500;
 		color: #FFFFFF;
 		line-height: 37rpx;
@@ -137,7 +135,6 @@
 	.lsT {
 		// height: 100rpx;
 		font-size: 28rpx;
-		font-family: PingFang SC;
 		font-weight: 500;
 		color: #999999;
 		line-height: 47rpx;
@@ -146,7 +143,6 @@
 	}
 	.lisT {
 		font-size: 32rpx;
-		font-family: PingFang SC;
 		font-weight: bold;
 		color: #FFFFFF;
 		line-height: 47rpx;