From 2eb21bfe2f40630a46e675211f23b5f240e395a4 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 12 九月 2025 15:01:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into send_coupon

---
 pages/commodity-square/commoditySquare.vue |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pages/commodity-square/commoditySquare.vue b/pages/commodity-square/commoditySquare.vue
index 78e087b..ec242c5 100644
--- a/pages/commodity-square/commoditySquare.vue
+++ b/pages/commodity-square/commoditySquare.vue
@@ -51,7 +51,7 @@
 							<view class="goodsContent" style="font-size: 24rpx;">
 								{{item.sellingPoint}}
 							</view>
-							<view
+							<view v-if="item.goodsType !=='VIRTUAL_GOODS'"
 								style="display: flex; justify-content: space-between;align-items:center; 100%;width: 100%;">
 								<view class="goodsPrice">锟{item.price}}</view>
 								<view class="addCard" style="display: flex; align-items: center;">
@@ -77,7 +77,7 @@
 				<view class="settlement">鍘昏喘鐗╄溅缁撶畻</view>
 			</view> -->
 		</view>
-		<view class="squareFotter" style="width: 750rpx; display: flex;align-items: center; 
+		<view  @click="gotoCardList()" class="squareFotter" style="width: 750rpx; display: flex;align-items: center; 
 			justify-content: space-between;padding: 0 32rpx;box-sizing: border-box;">
 			<view style="display: flex;align-items: center;justify-content: center;">
 				<view class="icon" style="position: relative;">
@@ -93,7 +93,7 @@
 				<view style="margin-left: 10rpx;color: #e06c75;font-size: 48rpx;font-weight: bold;">
 					锟{priceInfo.price}}</view>
 			</view>
-			<view class="settlement" @click="gotoCardList()">鍘荤粨绠�</view>
+			<view class="settlement">鍘荤粨绠�</view>
 		</view>
 	</view>
 </template>
@@ -518,6 +518,7 @@
 		overflow: hidden;
 		text-overflow: ellipsis;
 		vertical-align: middle;
+		color: #e7c463;
 	}
 
 	.goodsPrice {

--
Gitblit v1.8.0