From 6f61f656d7a3f2284ab633803f574a873916d697 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Fri, 19 Jul 2024 09:21:29 +0800
Subject: [PATCH] =?UTF-8?q?ios=E5=BA=94=E5=AF=B9=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/bookShop/settlement.vue | 16 ++++++-----
 pages/user/login.vue          | 51 ++++++++++++++++++-----------------
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/pages/bookShop/settlement.vue b/pages/bookShop/settlement.vue
index c4b0866..346e00c 100644
--- a/pages/bookShop/settlement.vue
+++ b/pages/bookShop/settlement.vue
@@ -71,8 +71,8 @@
 				注：如订单包含一种或多种预售书，预售书和现货书需分开发货（即需要收取多次快递首重费用）；如多本书会按照实际重量，收取快递续重费用。
 			</view>
 		</view>
-		<!-- 安卓支付列表 -->
-		<view class="zhif_fangsh" v-if="isAndorid">
+		<!-- 支付列表 -->
+		<view class="zhif_fangsh" >
 			<view class="zhif_radio">
 				<u-radio-group v-model="payType">
 					<view style="width: 100%;">
@@ -91,7 +91,7 @@
 			</view>
 		</view>
 		<!-- ios支付列表 -->
-		<view class="zhif_fangsh" v-else>
+		<!-- <view class="zhif_fangsh" v-else>
 			<view class="zhif_radio">
 				<u-radio-group v-model="payType">
 					<view style="width: 100%;">
@@ -108,7 +108,7 @@
 					</view>
 				</u-radio-group>
 			</view>
-		</view>
+		</view> -->
 
 		<view class="footer">
 			<view class="commodityPrice" v-if="payType != 4">
@@ -917,7 +917,7 @@
 		padding: 30rpx 40rpx 0 40rpx;
 		background-color: #fff;
 		border-bottom: 1px solid #eee;
-		padding-bottom: 90rpx;
+		 padding-bottom: 90rpx;
 
 		.zhif_radio {
 
@@ -934,7 +934,11 @@
 					margin-right: 20rpx;
 					vertical-align: bottom;
 				}
-			}
+				
+			}.zhif_xuanx:last-child{
+					border-bottom:none !important;
+				}
+			
 
 		}
 
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 61671d4..1b51bc8 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -41,7 +41,7 @@
 						</view>
 						<view class="triangle borderBottom phoneNumberInput"
 							:clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
-							<input type="number" v-model="phone" @input="onInput" placeholder="请输入您的手机号"
+							<input type="number"  v-model="phone" @input="onInput" placeholder="请输入您的手机号"
 								placeholder-class="grey" />
 						</view>
 					</view>
@@ -112,10 +112,10 @@
 				</view>
 
 				<view class="qie_huan" style="display: flex; justify-content: center;">
-					<view style="width: 30%;" @click="type = 1000" v-if="type == 2000">密码登录</view>
-					<view style="width:50%; display: flex; justify-content:space-between;" v-if="type == 1000">
-						<text @click="type = 2000">验证码登录</text>
-						<text v-if="type == 1000" @click="onPageJump('/pages/user/forget')">忘记密码？</text>
+					<view style="width: 30%; font-size: 30rpx;" @click="type = 1000" v-if="type == 2000">密码登录</view>
+					<view class="methTitle"  v-if="type == 1000">
+						<text @click="type = 2000" style="font-size: 30rpx;">验证码登录</text>
+						<text v-if="type == 1000" @click="onPageJump('/pages/user/forget')" style="font-size: 30rpx;">忘记密码？</text>
 						<!-- <text @click="resetPassWord()">忘记密码</text> -->
 					</view>
 				</view>
@@ -840,7 +840,7 @@
 		height: 67rpx;
 
 		input {
-			font-size: 28rpx;
+			font-size: 32rpx;
 			margin: 20rpx 0;
 		}
 	}
@@ -890,7 +890,9 @@
 
 
 	}
-
+.methTitle{
+	width:60%; display: flex; justify-content:space-between;
+}
 	.logo_bg {
 		background-image: url('@/static/icon/login_bg.png');
 		// background-position: center center;
@@ -946,7 +948,7 @@
 				font-size: 40rpx;
 				letter-spacing: 3rpx;
 				color: #666;
-
+				font-size: 34rpx;
 				&.active {
 					position: relative;
 					color: $themeColor;
@@ -1030,7 +1032,7 @@
 
 			input {
 				flex: 1;
-				font-size: 28rpx;
+				font-size: 32rpx;
 				color: #333;
 				height: 70rpx;
 			}
@@ -1127,22 +1129,23 @@
 
 	.third_party_login_box {
 		position: fixed;
-		bottom: 60rpx;
+		bottom: 20rpx;
 		width: 100%;
 		left: 0;
+		display: flex; align-content: center; align-items: center; justify-content: center;
 		padding: 0 30rpx;
 
 		.third_party_title {
-			display: flex;
+			// display: flex;
 			align-items: center;
 
-			&:before,
-			&:after {
-				content: '';
-				flex: 1;
-				height: 2rpx;
-				background-color: #f5f5f5;
-			}
+			// &:before,
+			// &:after {
+			// 	content: '';
+			// 	flex: 1;
+			// 	height: 2rpx;
+			// 	background-color: #f5f5f5;
+			// }
 
 			text {
 				font-size: 24rpx;
@@ -1153,14 +1156,14 @@
 		}
 
 		.third_party_content {
-			margin-top: 60rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
+			// margin-top: 60rpx;
+			// display: flex;
+			// justify-content: center;
+			// align-items: center;
 
 			image {
-				width: 80upx;
-				height: 80upx;
+				width: 60upx;
+				height: 60upx;
 				margin: 0 20rpx;
 			}
 		}