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 1/3] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=8F=8A=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%;

From caea6872a6bfdd0af62ce73c3a1b10b980f935bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B4=AA=E6=A0=91=E6=B3=BD?= <2393354236@qq.com>
Date: Fri, 9 Sep 2022 16:06:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E5=A4=B4=E5=83=8F=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/pages/user_data/user_data.vue | 15 +++++++--------
 app/src/utils/util.ts                 |  5 +++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/pages/user_data/user_data.vue b/app/src/pages/user_data/user_data.vue
index 0273b602..47a5eb39 100644
--- a/app/src/pages/user_data/user_data.vue
+++ b/app/src/pages/user_data/user_data.vue
@@ -3,8 +3,7 @@
 	<!-- 头部修改头像 -->
 	<view class="header bg-white pt-[30rpx]">
 		<view class="flex justify-center">
-			<image @click="uploaderAvatar"
-				:src="userInfo?.avatar ? userInfo?.avatar : '/static/images/icon_default_user.png'"></image>
+			<image @click="uploaderAvatar" :src="userInfo?.avatar"></image>
 		</view>
 		<view class="mt-[20rpx] text-center text-muted text-xs" @click="uploaderAvatar">点击修改头像</view>
 	</view>
@@ -242,8 +241,8 @@
 	
 	// 修改用户账号
 	const changeUserNameConfirm = () => {
-		if (newUsername.value == '') return toast('账号不能为空')
-		if (newUsername.value.length > 10) return toast('账号长度不得超过十位数')
+		if (newUsername.value == '') return uni.$u.toast('账号不能为空')
+		if (newUsername.value.length > 10) return uni.$u.toast('账号长度不得超过十位数')
 		
 		fieldType.value = FieldType.USERNAME
 		setUserInfoFun(newUsername.value)
@@ -252,8 +251,8 @@
 	
 	// 修改用户昵称
 	const changeNameConfirm = () => {
-		if (newNickname.value == '') return toast('昵称不能为空')
-		if (newNickname.value.length > 10) return toast('昵称长度不得超过十位数')
+		if (newNickname.value == '') return uni.$u.toast('昵称不能为空')
+		if (newNickname.value.length > 10) return uni.$u.toast('昵称长度不得超过十位数')
 		showNickName.value = false
 		fieldType.value = FieldType.NICKNAME
 		setUserInfoFun(newNickname.value)
@@ -295,11 +294,11 @@
 		uploadFile(path)
 			.then((res) => {
 				uni.hideLoading()
-				setUserInfoFun(res.uri)
+				setUserInfoFun(res.url)
 			})
 			.catch(() => {
 				uni.hideLoading()
-				toast('上传失败')
+				uni.$u.toast('上传失败')
 			})
 	})
 
diff --git a/app/src/utils/util.ts b/app/src/utils/util.ts
index 55d92038..155b8f60 100644
--- a/app/src/utils/util.ts
+++ b/app/src/utils/util.ts
@@ -113,7 +113,7 @@ export function uploadFile(path: any) {
     return new Promise((resolve, reject) => {
         const token = getToken()
         uni.uploadFile({
-            url: `${import.meta.env.VITE_APP_BASE_URL}/api/Upload/image`,
+            url: `${import.meta.env.VITE_APP_BASE_URL}/api/upload/image`,
             filePath: path,
             name: 'file',
             header: {
@@ -123,7 +123,8 @@ export function uploadFile(path: any) {
             success: (res) => {
                 console.log('uploadFile res ==> ', res)
                 const data = JSON.parse(res.data)
-                if (data.code == 1) {
+				console.log('data.code', data.code)
+                if (data.code == 200) {
                     resolve(data.data)
                 } else {
                     reject()

From a4ed4f187d8d9defa800882ec8db2ff4b49c66a2 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Fri, 9 Sep 2022 16:22:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9pages.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/pages.json            | 9 ++++++---
 app/src/pages/index/index.vue | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/pages.json b/app/src/pages.json
index 79f04345..8348b631 100644
--- a/app/src/pages.json
+++ b/app/src/pages.json
@@ -52,7 +52,8 @@
             "path": "pages/user_set/user_set",
             "style": {
                 "navigationBarTitleText": "个人设置"
-            }
+            },
+            "auth": true
         },
         {
             "path": "pages/collection/collection",
@@ -77,13 +78,15 @@
             "path": "pages/change_password/change_password",
             "style": {
                 "navigationBarTitleText": "修改密码"
-            }
+            },
+            "auth": true
         },
         {
             "path": "pages/user_data/user_data",
             "style": {
                 "navigationBarTitleText": "个人资料"
-            }
+            },
+            "auth": true
         },
         {
             "path": "pages/search/search",
diff --git a/app/src/pages/index/index.vue b/app/src/pages/index/index.vue
index 4be7a310..cadfc694 100644
--- a/app/src/pages/index/index.vue
+++ b/app/src/pages/index/index.vue
@@ -48,9 +48,11 @@ getData()
 <style lang="scss">
 .article-title {
     &::before {
+        content: '';
         width: 8rpx;
         height: 34rpx;
         display: block;
+        margin-right: 10rpx;
         background: $u-type-primary;
     }
 }