From b12bb0a53a96d6c9e0ef9d9727668aac234f697a Mon Sep 17 00:00:00 2001
From: wangyaqi <wangyaqi988@163.com>
Date: Wed, 15 Jul 2020 11:54:36 +0800
Subject: [PATCH] chore: upx --> rpx

---
 template/default-ts/pages/index/index.vue | 29 ++++++++++++-------
 template/default-ts/uni.scss              | 34 +++++++++++------------
 template/default/pages/index/index.vue    | 21 +++++++++-----
 template/default/uni.scss                 | 34 +++++++++++------------
 4 files changed, 67 insertions(+), 51 deletions(-)

diff --git a/template/default-ts/pages/index/index.vue b/template/default-ts/pages/index/index.vue
index 4382098..f20fe5b 100644
--- a/template/default-ts/pages/index/index.vue
+++ b/template/default-ts/pages/index/index.vue
@@ -7,7 +7,7 @@
 	</view>
 </template>
 
-<script lang="ts">
+<script lang="ts">
     import Vue from 'vue';
 	export default Vue.extend({
 		data() {
@@ -26,16 +26,25 @@
 
 <style>
 	.content {
-		text-align: center;
-		height: 400upx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
 	}
-    .logo{
-        height: 200upx;
-        width: 200upx;
-        margin-top: 200upx;
-    }
+
+	.logo {
+		height: 200rpx;
+		width: 200rpx;
+		margin: 200rpx auto 50rpx auto;
+	}
+
+	.text-area {
+		display: flex;
+		justify-content: center;
+	}
+
 	.title {
-		font-size: 36upx;
+		font-size: 36rpx;
 		color: #8f8f94;
 	}
-</style>
+</style>
diff --git a/template/default-ts/uni.scss b/template/default-ts/uni.scss
index f0f426c..845142d 100644
--- a/template/default-ts/uni.scss
+++ b/template/default-ts/uni.scss
@@ -39,38 +39,38 @@ $uni-border-color:#c8c7cc;
 /* 尺寸变量 */
 
 /* 文字尺寸 */
-$uni-font-size-sm:24upx;
-$uni-font-size-base:28upx;
-$uni-font-size-lg:32upx;
+$uni-font-size-sm:24rpx;
+$uni-font-size-base:28rpx;
+$uni-font-size-lg:32rpx;
 
 /* 图片尺寸 */
-$uni-img-size-sm:40upx;
-$uni-img-size-base:52upx;
-$uni-img-size-lg:80upx;
+$uni-img-size-sm:40rpx;
+$uni-img-size-base:52rpx;
+$uni-img-size-lg:80rpx;
 
 /* Border Radius */
-$uni-border-radius-sm: 4upx;
-$uni-border-radius-base: 6upx;
-$uni-border-radius-lg: 12upx;
+$uni-border-radius-sm: 4rpx;
+$uni-border-radius-base: 6rpx;
+$uni-border-radius-lg: 12rpx;
 $uni-border-radius-circle: 50%;
 
 /* 水平间距 */
 $uni-spacing-row-sm: 10px;
-$uni-spacing-row-base: 20upx;
-$uni-spacing-row-lg: 30upx;
+$uni-spacing-row-base: 20rpx;
+$uni-spacing-row-lg: 30rpx;
 
 /* 垂直间距 */
-$uni-spacing-col-sm: 8upx;
-$uni-spacing-col-base: 16upx;
-$uni-spacing-col-lg: 24upx;
+$uni-spacing-col-sm: 8rpx;
+$uni-spacing-col-base: 16rpx;
+$uni-spacing-col-lg: 24rpx;
 
 /* 透明度 */
 $uni-opacity-disabled: 0.3; // 组件禁用态的透明度
 
 /* 文章场景相关 */
 $uni-color-title: #2C405A; // 文章标题颜色
-$uni-font-size-title:40upx;
+$uni-font-size-title:40rpx;
 $uni-color-subtitle: #555555; // 二级标题颜色
-$uni-font-size-subtitle:36upx;
+$uni-font-size-subtitle:36rpx;
 $uni-color-paragraph: #3F536E; // 文章段落颜色
-$uni-font-size-paragraph:30upx;
\ No newline at end of file
+$uni-font-size-paragraph:30rpx;
\ No newline at end of file
diff --git a/template/default/pages/index/index.vue b/template/default/pages/index/index.vue
index 074985f..dccf157 100755
--- a/template/default/pages/index/index.vue
+++ b/template/default/pages/index/index.vue
@@ -25,18 +25,25 @@
 
 <style>
 	.content {
-		text-align: center;
-		height: 400upx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
 	}
 
 	.logo {
-		height: 200upx;
-		width: 200upx;
-		margin-top: 200upx;
+		height: 200rpx;
+		width: 200rpx;
+		margin: 200rpx auto 50rpx auto;
+	}
+
+	.text-area {
+		display: flex;
+		justify-content: center;
 	}
 
 	.title {
-		font-size: 36upx;
+		font-size: 36rpx;
 		color: #8f8f94;
 	}
-</style>
+</style>
diff --git a/template/default/uni.scss b/template/default/uni.scss
index f0f426c..845142d 100644
--- a/template/default/uni.scss
+++ b/template/default/uni.scss
@@ -39,38 +39,38 @@ $uni-border-color:#c8c7cc;
 /* 尺寸变量 */
 
 /* 文字尺寸 */
-$uni-font-size-sm:24upx;
-$uni-font-size-base:28upx;
-$uni-font-size-lg:32upx;
+$uni-font-size-sm:24rpx;
+$uni-font-size-base:28rpx;
+$uni-font-size-lg:32rpx;
 
 /* 图片尺寸 */
-$uni-img-size-sm:40upx;
-$uni-img-size-base:52upx;
-$uni-img-size-lg:80upx;
+$uni-img-size-sm:40rpx;
+$uni-img-size-base:52rpx;
+$uni-img-size-lg:80rpx;
 
 /* Border Radius */
-$uni-border-radius-sm: 4upx;
-$uni-border-radius-base: 6upx;
-$uni-border-radius-lg: 12upx;
+$uni-border-radius-sm: 4rpx;
+$uni-border-radius-base: 6rpx;
+$uni-border-radius-lg: 12rpx;
 $uni-border-radius-circle: 50%;
 
 /* 水平间距 */
 $uni-spacing-row-sm: 10px;
-$uni-spacing-row-base: 20upx;
-$uni-spacing-row-lg: 30upx;
+$uni-spacing-row-base: 20rpx;
+$uni-spacing-row-lg: 30rpx;
 
 /* 垂直间距 */
-$uni-spacing-col-sm: 8upx;
-$uni-spacing-col-base: 16upx;
-$uni-spacing-col-lg: 24upx;
+$uni-spacing-col-sm: 8rpx;
+$uni-spacing-col-base: 16rpx;
+$uni-spacing-col-lg: 24rpx;
 
 /* 透明度 */
 $uni-opacity-disabled: 0.3; // 组件禁用态的透明度
 
 /* 文章场景相关 */
 $uni-color-title: #2C405A; // 文章标题颜色
-$uni-font-size-title:40upx;
+$uni-font-size-title:40rpx;
 $uni-color-subtitle: #555555; // 二级标题颜色
-$uni-font-size-subtitle:36upx;
+$uni-font-size-subtitle:36rpx;
 $uni-color-paragraph: #3F536E; // 文章段落颜色
-$uni-font-size-paragraph:30upx;
\ No newline at end of file
+$uni-font-size-paragraph:30rpx;
\ No newline at end of file