From 4c8f214839337f512a1f4606b9bde9fae736f228 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Mon, 24 Aug 2026 11:24:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue                           | 23 +++++++++++--------
 .../pages/activity-detail/activity-detail.vue |  2 +-
 subpkg/pages/activity-list/activity-list.vue  |  2 +-
 .../pages/activity-record/activity-record.vue | 18 ++++++++++++---
 subpkg/pages/book-list/book-list.vue          | 13 +++++++----
 subpkg/pages/user-info/user-info.vue          |  7 +++---
 utils/config.js                               |  6 ++---
 7 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 5889454..c5d8e83 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -246,8 +246,9 @@ export default {
     async getScreenSetting() {
       const res = await FetchInitScreenSetting({ libcode: config.LIB_CODE });
 
-      if (res.data.wechar_qr_code && res.data.wechar_qr_code.context) {
-        const imageUrl = this.baseUrl + '/api/fileRelevant/getImg?imgType=1&imgId=' + res.data.wechar_qr_code.context;
+      if (res.data.wechat_qr_code && res.data.wechat_qr_code.context) {
+        // const imageUrl = this.baseUrl + '/api/fileRelevant/getImg?imgType=1&imgId=' + res.data.wechat_qr_code.context;
+        const imageUrl = this.baseUrl + '/files/' + res.data.wechat_qr_code.context;
         try {
           const base64 = await this.urlToBase64(imageUrl);
           this.wecharQRCode = base64;
@@ -367,15 +368,17 @@ export default {
         
         for (let i = 0; i < displayBooks.length; i++) {
           let item = displayBooks[i];
-          if (item.imgPath) {
-            const imageUrl = this.baseUrl + '/api/fileRelevant/getImg?imgType=2&imgId=' + item.imgPath;
+          if (item.imgVxPath) {
+            // const imageUrl = this.baseUrl + '/api/fileRelevant/getImg?imgType=2&imgId=' + item.imgPath;
+            const imageUrl = this.baseUrl + '/files/' + item.imgVxPath;
             console.log('imageUrl:', imageUrl);
-            try {
-              const base64 = await this.urlToBase64(imageUrl);
-              item.base64Cover = base64;
-            } catch (err) {
-              item.base64Cover = '';
-            }
+            item.base64Cover = imageUrl;
+            // try {
+            //   const base64 = await this.urlToBase64(imageUrl);
+            //   item.base64Cover = base64;
+            // } catch (err) {
+            //   item.base64Cover = '';
+            // }
           } else {
             item.base64Cover = '';
           }
diff --git a/subpkg/pages/activity-detail/activity-detail.vue b/subpkg/pages/activity-detail/activity-detail.vue
index 511d65c..2eda40e 100644
--- a/subpkg/pages/activity-detail/activity-detail.vue
+++ b/subpkg/pages/activity-detail/activity-detail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="activity-detail">
-		<image class="activity-img" :src="detail.coverImage" mode="aspectFill"></image>
+		<image class="activity-img" :src="detail.coverImage||detail.cover_image" mode="aspectFill"></image>
 		
 		<view class="activity-base">
 			<text class="title">{{ detail.title }}</text>
diff --git a/subpkg/pages/activity-list/activity-list.vue b/subpkg/pages/activity-list/activity-list.vue
index 48d8b99..ca658a2 100644
--- a/subpkg/pages/activity-list/activity-list.vue
+++ b/subpkg/pages/activity-list/activity-list.vue
@@ -140,7 +140,7 @@ export default {
           records.forEach(item => {
             if(item.coverImage){
               const imgId = encodeURIComponent(item.coverImage);
-              item.coverImage = `https://wechatapi.aiyxlib.com/files/${imgId}`;
+              item.coverImage = `${this.baseUrl}/files/${imgId}`;
             }else{
               item.coverImage = ''
             }
diff --git a/subpkg/pages/activity-record/activity-record.vue b/subpkg/pages/activity-record/activity-record.vue
index b46d223..f8a8d74 100644
--- a/subpkg/pages/activity-record/activity-record.vue
+++ b/subpkg/pages/activity-record/activity-record.vue
@@ -102,6 +102,7 @@ export default {
 			],
 			activeTab:0,
 			activityList: [],
+      baseUrl: config.baseUrl,
 			refreshing: false,
 			loading: false,
 			noMore: false,
@@ -201,9 +202,9 @@ export default {
         page: this.page,
         pageSize: this.pageSize
       }
-			if(currentTabItem.value !== null){
-				params.isCancel = currentTabItem.value
-			}
+      if(currentTabItem.value !== null){
+        params.isCancel = currentTabItem.value
+      }
 
       try {
         const res = await FetchMySignActivityInfo(params);
@@ -212,6 +213,16 @@ export default {
           const pageData = res.data;
           const list = pageData.content || [];
 
+          // ==========新增：统一处理图片地址，和第一个接口逻辑保持一致==========
+          list.forEach(item => {
+            if(item.cover_image){
+              const imgId = encodeURIComponent(item.cover_image);
+              item.cover_image = `${this.baseUrl}/files/${imgId}`;
+            }else{
+              item.cover_image = ''
+            }
+          })
+
           const currentPage = pageData.number ?? 0;
           const totalPage = pageData.totalPages ?? 0;
           this.noMore = currentPage >= totalPage - 1;
@@ -233,6 +244,7 @@ export default {
       }
     },
 
+
 		onRefresh() {
       if(this.loading) return
       this.getActivityList(true);
diff --git a/subpkg/pages/book-list/book-list.vue b/subpkg/pages/book-list/book-list.vue
index 005a0bd..7a410de 100644
--- a/subpkg/pages/book-list/book-list.vue
+++ b/subpkg/pages/book-list/book-list.vue
@@ -104,14 +104,17 @@ export default {
     async loadImagesOneByOne() {
       for (let i = 0; i < this.bookList.length; i++) {
         let item = this.bookList[i];
-        if (!item.imgPath) continue;
+        if (!item.imgVxPath) continue;
 
         // 加载当前这张
-        const url = this.baseUrl + '/api/fileRelevant/getImg?imgType=2&imgId=' + item.imgPath;
-        const base64 = await this.urlToBase64(url);
+        // const url = this.baseUrl + '/api/fileRelevant/getImg?imgType=2&imgId=' + item.imgPath;
+        // const base64 = await this.urlToBase64(url);
 
-        if (base64) {
-          item.base64Cover = base64;
+        const imageUrl = this.baseUrl + '/files/' + item.imgVxPath;
+        console.log('imageUrl:', imageUrl);
+
+        if (imageUrl) {
+          item.base64Cover = imageUrl;
           this.$set(this.bookList, i, item); // 强制更新视图
         }
       }
diff --git a/subpkg/pages/user-info/user-info.vue b/subpkg/pages/user-info/user-info.vue
index 18385eb..1353cf2 100644
--- a/subpkg/pages/user-info/user-info.vue
+++ b/subpkg/pages/user-info/user-info.vue
@@ -53,14 +53,15 @@ export default {
       const userInfo = uni.getStorageSync(USER_KEY) || {};
       this.nickname = userInfo.nickname || '';
       const avatarId = userInfo.avatarId || '';
-      this.imgId = avatarId;
-
+      console.log(userInfo)
       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}/files/${imgId}`;
+          console.log(avatarId)
+          const url = `${config.baseUrl}/files/${avatarId}`;
+          console.log(url)
           this.avatarUrl = url
         } catch (err) {
           console.error('头像加载失败', err);
diff --git a/utils/config.js b/utils/config.js
index c4c1f5a..5024ae3 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -1,9 +1,9 @@
 const config = {
   // 本地
-	baseUrl: 'http://192.168.99.63:14000',
+	// baseUrl: 'http://192.168.99.63:14000',
   // 线上
-	// baseUrl: 'https://wechatapi.aiyxlib.com',
-	LIB_CODE: '1201'
+	baseUrl: 'https://wechatapi.aiyxlib.com',
+	LIB_CODE: 'GD'
 };
 
 export default config;