Merge branch 'dev_fix_sub' into user_action

peng

2025-09-16 577042a77ff72607e2cd5de3a06f33a1c9d3f703

 pages/commodity-square/commoditySquare.vue

@@ -51,10 +51,10 @@
                     <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 {