10.26

pages/index/pledge.vue

@@ -18,10 +18,10 @@
 				<view class="le1 title ">
 					{{item.name}}
 				</view>
-				<view class="le1 ">
+				<view class="le1 qt">
 					{{item.single_time_min*1}}U{{$t('homepledge.m2')}} | {{item.day}}{{$t('homepledge.m3')}}
 				</view>
-				<view class="le1 ">
+				<view class="le1 ze">
 					{{$t('homepledge.total')}}：{{item.stock*1}}U
 				</view>
 				<!-- <view class="le2 flex font-color-gray">
@@ -181,7 +181,15 @@
 			.le1 {
 				font-weight: 800;
 				color: #feb041;
-				margin-bottom: 20rpx;
+				margin-bottom: 15rpx;
+				
+				&.qt {
+					padding-top: 15rpx;
+				}
+				
+				&.ze {
+					padding-top: 26rpx;
+				}
 
 				&.title {
 					font-size: 33rpx;
@@ -189,22 +197,22 @@
 				}
 			}
 
-			.le2 {
-				.line {
-					width: 308rpx;
-					height: 16rpx;
-					background-color: rgba(235, 235, 235, 0.38);
-					border-radius: 99rpx;
-					overflow: hidden;
-
-					.line-action {
-						height: 100%;
-						width: 100%;
-						border-radius: 99rpx;
-						background-color: #FEB041;
-					}
-				}
-			}
+			// .le2 {
+			// 	.line {
+			// 		width: 308rpx;
+			// 		height: 16rpx;
+			// 		background-color: rgba(235, 235, 235, 0.38);
+			// 		border-radius: 99rpx;
+			// 		overflow: hidden;
+
+			// 		.line-action {
+			// 			height: 100%;
+			// 			width: 100%;
+			// 			border-radius: 99rpx;
+			// 			background-color: #FEB041;
+			// 		}
+			// 	}
+			// }
 		}
 
 		.r1 {

pages/introduce/game.vue

@@ -44,7 +44,6 @@
 <style lang="scss">
     .background1 {
 		position: relative;
-		// width: 100vw;
 		height: calc(100vh - var(--status-bar-height));
 		background: url("../../static/img/youxi1.png");
 		background-size: 100% 100%;
@@ -57,7 +56,7 @@
 		position: absolute;
 		background-size: 100% 100%;
 		width: 650rpx;
-		height: 930rpx;
+		height: 960rpx;
 		top: 50%;
 		left: 50%;
 		transform: translate(-50%, -60%);
@@ -68,48 +67,39 @@
 		font-size: 37rpx;
 		font-weight: bold;
 		color: #d7b271;
-		line-height: 10rpx;
 	}
 	.juli {
 		margin-left: 60rpx;
 		margin-top: 70rpx;
-		height: 35rpx;
 		font-size: 36rpx;
-		font-family: Source Han Sans CN;
 		font-weight: bold;
 		color: #201809;
-		line-height: 36rpx;
 	}
 	.neirong {
 		width: 530rpx;
 		height: 100;
 		margin-left: 60rpx;
-		margin-top: 40rpx;
+		margin-top: 30rpx;
 	}
 	.nr1 .nr2{
 		height: 147rpx;
 		font-size: 28rpx;
-		font-family: PingFang SC;
 		font-weight: bold;
 		color: #201809;
-		line-height: 40rpx;
 	}
 	
 	.ls {
 		margin-left: 60rpx;
 		margin-top: 70rpx;
-		height: 35rpx;
 		font-size: 36rpx;
-		font-family: Source Han Sans CN;
 		font-weight: bold;
 		color: #201809;
-		line-height: 36rpx;
 	}
 	
 	.liushui {
 		width: 530rpx;
 		height: 190rpx;
 		margin-left: 60rpx;
-		margin-top: 40rpx;
+		margin-top: 30rpx;
 	}
 </style>

pages/introduce/introduce.vue

@@ -46,7 +46,6 @@
 <style lang="scss">
 	.background1 {
 		position: relative;
-		// width: 100vw;
 		height: calc(100vh - var(--status-bar-height));
 		background: url("../../static/shouye/beijing1.png");
 		background-size: 100% 100%;
@@ -75,12 +74,10 @@
 
 .wenben2 {
 	margin-top: 90rpx;
-	height: 35rpx;
 	font-size: 37rpx;
 	text-align: center;
 	font-weight: bold;
 	color: #D7BB80;
-	line-height: 10rpx;
 }
 .xian {
 	width: 200rpx;
@@ -100,40 +97,32 @@
 	margin-top: 40rpx;
 	padding-top: 30rpx;
 	font-size: 24rpx;
-	// font-family: Source Han Sans CN;
 	font-weight: bold;
 	color: #211808;
 	line-height: 42rpx;
 	width: 528rpx;
-	height: 148rpx;
 	background-color: #FAEDD6;
 	text-align: center;
 }
 .wenben4 {
 	text-align: center;
 	margin-top: 50rpx;
-	height: 35rpx;
 	font-size: 37rpx;
 	font-weight: bold;
 	color: #D7BB80;
-	line-height: 10rpx;
 }
 .wenben5 {
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	// width: 528rpx;
-	// height: 138rpx;
 }
 .te {
 	margin-left: 62rpx;
 	margin-top: 40rpx;
 	padding-top: 40rpx;
 	font-size: 24rpx;
-	// font-family: Source Han Sans CN;
 	font-weight: bold;
 	color: #211808;
-	line-height: 42rpx;
 	width: 528rpx;
 	height: 100%;
 	background-color: #FAEDD6;

pages/introduce/promotion.vue

@@ -30,8 +30,6 @@
 				</view>
 				<view class="wenben"> {{$t('promotion.a6')}} </view>
 			</view>
-			
-			
 			<view class="topt">
 				<view class="hy">
 					<image class="icon" src="../../static/icon/tg5.png" mode=""></image>
@@ -118,30 +116,26 @@
 	.title {
 		margin-top: 95rpx;
 		margin-left: 253rpx;
-		height: 36rpx;
 		font-size: 37rpx;
 		font-weight: bold;
 		color: #d7b271;
-		line-height: 10rpx;
 	}
 	.hy {
 		display: flex;
 		justify-content: start;
-	}
-	.icon {
-		width: 66rpx;
-		height: 49rpx;
-		margin-left: 60rpx;
 		margin-top: 70rpx;
-	}
-	.wen {
-		margin-left: 20rpx;
-		margin-top: 75rpx;
-		height: 34rpx;
-		font-size: 36rpx;
-		font-weight: bold;
-		color: #201809;
-		line-height: 36rpx;
+		.icon {
+			width: 66rpx;
+			height: 49rpx;
+			margin-left: 60rpx;
+		}
+		.wen {
+			padding-left: 20rpx;
+			font-size: 36rpx;
+			font-weight: bold;
+			color: #201809;
+		}
+		
 	}
 	.wenben {
 		margin: 20rpx 20rpx 0 60rpx;
@@ -149,6 +143,6 @@
 		font-size: 28rpx;
 		font-weight: bold;
 		color: #201809;
-		line-height: 36rpx;
 	}
+	
 </style>

pages/user/set/password.vue

@@ -4,15 +4,16 @@
 			<text class="tit">{{$t('safe.d4')}}</text>
 			<input class="input" v-model="account" type="text" :placeholder="$t('reg.c3')" placeholder-class="placeholder" />
 		</view>
+		<view class="row b-b">
+			<text class="tit">{{$t('safe.b3')}}</text>
+			<input class="input" v-model="password" type="password" :placeholder="$t('safe.b4')" placeholder-class="placeholder" />
+		</view>
 		<view class="row b-b">
 			<text class="tit">{{$t('safe.a7')}}</text>
 			<input class="input" v-model="captcha" type="text" :placeholder="$t('safe.a6')" placeholder-class="placeholder" />
 			<view class="code" @click="verification">{{ countDown == 0 ? '验证码' : countDown }}</view>
 		</view>
-		<view class="row b-b">
-			<text class="tit">{{$t('safe.b3')}}</text>
-			<input class="input" v-model="password" type="password" :placeholder="$t('safe.b4')" placeholder-class="placeholder" />
-		</view>
+	
 		<button class="add-btn" :class="{'bg-gray':loding}" @click="loding?'':confirm()">{{$t('set.a5')}}</button>
 	</view>
 </template>

pages/user/set/transaction.vue

@@ -41,12 +41,12 @@ export default {
 		...mapState("user",['userInfo'])
 	},
 	onLoad() {
-		// if(this.userInfo.phone == null){
-		// 	this.account = '';
-		// }else{
-		// 	this.account = this.userInfo.phone;
-		// 	this.show = false;
-		// }
+		if(this.userInfo.phone == null){
+			this.account = '';
+		}else{
+			this.account = this.userInfo.phone;
+			this.show = false;
+		}
 		uni.setNavigationBarTitle({
 			title: this.$t("tab.b3"),
 		});