From b8195f391072a86a441ea21eb4e4ffe707868635 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Fri, 28 Jun 2024 09:40:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue  | 12 ++++++------
 pages/public/login.vue |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8d5afaa..a89cca4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,7 +3,7 @@
 		<view class="jishi-index">
 			<view class=" u-flex padding-lr" style="padding: 30px 30rpx 120px;align-items: center;">
 				<view class="u-m-r-10">
-					<image :src="avatar" style="width: 70px;height: 70px;border-radius: 100rpx;"
+					<image :src="avatar" style="width: 70px;height: 70px;border-radius: 100rpx; border: 2px solid #fffff;"
 						@click="goNav('/pages/my/userinfo')"></image>
 				</view>
 				<view class="u-flex-1 u-m-l-10 text-white" v-if="isLogin && userName">
@@ -85,7 +85,7 @@
 				</view>
 				
 				<view class="" style="margin-top: 20px;">
-					<text style="font-size: 30px;font-weight: bold;">当前业绩：{{ currentWholeIncome ? currentWholeIncome : 0 }}</text>
+					<text style="font-size: 24px;">当前业绩：{{ currentWholeIncome ? currentWholeIncome : 0 }}</text>
 					<!-- <text style="font-size: 16px;">/{{ totalIncomeRange ? totalIncomeRange : 4000 }}</text> -->
 				</view>
 				<!-- <u-line-progress active-color="#46a396" :show-percent="false" :height="38" inactive-color="#098f7a"
@@ -122,16 +122,16 @@
 				<view class="flex align-center"
 					style="justify-content: space-evenly;text-align: center;">
 					<view class="" @click="dangqian">
-						<view class="" style="font-size: 22px;font-weight: bold;">
+						<view class="" style="font-size: 24px;font-weight: bold;">
 							{{ currentRealIncome ? currentRealIncome : 0 }}
 						</view>
-						<view class="" style="font-size: 12px;">当期收益(元)</view>
+						<view class="" style="font-size: 14px; margin-top: 5px;">当期收益(元)</view>
 					</view>
 					<view class="shuxian"></view>
 					<view class="" @tap="goNav('/pages/index/currentPoints')">
-						<view class="" style="font-size: 22px;font-weight: bold;">{{ currentIntegral ? currentIntegral : 0 }}
+						<view class="" style="font-size: 24px;font-weight: bold;">{{ currentIntegral ? currentIntegral : 0 }}
 						</view>
-						<view class="" style="font-size: 12px;" >当期积分</view>
+						<view class="" style="font-size: 14px; margin-top: 5px;" >当期积分</view>
 					</view>
 				</view>
 			</view>
diff --git a/pages/public/login.vue b/pages/public/login.vue
index bbfeecc..ee8921b 100644
--- a/pages/public/login.vue
+++ b/pages/public/login.vue
@@ -40,7 +40,7 @@
 		<!-- #endif -->
 		<!-- #ifndef MP-WEIXIN -->
 		<view style="text-align: center;">
-			<view style="font-size: 48upx;margin-top: 32upx;color: #333333;margin-top: 100rpx;">欢迎登录盛安到家</view>
+			<view style="font-size: 40upx;margin-top: 32upx;color: #333333;margin-top: 100rpx;">欢迎登录盛安到家</view>
 			<image style="width: 300upx;height: 300upx;margin-top: 200upx;margin-bottom:100rpx;border-radius:20upx"
 				src="../../static/logo.png"></image>
 			<button v-if="weixinLogin" class="confirm-btn" @click="weixinLo">微信登录</button>