Merge remote-tracking branch 'origin/master-2.0' into master-2.0

陶杰

2024-09-11 6fcfe40675f7eb14e820b9d7f13f73a87540999b

 sub_pages/customer/trade/trade.vue

@@ -60,10 +60,10 @@
                        <view class="title">{{item.name}}</view>

                        <view class="price">
                           <view>会员价</view>
                           <!-- <view>会员价</view> -->
                           <view>￥{{item.priceLowMember || 0}}-{{item.priceHighMember||0}}</view>
                        </view>                        
                        <view class="price component-price-old">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
                        <!-- <view class="price component-price-old">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view> -->
                        

                        <view class="desc">在售 {{item.stock||'0'}} 扎</view>
@@ -463,7 +463,7 @@

            .price {
               font-weight: 400;
               font-size: 24rpx;
               font-size: 28rpx;
               color: #CF0000;
               line-height: 34rpx;
               text-align: center;