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

陶杰

2024-09-23 b331ba531a81c3c60d26eba856b5b3905153aba8

 sub_pages/customer/trade/list.vue

@@ -72,7 +72,7 @@
            <view class="m-l-12 info-container flex1">
               <view @click.stop="toDetail(item)">
                  <view class="title">
                     {{item.name||'-'}}
                     <view style="max-width: 240rpx;">{{item.name||'-'}}</view>
                     
                     <view class="price component-price-new">
                        <span class="tip">会员价</span>￥<span class="p">{{item.priceMember||item.price}}</span>/扎