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

陶杰

2024-09-11 e8d258576a34f35cfefbd6bfe07b7f22e72d87d4

 sub_pages/customer/self/collect.vue

@@ -246,19 +246,12 @@
                     {{ dto.name || '-' }}
                  </view>
                  
                  <!-- #ifdef PUB_CUSTOMER_DEV -->
                  <view class="price m-l-a m-r-0 component-price-new">
                     <span class="tip">会员价</span>￥<span class="p">{{ dto.priceMember || dto.price || '-' }}</span>/扎
                     <view class="component-price-old">
                        ￥{{dto.price}}/扎
                     </view>
                  </view>
                  <!-- #endif -->
                  <!-- #ifndef PUB_CUSTOMER_DEV -->
                  <view class="price m-l-a m-r-0">
                     ￥{{ dto.price || '-' }}/扎
                  </view>
                  <!-- #endif -->
               </view>
               <view class="flex">
                  <view class="desc p-t-12 flex" @click.stop="toDetail(dto)">