From f1a80f7c5e438d3710748279f1d139271534b450 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Fri, 9 Sep 2022 15:59:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E5=8F=8A?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/widgets/user-info/user-info.vue | 11 +++++++----
 app/src/pages/login/login.vue                  | 16 ++++++++++++++--
 app/src/pages/register/register.vue            | 18 ++++++++++++++++--
 .../vk-uview-ui/components/u-image/u-image.vue |  1 -
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/app/src/components/widgets/user-info/user-info.vue b/app/src/components/widgets/user-info/user-info.vue
index 40319566..c6c1e9c1 100644
--- a/app/src/components/widgets/user-info/user-info.vue
+++ b/app/src/components/widgets/user-info/user-info.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="user-info flex px-[50rpx] justify-between py-[50rpx]">
+    <view class="user-info flex px-[50rpx] justify-between py-[50rpx]">
         <navigator
             v-if="isLogin"
             class="flex items-center"
@@ -7,16 +7,19 @@
             url="/pages/user_data/user_data"
         >
             <u-avatar :src="user.avatar" :size="120"></u-avatar>
-            <div class="text-white text-3xl ml-[20rpx]">{{ user.nickname }}</div>
+            <view class="text-white ml-[20rpx]">
+                <view class="text-2xl">{{ user.nickname }}</view>
+                <view class="text-xs mt-[18rpx]">账号：{{ user.username }}</view>
+            </view>
         </navigator>
         <navigator v-else class="flex items-center" hover-class="none" url="/pages/login/login">
             <u-avatar src="/static/images/user/default_avatar.png" :size="120"></u-avatar>
-            <div class="text-white text-3xl ml-[20rpx]">未登录</div>
+            <view class="text-white text-3xl ml-[20rpx]">未登录</view>
         </navigator>
         <navigator v-if="isLogin" hover-class="none" url="/pages/user_set/user_set">
             <u-icon name="setting" color="#fff" :size="58"></u-icon>
         </navigator>
-    </div>
+    </view>
 </template>
 <script lang="ts" setup>
 const props = defineProps({
diff --git a/app/src/pages/login/login.vue b/app/src/pages/login/login.vue
index f4bda768..6244292d 100644
--- a/app/src/pages/login/login.vue
+++ b/app/src/pages/login/login.vue
@@ -81,8 +81,20 @@
                 <u-checkbox v-model="isCheckAgreement" shape="circle">
                     <view class="text-xs flex">
                         已阅读并同意
-                        <navigator class="text-primary" hover-class="none">《服务协议》</navigator>
-                        和<navigator class="text-primary" hover-class="none">
+                        <navigator
+                            @click.stop=""
+                            class="text-primary"
+                            hover-class="none"
+                            url="/pages/agreement/agreement?type=service"
+                        >
+                            《服务协议》
+                        </navigator>
+                        和<navigator
+                            @click.stop=""
+                            class="text-primary"
+                            hover-class="none"
+                            url="/pages/agreement/agreement?type=privacy"
+                        >
                             《隐私协议》
                         </navigator>
                     </view>
diff --git a/app/src/pages/register/register.vue b/app/src/pages/register/register.vue
index bad6ae47..659308d5 100644
--- a/app/src/pages/register/register.vue
+++ b/app/src/pages/register/register.vue
@@ -35,8 +35,22 @@
                 <u-checkbox v-model="isCheckAgreement" shape="circle">
                     <view class="text-xs flex">
                         已阅读并同意
-                        <navigator class="text-primary">《服务协议》</navigator>
-                        和<navigator class="text-primary">《隐私协议》</navigator>
+                        <navigator
+                            @click.stop=""
+                            class="text-primary"
+                            hover-class="none"
+                            url="/pages/agreement/agreement?type=service"
+                        >
+                            《服务协议》
+                        </navigator>
+                        和<navigator
+                            @click.stop=""
+                            class="text-primary"
+                            hover-class="none"
+                            url="/pages/agreement/agreement?type=privacy"
+                        >
+                            《隐私协议》
+                        </navigator>
                     </view>
                 </u-checkbox>
             </view>
diff --git a/app/src/uni_modules/vk-uview-ui/components/u-image/u-image.vue b/app/src/uni_modules/vk-uview-ui/components/u-image/u-image.vue
index f8f1c711..5410494e 100644
--- a/app/src/uni_modules/vk-uview-ui/components/u-image/u-image.vue
+++ b/app/src/uni_modules/vk-uview-ui/components/u-image/u-image.vue
@@ -243,7 +243,6 @@ export default {
 .u-image {
 	position: relative;
 	transition: opacity 0.5s ease-in-out;
-
 	&__image {
 		width: 100%;
 		height: 100%;