Merge branch 'dev_fix_sub' into user_action

peng

2025-09-16 577042a77ff72607e2cd5de3a06f33a1c9d3f703

 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>
@@ -518,6 +518,7 @@
      overflow: hidden;
      text-overflow: ellipsis;
      vertical-align: middle;
      color: #e7c463;
   }

   .goodsPrice {