Merge remote-tracking branch 'origin/v2' into v2

陶杰

2024-09-11 e8d258576a34f35cfefbd6bfe07b7f22e72d87d4

 sub_pages/customer/trade/list.vue

@@ -74,19 +74,13 @@
                  <view class="title">

                     {{item.name||'-'}}

                     
                     <!-- #ifdef PUB_CUSTOMER_DEV -->
                     <view class="price component-price-new">
                        <span class="tip">会员价</span>￥<span class="p">{{item.priceMember||item.price}}</span>/扎
                        <view class="component-price-old">
                           ￥{{item.price}}/扎
                        </view>
                     </view>
                     <!-- #endif -->
                     <!-- #ifndef PUB_CUSTOMER_DEV -->
                     <view class="price">
                        ￥{{item.price||0}}元/扎
                     </view>
                     <!-- #endif -->

                     

                  </view>

                  <view class="tags" v-if="item.tags">