From 7921d22b7da80aa2633f5623083e2bc2c014146a Mon Sep 17 00:00:00 2001
From: zheng020 <zheng02007@163.com>
Date: Thu, 14 May 2026 21:59:19 +0800
Subject: [PATCH] =?UTF-8?q?style:=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=E5=92=8C=E8=97=8F=E5=93=81?=
 =?UTF-8?q?=E8=AF=A6=E7=BB=86=E9=A1=B5=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/pages/asset-detail/asset-detail.vue | 57 +++++++++++++++++---
 frontend/pages/profile/profile.vue           |  2 -
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/frontend/pages/asset-detail/asset-detail.vue b/frontend/pages/asset-detail/asset-detail.vue
index a251cb6..f51fc48 100644
--- a/frontend/pages/asset-detail/asset-detail.vue
+++ b/frontend/pages/asset-detail/asset-detail.vue
@@ -584,6 +584,23 @@ const hiddenBlockNumber = computed(() => {
 	return `${str.substring(0, 6)}******`;
 });
 
+// 隐藏交易哈希（保留前6位 + 6个*）
+const hiddenTxHash = computed(() => {
+	const hash = assetData.value.tx_hash;
+	if (!hash) return '******';
+	if (hash.length <= 6) return hash + '******';
+	return `${hash.substring(0, 6)}******`;
+});
+
+// 隐藏区块链编号（保留前6位 + 6个*）
+const hiddenBlockNumber = computed(() => {
+	const num = assetData.value.block_number;
+	if (!num) return '******';
+	const str = String(num);
+	if (str.length <= 6) return str + '******';
+	return `${str.substring(0, 6)}******`;
+});
+
 // 复制完整哈希
 const copyHash = () => {
 	const hash = assetData.value.tx_hash;
@@ -627,7 +644,6 @@ const loadData = async () => {
 			isLiked.value = res.data.asset.is_liked || res.data.is_liked || false;
 			likeCount.value = asset.like_count || 0;
 
-<<<<<<< HEAD
 			// 加载贴纸素材
 			if (asset.material_relations || asset.materials) {
 				loadStickersForAsset(asset.material_relations || asset.materials)
@@ -635,9 +651,6 @@ const loadData = async () => {
 
 			if (asset.remain_time > 0) {
 				remainSeconds.value = asset.remain_time;
-=======
-			if (asset.exhibition_expire_at) {
->>>>>>> ebe57bc078a35ed4c13ccf966c8f7b5af6327c61
 				startCountdown();
 			}
 			console.log(res.data)
@@ -784,15 +797,11 @@ onLoad((options) => {
 	assetIdParam.value = options?.asset_id || '';
 	orderIdParam.value = options?.order_id || '';
 	fromParam.value = options?.from || '';
-<<<<<<< HEAD
 	studioKindParam.value = options?.studio_kind || '';
 	craftConfirmMode.value = fromParam.value === 'craft_confirm';
 	if (craftConfirmMode.value) {
 		loadCraftConfirm();
 	}
-=======
-	loadCurrentUser();
->>>>>>> ebe57bc078a35ed4c13ccf966c8f7b5af6327c61
 });
 
 onShow(() => {
@@ -1172,6 +1181,30 @@ onUnmounted(() => {
 	text-shadow: 0 2px 8px rgba(0, 0, 0, 0.7);
 }
 
+/* 收益 */
+.earnings-area {
+	display: flex;
+	align-items: center;
+	gap: 10rpx;
+	background: linear-gradient(to bottom right,
+			#F0E4B1 0%,
+			#F08399 50%,
+			#B94E73 100%);
+	border-radius: 999rpx;
+	box-shadow:
+		0 4rpx 12rpx rgba(255, 143, 158, 0.2),
+		inset 0 2rpx 4rpx rgba(255, 255, 255, 0.4);
+	padding: 10rpx 28rpx;
+}
+
+.earnings-text {
+	font-size: 32rpx;
+	font-weight: bold;
+	color: #e6e6e6;
+	font-family: 'yt', sans-serif;
+	font-variant-numeric: tabular-nums;
+}
+
 /* 倒计时 */
 .countdown-area {
 	display: flex;
@@ -1522,6 +1555,7 @@ onUnmounted(() => {
 	margin-bottom: 8rpx;
 	/* transform: scale(1.2); */
 }
+<<<<<<< HEAD
 
 <<<<<<< HEAD
 .craft-confirm-scroll {
@@ -1597,4 +1631,11 @@ onUnmounted(() => {
 	font-size: 16rpx;
 }
 >>>>>>> ebe57bc078a35ed4c13ccf966c8f7b5af6327c61
+=======
+.visit-text{
+	color: #FFFFFF;
+	font-size:16rpx;
+}
+
+>>>>>>> af74dd5 (style:修改个人设置页面和藏品详细页的样式)
 </style>
diff --git a/frontend/pages/profile/profile.vue b/frontend/pages/profile/profile.vue
index e4cd31d..ab16228 100644
--- a/frontend/pages/profile/profile.vue
+++ b/frontend/pages/profile/profile.vue
@@ -2,7 +2,6 @@
 	<view class="profile-container">
 		<!-- 背景图片 - 固定在容器上 -->
 		<image class="background-image" src="/static/square/squearbj.png" mode="aspectFill"></image>
-
 		<scroll-view class="profile-scroll" scroll-y :show-scrollbar="false" :enable-back-to-top="true">
 			<!-- 上半部分：用户信息卡片 -->
 			<view class="top-section">
@@ -1322,7 +1321,6 @@ onShow(() => {
 	align-items: flex-start;
 	/* gap: 30rpx; */
 	margin-bottom: 0;
-
 }
 
 .avatar-container {