From 4102167b2d3d22ebf4994a07a5b8421d8539345c 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 21:18:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../login-action-sheet/login-action-sheet.vue | 37 ++++++++++++++-----
 .../components/login-ikonw/login-ikonw.vue    | 19 +++++++---
 .../login-short-code/login-short-code.vue     | 21 ++++++++---
 3 files changed, 56 insertions(+), 21 deletions(-)

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 6e70bdc1..f7341973 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 3b8ab116..8b49816a 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>
@@ -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 c1e50d3a..052bd6c2 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>
-- 
GitLab