From 577042a77ff72607e2cd5de3a06f33a1c9d3f703 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期二, 16 九月 2025 10:54:17 +0800
Subject: [PATCH] Merge branch 'dev_fix_sub' into user_action
---
pages/commodity-square/commoditySquare.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pages/commodity-square/commoditySquare.vue b/pages/commodity-square/commoditySquare.vue
index f9c47a2..3d23697 100644
--- a/pages/commodity-square/commoditySquare.vue
+++ b/pages/commodity-square/commoditySquare.vue
@@ -48,13 +48,13 @@
<view class="goodsName">
<text>{{item.goodsName}}</text>
</view>
- <view class="goodsContent">
+ <view class="goodsContent" style="font-size: 24rpx;">
{{item.sellingPoint}}
</view>
- <view
- 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;">
+ <view
+ style="display: flex; justify-content: space-between;align-items:center;height: 100%;width: 100%;">
+ <view class="goodsPrice" style="padding: 20rpx 0;">锟{item.price}}</view>
+ <view class="addCard" style="display: flex; align-items: center;" v-if="item.goodsType !=='VIRTUAL_GOODS'">
<view style="padding: 20rpx 0 20rpx 20rpx;" v-show="item.cardNum && item.cardNum>0"
@click.stop="miousCardNum($event,item.id)">
<uni-icons type="minus" size="30" color="#96a6bc"></uni-icons>
@@ -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