From 40c1d27f02dd872d5afd6f65672449043f1598ce Mon Sep 17 00:00:00 2001
From: ZF sun <34314687@qq.com>
Date: Wed, 7 Jan 2026 10:52:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=88=91=E7=9A=84=E5=85=B3=E6=B3=A8):=20?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=99=BB=E5=BD=95=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages_tool/member/collection.vue             | 17 ++++++++++++----
 pages_tool/member/public/css/collection.scss | 21 ++++++++++++++++++++
 pages_tool/member/public/js/collection.js    |  7 +++++--
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/pages_tool/member/collection.vue b/pages_tool/member/collection.vue
index 1a0a6cd..5ea24ae 100644
--- a/pages_tool/member/collection.vue
+++ b/pages_tool/member/collection.vue
@@ -1,7 +1,6 @@
 <template>
 	<view :style="themeColor">
-		<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8" @listenRefresh="listenRefresh"
-			v-if="storeToken">
+		<mescroll-uni ref="mescroll" @getData="getData" class="member-point" :size="8" @listenRefresh="listenRefresh">
 			<view class="goods_list" slot="list">
 				<block v-if="collectionList.length > 0">
 					<view class="goods_li margin-top" v-for="(item, index) in collectionList" :key="index"
@@ -30,7 +29,13 @@
 					</view>
 				</block>
 				<!-- 第一个列表为空时 -->
-				<ns-empty v-if="collectionList.length == 0 && isShowEmpty" text="暂无关注的商品" :isIndex="false"></ns-empty>
+				<view class="collection-empty">
+					<ns-empty v-if="collectionList.length == 0 && isShowEmpty" text="暂无关注的商品"
+						:isIndex="Boolean(storeToken)"></ns-empty>
+					<button type="primary" size="mini" class="button mini" v-if="!storeToken"
+						@click="toLogin">去登录</button>
+				</view>
+
 				<ns-goods-recommend ref="goodsRecommend"></ns-goods-recommend>
 			</view>
 		</mescroll-uni>
@@ -53,8 +58,12 @@ export default {
 			if (this.$refs.mescroll) this.$refs.mescroll.refresh();
 		} else {
 			this.$nextTick(() => {
-				this.$refs.login.open('/pages_tool/member/collection');
+				this.isShowEmpty = true;
+				this.$refs.loadingCover.hide();
 			});
+			// this.$nextTick(() => {
+			// 	if (this.$refs.login) this.$refs.login.open();
+			// });
 		}
 	},
 	watch: {
diff --git a/pages_tool/member/public/css/collection.scss b/pages_tool/member/public/css/collection.scss
index 55ba7be..7477d44 100644
--- a/pages_tool/member/public/css/collection.scss
+++ b/pages_tool/member/public/css/collection.scss
@@ -99,3 +99,24 @@
 	box-sizing: border-box;
 	margin-top: 50rpx;
 }
+
+.collection-empty {
+	text-align: center;
+	padding: 140rpx $padding 80rpx $padding;
+
+	image {
+		width: 380rpx;
+	}
+
+	button {
+		min-width: 300rpx;
+		margin-top: 100rpx;
+		height: 70rpx;
+		line-height: 70rpx !important;
+		font-size: $font-size-base;
+		border-radius: 50rpx;
+		&.visit-the {
+			font-weight: bold;
+		}
+	}
+}
diff --git a/pages_tool/member/public/js/collection.js b/pages_tool/member/public/js/collection.js
index 2a44011..5291204 100644
--- a/pages_tool/member/public/js/collection.js
+++ b/pages_tool/member/public/js/collection.js
@@ -25,7 +25,7 @@ export default {
 				},
 				async: false,
 			}).then((res) => {
-				let newArr = res.data.list;
+				let newArr = res.data?.list || [];
 				for (var i = 0; i < newArr.length; i++) {
 					newArr[i].composite_score = Math.floor((parseFloat(newArr[i].shop_desccredit) + parseFloat(newArr[i].shop_servicecredit) + parseFloat(newArr[i].shop_deliverycredit)) / 3).toFixed(1);
 				}
@@ -75,6 +75,9 @@ export default {
 		goodsImageError(index) {
 			this.collectionList[index].sku_image = this.$util.getDefaultImage().goods;
 			this.$forceUpdate();
-		}
+		},
+		toLogin() {
+			this.$refs.login.open();
+		},
 	}
 };