From 5dd54e5fae428e8ac9ed5cb47ae1ce7513fc05e4 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Fri, 21 Aug 2026 15:48:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/login.vue                |  3 ++-
 pages/user/user.vue                  | 16 +++++++++-------
 subpkg/pages/register/register.vue   |  2 +-
 subpkg/pages/user-info/user-info.vue | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/pages/login/login.vue b/pages/login/login.vue
index 862538c..f0983f4 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -102,7 +102,8 @@ export default {
           }
           if (realAvatar) {
             // console.log("永久头像URL：", realAvatar);
-            this.avatarUrl = config.baseUrl + '/api/fileRelevant/getImg?imgType=5&imgId=' + realAvatar
+            // this.avatarUrl = config.baseUrl + '/api/fileRelevant/getImg?imgType=5&imgId=' + realAvatar
+            this.avatarUrl = `${config.baseUrl}/files/${realAvatar}`;
           } else {
             uni.showToast({ title: '头像上传失败', icon: 'none' });
           }
diff --git a/pages/user/user.vue b/pages/user/user.vue
index 8271f23..177509d 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -111,13 +111,15 @@ export default {
 						};
 						
 						if (res.data.avatar) {
-							const imageUrl = config.baseUrl + '/api/fileRelevant/getImg?imgType=5&imgId=' + res.data.avatar;
-							try {
-								const base64 = await this.urlToBase64(imageUrl);
-								this.base64Img = base64;
-							} catch (err) {
-								console.error('[User] Failed to load avatar:', err);
-							}
+							// const imageUrl = config.baseUrl + '/api/fileRelevant/getImg?imgType=5&imgId=' + res.data.avatar;
+              const imageUrl = `${config.baseUrl}/files/${res.data.avatar}`;
+              this.base64Img = imageUrl
+							// try {
+							// 	const base64 = await this.urlToBase64(imageUrl);
+							// 	this.base64Img = base64;
+							// } catch (err) {
+							// 	console.error('[User] Failed to load avatar:', err);
+							// }
 						}
 
 						uni.setStorageSync(USER_KEY, this.userInfo);
diff --git a/subpkg/pages/register/register.vue b/subpkg/pages/register/register.vue
index ca4f40f..9b1e1f2 100644
--- a/subpkg/pages/register/register.vue
+++ b/subpkg/pages/register/register.vue
@@ -13,7 +13,7 @@
     <view class="online-card">
        <view class="online-item">
           <text>支付宝扫码进入借阅宝生活号</text>
-          <image src="/subpkg/static/register/1.jpg" mode="widthFix" />
+          <image src="/subpkg/static/register/1.jpg" mode="widthFix" :show-menu-by-longpress="true"></image>
        </view>
        <view class="online-item">
           <text>进入“服务”点击“图书馆”</text>
diff --git a/subpkg/pages/user-info/user-info.vue b/subpkg/pages/user-info/user-info.vue
index bb987c9..18385eb 100644
--- a/subpkg/pages/user-info/user-info.vue
+++ b/subpkg/pages/user-info/user-info.vue
@@ -58,8 +58,10 @@ export default {
       if (avatarId) {
         try {
           uni.showLoading({ title: '加载头像中...' });
-          const url = `${config.baseUrl}/api/fileRelevant/getImg?imgType=5&imgId=${avatarId}`;
-          this.avatarUrl = await this.urlToBase64(url);
+          // const url = `${config.baseUrl}/api/fileRelevant/getImg?imgType=5&imgId=${avatarId}`;
+          // this.avatarUrl = await this.urlToBase64(url);
+          const url = `${config.baseUrl}/files/${imgId}`;
+          this.avatarUrl = url
         } catch (err) {
           console.error('头像加载失败', err);
           this.avatarUrl = '';
@@ -80,7 +82,8 @@ export default {
         // 上传头像
         const uploadRes = await new Promise((resolve, reject) => {
           uni.uploadFile({
-            url: config.baseUrl + '/api/fileRelevant/uploadWxAvatarImg',
+            // url: config.baseUrl + '/api/fileRelevant/uploadWxAvatarImg',
+            url: config.baseUrl + '/api/fileRelevant/uploadHttpsImg',
             filePath: tempFilePath,
             name: 'file',
             success: resolve,
@@ -93,8 +96,10 @@ export default {
         this.imgId = imgId;
 
         // 转base64显示
-        const url = `${config.baseUrl}/api/fileRelevant/getImg?imgType=5&imgId=${imgId}`;
-        this.avatarUrl = await this.urlToBase64(url);
+        // const url = `${config.baseUrl}/api/fileRelevant/getImg?imgType=5&imgId=${imgId}`;
+        const url = `${config.baseUrl}/files/${imgId}`;
+        // this.avatarUrl = await this.urlToBase64(url);
+        this.avatarUrl = url
 
         uni.showToast({ title: '头像上传成功', icon: 'success' });
       } catch (err) {