From 74e5c9c3cfe2d9938a1f881276e769c3bba637a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=8E=AB=E5=94=90=E5=B0=BC?= <1431128779@qq.com>
Date: Wed, 26 Jun 2024 00:32:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=8B=E9=93=BE=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/v2/all.api.js                    |  6 +++++-
 pagesA/friend-links/friend-links.vue | 12 ++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/api/v2/all.api.js b/api/v2/all.api.js
index 1d14609..6a09325 100644
--- a/api/v2/all.api.js
+++ b/api/v2/all.api.js
@@ -143,7 +143,11 @@ export default {
 	 * 获取友链分组
 	 */
 	getFriendLinkGroupList: (params) => {
-		return HttpHandler.Get(`/apis/core.halo.run/v1alpha1/linkgroups`, params)
+		return HttpHandler.Get(`/apis/core.halo.run/v1alpha1/linkgroups`, params,{
+			custom: {
+				systemToken: HaloTokenConfig.systemToken
+			}
+		})
 	},
 
 	/**
diff --git a/pagesA/friend-links/friend-links.vue b/pagesA/friend-links/friend-links.vue
index 8378958..8e296cc 100644
--- a/pagesA/friend-links/friend-links.vue
+++ b/pagesA/friend-links/friend-links.vue
@@ -70,7 +70,7 @@
                            @click="toSubmitLinkPage"></tm-flotbutton>
             <!-- 详情弹窗 -->
             <tm-poup v-model="detail.show" :width="640" height="auto" position="center" :round="6">
-                <view class="poup pa-36">
+                <view class="poup pa-36" v-if="detail.data">
                     <view class="info flex">
                         <view class="poup-logo bg-gradient-amber-accent pa-4 shadow-24">
                             <image class="poup-logo_img" :src="$utils.checkImageUrl(detail.data.spec.logo)" mode="aspectFill"></image>
@@ -79,7 +79,7 @@
                             <view class="poup-name text-size-lg text-weight-b">{{ detail.data.spec.displayName }}</view>
                             <view class="poup-tag ml--10">
                                 <tm-tags color="bg-gradient-light-blue-lighten" size="n" model="fill">
-                                    {{ detail.data.spec.groupName  }}
+                                    {{ detail.data.spec.groupName }}
                                 </tm-tags>
                             </view>
                             <view class="poup-link text-size-m" @click="fnCopyLink(detail.data)">
@@ -115,8 +115,6 @@ import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
 import tmImages from '@/tm-vuetify/components/tm-images/tm-images.vue';
 import tmPoup from '@/tm-vuetify/components/tm-poup/tm-poup.vue';
 
-import {GetRandomNumberByRange} from '@/utils/random.js';
-
 export default {
     components: {
         tmSkeleton,
@@ -136,14 +134,13 @@ export default {
             },
             detail: {
                 show: false,
-                data: {}
+                data: null
             },
             hasNext: false,
             isLoadMore: false,
             loadMoreText: '',
             linkGroupList: [],
             dataList: [],
-            cacheDataList: [],
             colors: [
                 '#39B449',
                 '#E44C41',
@@ -176,7 +173,6 @@ export default {
         this.isLoadMore = false;
         this.queryParams.page = 1;
         this.dataList = []
-        this.cacheDataList = []
         this.fnGetData();
     },
     onReachBottom(e) {
@@ -222,7 +218,7 @@ export default {
                     console.log(res);
                     this.hasNext = res.hasNext;
                     const list = res.items.map(item => {
-                        item.spec.logo = this.$utils.checkAvatarUrl(item.spec.logo)
+                        item.spec.logo = this.$utils.checkAvatarUrl(item.spec?.logo)
                         item.spec.groupName = this.findLinkGroupDisplayNameByGroupMetadataName(item.spec?.groupName)
                         return item;
                     })