From ac01922ef4db3900b6fdca8dfc8c510605783e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=8A=E9=87=8C?= <1227971437@qq.com>
Date: Wed, 7 Apr 2021 20:33:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |   4 +-
 pages/ucenter/ucenter.vue                     |   3 -
 .../uni-login-page/pages/index/index.vue      | 113 ++++++++++++++----
 3 files changed, 95 insertions(+), 25 deletions(-)

diff --git a/pages.json b/pages.json
index 731cdb36..c9787f6c 100644
--- a/pages.json
+++ b/pages.json
@@ -23,10 +23,10 @@
 				"navigationBarTitleText": "",
 				"navigationBarBackgroundColor": "#FFFFFF",
 				"navigationStyle": "custom",
-				"backgroundColor": "transparent",
+				// "backgroundColor": "transparent",
 				"app-plus": {
 					"animationType": "fade-in",
-					"background": "transparent",
+					// "background": "transparent",
 					"popGesture": "none",
 					"titleNView":false
 				// "navigationBarTitleText": "",
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index c9dc792d..11cda6b1 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -97,9 +97,6 @@
 		},
 		onReady() {
 
-		},
-		onShow() {
-			console.log(this.userInfo);
 		},
 		methods: {
 			...mapMutations({
diff --git a/uni_modules/uni-login-page/pages/index/index.vue b/uni_modules/uni-login-page/pages/index/index.vue
index 8fc11ef3..d0272954 100644
--- a/uni_modules/uni-login-page/pages/index/index.vue
+++ b/uni_modules/uni-login-page/pages/index/index.vue
@@ -1,33 +1,34 @@
 <template>
-	<view class="flex flex-column flex-1 w-750 bg-white" :class="{'hidden':!isShow}">
-		<view v-if="isShow" class="flex-1 flex flex-column justify-start align-center">
-			<view class="w-630 flex flex-column">
+	<view class="wrap" :class="{'hidden':!isShow}">
+		<uni-nav-bar left-icon="back" right-text="帮助" :statusBar="true" :border="false"></uni-nav-bar>
+		<view v-if="isShow" class="wrap-content">
+			<view class="content">
 				<!-- 顶部文字 -->
-				<text class="font-32 font-blod pt-5">登陆后即可展示自己</text>
+				<text class="content-top-title">登陆后即可展示自己</text>
 				<login-ikonw class="lgnin-iknow" :link="link" text="登录即表示同意用户协议和隐私政策"></login-ikonw>
 
 				<!-- 登录框 (选择手机号所属国家和地区需要另行实现) -->
-				<view class="phone-input-box round flex flex-row flex-nowrap align-center justify-center">
+				<view class="phone-input-box">
 					<picker mode="selector" :range="phoneArea" @change="selectPhoneArea">
-						<text class="px-2 font-30">{{currenPhoneArea}}</text>
+						<text class="phone-area">{{currenPhoneArea}}</text>
 					</picker>
-					<input type="number" class="flex-1 phone-input px-2 font-30" placeholder="请输入手机号"
+					<input type="number" class="phone-input" placeholder="请输入手机号"
 						v-model="phoneNumber" />
 				</view>
 
 				<!-- tip -->
-				<text class="text-sub font-26 tip-text">未注册的手机号验证通过后蒋自动注册</text>
+				<text class="tip-text">未注册的手机号验证通过后蒋自动注册</text>
 
 				<!-- 发送按钮 -->
-				<view class="send-btn-box flex w-630 justify-center align-center round" hover-class="hover"
+				<view class="send-btn-box" hover-class="hover"
 					@click="sendShortMsg" :class="canGetShortMsg?'send-btn-active':''">
-					<text class="text-white">获取短信验证码</text>
+					<text class="send-btn-text">获取短信验证码</text>
 				</view>
 
 				<!-- 其他登录方式 -->
-				<view class="w-630 flex flex-row align-center justify-between">
-					<text class="font-26 login-text" hover-class="hover" @click="toPwdLogin">密码登录</text>
-					<text class="font-26 login-text" hover-class="hover" @click="openLoginList">其他登录方式</text>
+				<view class="auth-box">
+					<text class="login-text" hover-class="hover" @click="toPwdLogin">密码登录</text>
+					<text class="login-text" hover-class="hover" @click="openLoginList">其他登录方式</text>
 				</view>
 			</view>
 		</view>
@@ -41,7 +42,7 @@
 	export default {
 		data() {
 			return {
-				isShow:false,
+				isShow:true,
 				link: [{
 					text: '用户协议',
 					to: '/baidu.com'
@@ -86,6 +87,44 @@
 </script>
 
 <style>
+	/* #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;
 	}
@@ -98,30 +137,64 @@
 
 	.phone-input-box {
 		height: 85rpx;
-		background-color: #f9f9f9;
+		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 {
 		border-left-width: 1px;
-		border-left-color: #d7d9d8;
+		border-left-color: #d7d9d8;
+		padding: 0 20rpx;
+		font-size: 30rpx;
 	}
 
 	.tip-text {
 		padding-top: 20rpx;
-		padding-bottom: 36rpx;
+		padding-bottom: 36rpx;
+		color: #8a8f8b;
+		font-size: 26rpx;
 	}
 
 	.send-btn-box {
 		height: 85rpx;
 		background-color: #d8d8da;
-		margin-bottom: 50rpx;
+		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;
+		color: #1c436e;
+		font-size: 26rpx;
 	}
 </style>
\ No newline at end of file
-- 
GitLab