From 4300b5c714bb7e09f53f7d722c953dec9c809d8e Mon Sep 17 00:00:00 2001
From: queenwuli <942534046@qq.com>
Date: Mon, 04 Jan 2021 17:08:59 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app into master

---
 hive-app/pages/login/forgetPassword.vue |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/hive-app/pages/login/forgetPassword.vue b/hive-app/pages/login/forgetPassword.vue
index d2b99f7..97be2bf 100644
--- a/hive-app/pages/login/forgetPassword.vue
+++ b/hive-app/pages/login/forgetPassword.vue
@@ -3,12 +3,14 @@
 	<view>
 		<view class="input-box">
 			<input placeholder="请输入手机号码" placeholder-class="placeholder" class="input-group-row"/>
-			<view class="flex mt-10">
-				<input placeholder="请输入验证码" placeholder-class="placeholder" class="input-group-row flex-1"/>
-				<button class="btn blue-btn">获取验证码</button>
+			<view class="flex mt-10 ">
+				<input placeholder="请输入验证码" placeholder-class="placeholder" class="input-group-row flex-1 mr-10"/>
+				<navigator url="" hover-class="none" class="btn-box">
+					<button class="btn blue-btn">获取验证码</button>
+				</navigator>
 			</view>
 		</view>
-		<navigator url="./newPassword" hover-class="none" class="next">
+		<navigator url="./newPassword" hover-class="none" class="sticky-footer">
 			<button class="blue-btn">下一步</button>
 		</navigator>
 	</view>
@@ -21,10 +23,13 @@
 	.input-box{
 		margin: 40px 20px;
 	}
+	.btn-box{
+		display: flex;
+		align-items: flex-end;
+	}
 	.btn{
 		margin: 0;
-	}
-	.next{
-		margin: 60px 20px;
+		font-size: 12px;
+		line-height: 36px;
 	}
 </style>

--
Gitblit v1.9.1