From 56d7ebbc6297c306ec7197f29737a59703ca4bda Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 04 三月 2026 10:38:19 +0800
Subject: [PATCH] 合并

---
 mini-program/pages/my-collection/my-collection.vue |  104 +++++++++++++++++++++++++++++++++++----------------
 1 files changed, 71 insertions(+), 33 deletions(-)

diff --git a/mini-program/pages/my-collection/my-collection.vue b/mini-program/pages/my-collection/my-collection.vue
index 97cb341..2f130c6 100644
--- a/mini-program/pages/my-collection/my-collection.vue
+++ b/mini-program/pages/my-collection/my-collection.vue
@@ -12,45 +12,59 @@
 			</view>
 		</view>
 		<view class="list1" v-if="type === '1'">
-			<view class="list-item" v-for="(item, index) in list" :key="index">
-				<view class="left" v-if="edit" @click="select(index)">
-					<image src="/static/icon/ic_agree@2x.png" mode="widthFix" v-if="!item.active"></image>
-					<image src="/static/icon/cart_ic_sel@2x.png" mode="widthFix" v-else></image>
-				</view>
-				<view class="right">
-					<view class="list-item-image">
-						<image :src="item.imgurl" mode="widthFix"></image>
-					</view>
-					<view class="list-item-info">
-						<view class="list-item-info-top">{{item.name}}</view>
-						<view class="list-item-info-bottom">
-							<text>楼{{item.price}}</text>
-							<text>楼{{item.linePrice}}</text>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="list" v-else>
-			<view class="list-item" v-for="(item, index) in list" :key="index">
-				<view class="info">
-					<view class="check" v-if="edit" @click="select(index)">
+			<template v-if="list.length > 0">
+				<view class="list-item" v-for="(item, index) in list" :key="index" @click="jumpDetails(item)">
+					<view class="left" v-if="edit" @click.stop="select(index)">
 						<image src="/static/icon/ic_agree@2x.png" mode="widthFix" v-if="!item.active"></image>
 						<image src="/static/icon/cart_ic_sel@2x.png" mode="widthFix" v-else></image>
 					</view>
-					<view class="info-right">
-						<view class="info-title">{{item.name}}</view>
-						<view class="info-desc">{{item.content}}</view>
-						<view class="info-data">
-							<view class="tips">{{item.labelName}}</view>
-							<text>{{item.readNum}} 闃呰锝渰{item.createDate}}</text>
+					<view class="right">
+						<view class="list-item-image">
+							<image :src="item.imgurl" mode="widthFix"></image>
+						</view>
+						<view class="list-item-info">
+							<view class="list-item-info-top">{{item.name}}</view>
+							<view class="list-item-info-bottom">
+								<text>楼{{item.price}}</text>
+								<text>楼{{item.linePrice}}</text>
+							</view>
 						</view>
 					</view>
 				</view>
-				<view class="image">
-					<image :src="item.imgurl" mode="widthFix"></image>
+			</template>
+			<template v-else>
+				<view class="wushuju">
+					<image src="/static/images/default_nodata_white.png" mode="widthFix"></image>
 				</view>
-			</view>
+			</template>
+		</view>
+		<view class="list" v-else>
+			<template v-if="list.length > 0">
+				<view class="list-item" v-for="(item, index) in list" :key="index">
+					<view class="info">
+						<view class="check" v-if="edit" @click="select(index)">
+							<image src="/static/icon/ic_agree@2x.png" mode="widthFix" v-if="!item.active"></image>
+							<image src="/static/icon/cart_ic_sel@2x.png" mode="widthFix" v-else></image>
+						</view>
+						<view class="info-right">
+							<view class="info-title">{{item.name}}</view>
+							<view class="info-desc">{{item.content}}</view>
+							<view class="info-data">
+								<view class="tips">{{item.labelName}}</view>
+								<text>{{item.readNum}} 闃呰锝渰{item.createDate}}</text>
+							</view>
+						</view>
+					</view>
+					<view class="image">
+						<image :src="item.imgurl" mode="widthFix"></image>
+					</view>
+				</view>
+			</template>
+			<template v-else>
+				<view class="wushuju">
+					<image src="/static/images/default_nodata_white.png" mode="widthFix"></image>
+				</view>
+			</template>
 		</view>
 		<template v-if="edit">
 			<view style="width: 100%; height: calc(100rpx + env(safe-area-inset-bottom));"></view>
@@ -116,6 +130,9 @@
 			this.getList()
 		},
 		methods: {
+			jumpDetails(item) {
+				
+			},
 			shanchu() {
 				if (this.totalNum > 0) {
 					this.show = true
@@ -306,7 +323,17 @@
 			box-sizing: border-box;
 			display: flex;
 			flex-direction: column;
-			background-color: #ffffff;
+			.wushuju {
+				width: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-top: 80rpx;
+				image {
+					width: 320rpx;
+					height: 320rpx;
+				}
+			}
 			.list-item {
 				width: 100%;
 				padding: 30rpx 0;
@@ -385,6 +412,17 @@
 			width: 100%;
 			padding: 30rpx;
 			box-sizing: border-box;
+			.wushuju {
+				width: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-top: 50rpx;
+				image {
+					width: 320rpx;
+					height: 320rpx;
+				}
+			}
 			.list-item {
 				width: 100%;
 				display: flex;

--
Gitblit v1.9.3