diff --git a/uni_modules/uni-login-page/common/loginPage.css b/uni_modules/uni-login-page/common/loginPage.css
new file mode 100644
index 0000000000000000000000000000000000000000..a01b6b45269f00b6cdaffce89efa2cab3c18a457
--- /dev/null
+++ b/uni_modules/uni-login-page/common/loginPage.css
@@ -0,0 +1,123 @@
+/* #ifndef APP-NVUE */
+page {
+	display: flex;
+	flex-direction: column;
+	flex: 1;
+	height: 100%;
+}
+
+/* #endif */
+.wrap {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+	flex: 1;
+	width: 750rpx;
+	background-color: #fff;
+}
+
+.wrap-content {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex: 1;
+	flex-direction: column;
+	justify-content: flex-start;
+	align-items: center;
+}
+
+.content {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	width: 630rpx;
+	flex-direction: column;
+}
+
+.content-top-title {
+	font-size: 32rpx;
+	font-weight: 600;
+	padding-top: 50rpx;
+}
+
+.hidden,
+page {
+	background-color: transparent;
+}
+
+.login-iknow {
+	padding-top: 24rpx;
+	padding-bottom: 48rpx;
+}
+
+.phone-input-box {
+	height: 85rpx;
+	background-color: #f9f9f9;
+	border-radius: 6rpx;
+	flex-direction: row;
+	flex-wrap: nowrap;
+	align-items: center;
+	justify-content: center;
+}
+
+.phone-area {
+	padding: 0 20rpx;
+	font-size: 30rpx;
+}
+
+.phone-input {
+	flex: 1;
+	border-left-width: 1px;
+	border-left-color: #d7d9d8;
+	padding: 0 20rpx;
+	font-size: 30rpx;
+}
+
+.tip-text {
+	padding-top: 20rpx;
+	padding-bottom: 36rpx;
+	color: #8a8f8b;
+	font-size: 26rpx;
+}
+
+.send-btn-box {
+	height: 85rpx;
+	background-color: #d8d8da;
+	margin-bottom: 50rpx;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: column;
+	width: 630rpx;
+	justify-content: center;
+	align-items: center;
+	border-radius: 6rpx;
+}
+
+.send-btn-text {
+	color: #fff;
+}
+
+.send-btn-active {
+	background-color: #007aff;
+}
+
+.auth-box {
+	width: 630rpx;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.login-text {
+	color: #1c436e;
+	font-size: 26rpx;
+}
+
+.hover {
+	opacity: 0.8;
+}
diff --git a/uni_modules/uni-login-page/components/login-action-sheet/login-action-sheet.vue b/uni_modules/uni-login-page/components/login-action-sheet/login-action-sheet.vue
index 6e70bdc146d8e301a1ae451cb466a9aef82dd1c8..f73419734a3343f20af1ad8c3344ddecf3fa6062 100644
--- a/uni_modules/uni-login-page/components/login-action-sheet/login-action-sheet.vue
+++ b/uni_modules/uni-login-page/components/login-action-sheet/login-action-sheet.vue
@@ -1,14 +1,14 @@
 <template>
 	<uni-popup ref="actionSheet" type="bottom">
-		<view class="flex w-750 action-sheet-box bg-white">
-			<view class="flex flex-row flex-nowrap align-center justify-center auth-item" @click="clickItem(item)"
+		<view class="action-sheet-box">
+			<view class="auth-wrap auth-item" @click="clickItem(item)"
 				hover-class="hover" v-for="(item, index) in providerList" :key="index">
 				<image :src="item.image" class="login-logo"></image>
-				<text class="px-1 font-28">{{providerName[item.value]}}</text>
+				<text class="auth-text">{{providerName[item.value]}}</text>
 			</view>
 			<view class="cancel-line"></view>
-			<view class="flex flex-row flex-nowrap align-center justify-center cancel-item" @click="clickItem(item)">
-				<text class="font-28">取消</text>
+			<view class="auth-wrap cancel-item" @click="clickItem(item)">
+				<text class="auth-text">取消</text>
 			</view>
 		</view>
 	</uni-popup>
@@ -88,19 +88,32 @@
 	}
 </script>
 
-<style>
-	@import url("../../common/myStyle.css");
-
+<style scoped>
 	.action-sheet-box {
 		border-top-left-radius: 20rpx;
-		border-top-right-radius: 20rpx;
+		border-top-right-radius: 20rpx;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		width: 750rpx;
+		background-color: #fff;
 	}
 
 	.login-logo {
 		width: 42rpx;
 		height: 42rpx;
 	}
-
+	
+	.auth-wrap{
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-items: center;
+		justify-content: center;
+	}
+	
 	.auth-item {
 		border-bottom-width: 1px;
 		border-bottom-color: #F1F1F1;
@@ -115,5 +128,9 @@
 		width: 750rpx;
 		height: 10rpx;
 		background-color: #F1F1F1;
+	}
+	.auth-text{
+		padding: 0 10rpx;
+		font-size: 28rpx;
 	}
 </style>
diff --git a/uni_modules/uni-login-page/components/login-ikonw/login-ikonw.vue b/uni_modules/uni-login-page/components/login-ikonw/login-ikonw.vue
index f1ac3e0e51ed980b2b1a99bf751370d6945735dd..8b49816a81a0db49e2dd6b04710f85a4ffe6a83d 100644
--- a/uni_modules/uni-login-page/components/login-ikonw/login-ikonw.vue
+++ b/uni_modules/uni-login-page/components/login-ikonw/login-ikonw.vue
@@ -1,6 +1,6 @@
 <template>
-	<view class="flex flex-row flex-wrap">
-		<text class="text-sub font-26" v-for="(t, i) in innerText" :key="i" :class="t.to?'link-color':''"
+	<view class="login-iknow-wrap">
+		<text class="text-sub" v-for="(t, i) in innerText" :key="i" :class="t.to?'link-color':''"
 			@click="clickLink(t)">{{t.text || t}}</text>
 	</view>
 </template>
@@ -19,7 +19,7 @@
 			},
 			link: {
 				type: Array,
-				default: []
+				default: ()=>[]
 			}
 		},
 		data() {
@@ -69,9 +69,18 @@
 	}
 </script>
 
-<style>
-	@import url("../../common/myStyle.css");
-
+<style scoped>
+	.login-iknow-wrap{
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: wrap;
+	}
+	.text-sub{
+		color: #8a8f8b;
+		font-size: 26rpx;
+	}
 	.link-color {
 		color: #04498c;
 	}
diff --git a/uni_modules/uni-login-page/components/login-short-code/login-short-code.vue b/uni_modules/uni-login-page/components/login-short-code/login-short-code.vue
index c1e50d3a8b48a515190a1a48d38ac10894be14e1..052bd6c29efb3735f0b64fa2d5507eb681ad32d0 100644
--- a/uni_modules/uni-login-page/components/login-short-code/login-short-code.vue
+++ b/uni_modules/uni-login-page/components/login-short-code/login-short-code.vue
@@ -1,6 +1,6 @@
 <template>
-	<view class="flex justify-center align-center short-code-btn" hover-class="hover" @click="clickBtn">
-		<text class="font-28">{{innerText}}</text>
+	<view class="short-code-btn" hover-class="hover" @click="clickBtn">
+		<text class="inner-text" :class="reverseNumber==0?'inner-text-active':''">{{innerText}}</text>
 	</view>
 </template>
 
@@ -70,11 +70,20 @@
 	}
 </script>
 
-<style>
-	@import url("../../common/myStyle.css");
-
+<style scoped>
 	.short-code-btn {
 		width: 200rpx;
-		height: 85rpx;
+		height: 85rpx;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+	}
+	.inner-text{
+		font-size: 28rpx;
+	}
+	.inner-text-active{
+		color: #007aff;
 	}
 </style>
diff --git a/uni_modules/uni-login-page/pages/index/index.vue b/uni_modules/uni-login-page/pages/index/index.vue
index 2b6eb5561eb2552dec6771c4ed1204dae3ad75f6..8c9317fdce24a7b9e2d4eef8e3b660985fbc51a1 100644
--- a/uni_modules/uni-login-page/pages/index/index.vue
+++ b/uni_modules/uni-login-page/pages/index/index.vue
@@ -5,14 +5,14 @@
 			<view class="content">
 				<!-- 顶部文字 -->
 				<text class="content-top-title">登陆后即可展示自己</text>
-				<login-ikonw class="lgnin-iknow" :link="link" text="登录即表示同意用户协议和隐私政策"></login-ikonw>
+				<login-ikonw class="login-iknow" :link="link" text="登录即表示同意用户协议和隐私政策"></login-ikonw>
 
 				<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
 				<view class="phone-input-box">
 					<picker mode="selector" :range="phoneArea" @change="selectPhoneArea">
 						<text class="phone-area">{{currenPhoneArea}}</text>
 					</picker>
-					<input type="number" class="phone-input" placeholder="请输入手机号"
+					<input type="number" class="phone-input" maxlength="11" placeholder="请输入手机号"
 						v-model="phoneNumber" />
 				</view>
 
@@ -95,6 +95,7 @@
 </script>
 
 <style>
+<<<<<<< HEAD
 	page {
 		background: transparent;
 	}
@@ -131,11 +132,13 @@
 		width: 630rpx;
 		flex-direction: column;
 	}
+=======
+	@import url("../../common/loginPage.css");
+>>>>>>> 4102167b2d3d22ebf4994a07a5b8421d8539345c
 	.content-top-title{
-		font-size: 32rpx;
-		font-weight: 600;
-		padding-top: 50rpx;
+		text-align: center;
 	}
+<<<<<<< HEAD
 	@import url("../../common/myStyle.css");
 
 	.lgnin-iknow {
@@ -150,59 +153,9 @@
 		flex-direction: row;
 		flex-wrap: nowrap;
 		align-items: center;
+=======
+	.login-iknow{
+>>>>>>> 4102167b2d3d22ebf4994a07a5b8421d8539345c
 		justify-content: center;
-	}
-	.phone-area{
-		padding: 0 20rpx;
-		font-size: 30rpx;
-	}
-
-	.phone-input {
-		border-left-width: 1px;
-		border-left-color: #d7d9d8;
-		padding: 0 20rpx;
-		font-size: 30rpx;
-	}
-
-	.tip-text {
-		padding-top: 20rpx;
-		padding-bottom: 36rpx;
-		color: #8a8f8b;
-		font-size: 26rpx;
-	}
-
-	.send-btn-box {
-		height: 85rpx;
-		background-color: #d8d8da;
-		margin-bottom: 50rpx;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: column;
-		width: 630rpx;
-		justify-content: center;
-		align-items: center;
-		border-radius: 6rpx;
-	}
-	.send-btn-text{
-		color: #fff;
-	}
-
-	.send-btn-active {
-		background-color: #007aff;
-	}
-	
-	.auth-box{
-		width: 630rpx;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-	}
-	.login-text {
-		color: #1c436e;
-		font-size: 26rpx;
 	}
 </style>
\ No newline at end of file
diff --git a/uni_modules/uni-login-page/pages/index/pwd-login.nvue b/uni_modules/uni-login-page/pages/index/pwd-login.nvue
deleted file mode 100644
index 7c2dd20d61b922afa2bb2026eef69143638b141f..0000000000000000000000000000000000000000
--- a/uni_modules/uni-login-page/pages/index/pwd-login.nvue
+++ /dev/null
@@ -1,133 +0,0 @@
-<template>
-	<view class="flex flex-column flex-1 w-750 bg-white">
-		<view class="flex-1 flex flex-column justify-start align-center">
-			<view class="w-630 flex flex-column">
-				<!-- 顶部文字 -->
-				<text class="font-32 font-blod pt-5">手机号密码登录</text>
-
-				<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
-				<view class="phone-input-box round flex flex-row flex-nowrap align-center justify-center mt-5">
-					<picker mode="selector" :range="phoneArea" @change="selectPhoneArea">
-						<text class="px-2 font-30">{{currenPhoneArea}}</text>
-					</picker>
-					<input type="number" class="flex-1 phone-input px-2 font-30" placeholder="请输入手机号"
-						v-model="phoneNumber" />
-				</view>
-
-				<view class="phone-input-box round flex flex-row flex-nowrap align-center justify-center mt-2">
-					<input type="password" :password="true" class="flex-1 px-2 font-30" placeholder="请输入密码"
-						v-model="password" />
-				</view>
-
-				<login-ikonw class="lgnin-iknow" :link="link" text="登录即表示同意用户协议和隐私政策"></login-ikonw>
-
-				<!-- 发送按钮 -->
-				<view class="send-btn-box flex w-630 justify-center align-center round" hover-class="hover"
-					@click="pwdLogin" :class="canLogin?'send-btn-active':''">
-					<text class="text-white">登录</text>
-				</view>
-
-				<!-- 忘记密码 -->
-				<view class="flex flex-row flex-nowrap">
-					<text class="font-26 text-sub">忘记了?</text>
-					<text class="font-26 login-text" @click="toRetrievePwd">找回密码</text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				phoneNumber: '',
-				password: '',
-				link: [{
-					text: '用户协议',
-					to: '/baidu.com'
-				}, {
-					text: '隐私政策',
-					to: 'baidu'
-				}],
-				phoneArea: ['+86', '+87'],
-				currenPhoneArea: '+86',
-			}
-		},
-		computed: {
-			canLogin() {
-				let reg_phone = /^1\d{10}$/;
-				let reg_pwd = /^.{6,20}$/;
-				let isPhone = reg_phone.test(this.phoneNumber);
-
-				let isPwd = reg_pwd.test(this.password);
-				return isPhone && isPwd;
-			}
-		},
-		methods: {
-			/**
-			 * 页面跳转，找回密码
-			 */
-			toRetrievePwd() {
-				let reg_phone = /^1\d{10}$/;
-				let isPhone = reg_phone.test(this.phoneNumber);
-				if (!isPhone) return uni.showToast({
-					title: '请输入正确的手机号',
-					icon: 'none'
-				});
-
-				uni.navigateTo({
-					url: './pwd-retrieve?phoneNumber=' + this.phoneNumber + '&phoneArea=' + this.currenPhoneArea
-				})
-			},
-			/**
-			 * 密码登录
-			 */
-			pwdLogin() {
-				if (!this.canLogin) return;
-				// 下边是可以登录
-			},
-			selectPhoneArea(event) {
-				this.currenPhoneArea = this.phoneArea[event.detail.value];
-			},
-		}
-	}
-</script>
-
-<style>
-	@import url("../../common/myStyle.css");
-
-	.lgnin-iknow {
-		padding-top: 24rpx;
-		padding-bottom: 36rpx;
-	}
-
-	.phone-input-box {
-		height: 85rpx;
-		background-color: #f9f9f9;
-	}
-
-	.phone-input {
-		border-left-width: 1px;
-		border-left-color: #d7d9d8;
-	}
-
-	.tip-text {
-		padding-top: 20rpx;
-		padding-bottom: 36rpx;
-	}
-
-	.send-btn-box {
-		height: 85rpx;
-		background-color: #d8d8da;
-		margin-bottom: 50rpx;
-	}
-
-	.send-btn-active {
-		background-color: #007aff;
-	}
-
-	.login-text {
-		color: #1c436e;
-	}
-</style>
diff --git a/uni_modules/uni-login-page/pages/index/pwd-login.vue b/uni_modules/uni-login-page/pages/index/pwd-login.vue
new file mode 100644
index 0000000000000000000000000000000000000000..65957267a307eefe181845ce82eaae41e1c3d3f3
--- /dev/null
+++ b/uni_modules/uni-login-page/pages/index/pwd-login.vue
@@ -0,0 +1,107 @@
+<template>
+	<view class="wrap">
+		<view class="wrap-content">
+			<view class="content">
+				<!-- 顶部文字 -->
+				<text class="content-top-title">手机号密码登录</text>
+
+				<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
+				<view class="phone-input-box">
+					<picker mode="selector" :range="phoneArea" @change="selectPhoneArea">
+						<text class="phone-area">{{currenPhoneArea}}</text>
+					</picker>
+					<input type="number" class="phone-input" placeholder="请输入手机号" maxlength="11" v-model="phoneNumber" />
+				</view>
+
+				<view class="phone-input-box">
+					<input type="password" :password="true" class="phone-input pwd-input" placeholder="请输入密码"
+						v-model="password" />
+				</view>
+
+				<login-ikonw class="login-iknow" :link="link" text="登录即表示同意用户协议和隐私政策"></login-ikonw>
+
+				<!-- 发送按钮 -->
+				<view class="send-btn-box" hover-class="hover"
+					@click="pwdLogin" :class="canLogin?'send-btn-active':''">
+					<text class="send-btn-text">登录</text>
+				</view>
+
+				<!-- 忘记密码 -->
+				<view class="auth-box">
+					<text class="login-text login-text-sub">忘记了?</text>
+					<text class="login-text" @click="toRetrievePwd">找回密码</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phoneNumber: '',
+				password: '',
+				link: [{
+					text: '用户协议',
+					to: '/baidu.com'
+				}, {
+					text: '隐私政策',
+					to: 'baidu'
+				}],
+				phoneArea: ['+86', '+87'],
+				currenPhoneArea: '+86',
+			}
+		},
+		computed: {
+			canLogin() {
+				let reg_phone = /^1\d{10}$/;
+				let reg_pwd = /^.{6,20}$/;
+				let isPhone = reg_phone.test(this.phoneNumber);
+
+				let isPwd = reg_pwd.test(this.password);
+				return isPhone && isPwd;
+			}
+		},
+		methods: {
+			/**
+			 * 页面跳转，找回密码
+			 */
+			toRetrievePwd() {
+				let reg_phone = /^1\d{10}$/;
+				let isPhone = reg_phone.test(this.phoneNumber);
+				if (!isPhone) return uni.showToast({
+					title: '请输入正确的手机号',
+					icon: 'none'
+				});
+
+				uni.navigateTo({
+					url: './pwd-retrieve?phoneNumber=' + this.phoneNumber + '&phoneArea=' + this.currenPhoneArea
+				})
+			},
+			/**
+			 * 密码登录
+			 */
+			pwdLogin() {
+				if (!this.canLogin) return;
+				// 下边是可以登录
+			},
+			selectPhoneArea(event) {
+				this.currenPhoneArea = this.phoneArea[event.detail.value];
+			},
+		}
+	}
+</script>
+
+<style>
+	@import url("../../common/loginPage.css");
+	.phone-input-box{
+		margin-top: 20rpx;
+	}
+	.auth-box{
+		justify-content: flex-start;
+	}
+	.login-text-sub{
+		color: #8a8f8b;
+	}
+</style>
diff --git a/uni_modules/uni-login-page/pages/index/pwd-retrieve.nvue b/uni_modules/uni-login-page/pages/index/pwd-retrieve.nvue
deleted file mode 100644
index 0d6f7890ca25faddfd4a655774b8d0f50a79f1db..0000000000000000000000000000000000000000
--- a/uni_modules/uni-login-page/pages/index/pwd-retrieve.nvue
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
-	<view class="flex flex-column flex-1 w-750 bg-white">
-		<view class="flex-1 flex flex-column justify-start align-center">
-			<view class="w-630 flex flex-column">
-				<!-- 顶部文字 -->
-				<text class="font-32 font-blod pt-5">手机号密码登录</text>
-				<login-ikonw class="lgnin-iknow" :text="tipText"></login-ikonw>
-				<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
-				<view class="phone-input-box round flex flex-row flex-nowrap align-center justify-center">
-					<input type="number" :maxlength="6" class="flex-1 phone-input px-2 font-30" placeholder="请输入验证码"
-						v-model="phoneCode" />
-					<login-short-code @getCode="getCode"></login-short-code>
-				</view>
-
-				<view class="phone-input-box round flex flex-row flex-nowrap align-center justify-center mt-2">
-					<input type="password" :password="true" class="flex-1 px-2 font-30" placeholder="请输入密码"
-						v-model="password" />
-				</view>
-
-				<!-- 发送按钮 -->
-				<view class="send-btn-box flex w-630 justify-center align-center round mt-5" hover-class="hover"
-					@click="pwdLogin" :class="canSubmit?'send-btn-active':''">
-					<text class="text-white">完成</text>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				phoneNumber: '',
-				phoneCode: '',
-				password: '',
-				currenPhoneArea: '',
-			}
-		},
-		computed: {
-			tipText() {
-				return `验证码已通过短信发送至${this.currenPhoneArea} ${this.phoneNumber}。密码为6 - 20位`
-			},
-			canSubmit() {
-				let reg_phone = /^1\d{10}$/;
-				let reg_pwd = /^.{6,20}$/;
-				let reg_code = /^\d{6}$/;
-				let isPhone = reg_phone.test(this.phoneNumber);
-				let isPwd = reg_pwd.test(this.password);
-				let isCode = reg_code.test(this.phoneCode);
-				return isPhone && isPwd && isCode;
-			}
-		},
-		onLoad(event) {
-			if (event) {
-				this.phoneNumber = event.phoneNumber;
-				this.currenPhoneArea = '+' + Number(event.phoneArea);
-			}
-		},
-		methods: {
-			/**
-			 * 获取验证码倒计时
-			 * 倒计时期间不会触发该方法
-			 */
-			getCode(done) {
-				if (this.phoneNumber == '') return uni.showToast({
-					title: '请填写手机号',
-					icon: 'none'
-				});
-				// 发送成功后开启倒计时
-				done();
-			}
-		}
-	}
-</script>
-
-<style>
-	@import url("../../common/myStyle.css");
-
-	.lgnin-iknow {
-		padding-top: 24rpx;
-		padding-bottom: 36rpx;
-	}
-
-	.phone-input-box {
-		height: 85rpx;
-		background-color: #f9f9f9;
-	}
-
-	.phone-input {}
-
-	.tip-text {
-		padding-top: 20rpx;
-		padding-bottom: 36rpx;
-	}
-
-	.send-btn-box {
-		height: 85rpx;
-		background-color: #d8d8da;
-		margin-bottom: 50rpx;
-	}
-
-	.send-btn-active {
-		background-color: #007aff;
-	}
-
-	.login-text {
-		color: #1c436e;
-	}
-</style>
diff --git a/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue b/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue
new file mode 100644
index 0000000000000000000000000000000000000000..58170f39ec79158b54215cebdf6b0c7b8c25ab9c
--- /dev/null
+++ b/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue
@@ -0,0 +1,94 @@
+<template>
+	<view class="wrap">
+		<view class="wrap-content">
+			<view class="content">
+				<!-- 顶部文字 -->
+				<text class="content-top-title">手机号密码登录</text>
+				<login-ikonw class="login-iknow" :text="tipText"></login-ikonw>
+				<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
+				<view class="phone-input-box">
+					<input type="number" :maxlength="6" class="phone-input" placeholder="请输入验证码"
+						v-model="phoneCode" />
+					<login-short-code @getCode="getCode"></login-short-code>
+				</view>
+
+				<view class="phone-input-box">
+					<input type="password" :password="true" class="phone-input" placeholder="请输入密码"
+						v-model="password" />
+				</view>
+
+				<!-- 发送按钮 -->
+				<view class="send-btn-box" hover-class="hover"
+					@click="submit" :class="canSubmit?'send-btn-active':''">
+					<text class="send-btn-text">完成</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				phoneNumber: '',
+				phoneCode: '',
+				password: '',
+				currenPhoneArea: '',
+			}
+		},
+		computed: {
+			tipText() {
+				return `验证码已通过短信发送至${this.currenPhoneArea} ${this.phoneNumber}。密码为6 - 20位`
+			},
+			canSubmit() {
+				let reg_phone = /^1\d{10}$/;
+				let reg_pwd = /^.{6,20}$/;
+				let reg_code = /^\d{6}$/;
+				let isPhone = reg_phone.test(this.phoneNumber);
+				let isPwd = reg_pwd.test(this.password);
+				let isCode = reg_code.test(this.phoneCode);
+				return isPhone && isPwd && isCode;
+			}
+		},
+		onLoad(event) {
+			if (event) {
+				this.phoneNumber = event.phoneNumber;
+				this.currenPhoneArea = '+' + Number(event.phoneArea);
+			}
+		},
+		methods: {
+			/**
+			 * 获取验证码倒计时
+			 * 倒计时期间不会触发该方法
+			 */
+			getCode(done) {
+				if (this.phoneNumber == '') return uni.showToast({
+					title: '请填写手机号',
+					icon: 'none'
+				});
+				// 发送成功后开启倒计时
+				done();
+			},
+			/**
+			 * 完成并提交
+			 */
+			submit(){
+				
+			}
+		}
+	}
+</script>
+
+<style>
+	@import url("../../common/loginPage.css");
+	.phone-input-box{
+		margin-top: 20rpx;
+	}
+	.phone-input{
+		border-left-width: 0;
+	}
+	.send-btn-box{
+		margin-top: 50rpx;
+	}
+</style>