Merge branch 'v2' of ssh://47.96.225.205:29418/hmy_farmer-main into v2

陶杰

2024-09-11 6d54fb64df667c0c396fc7d74aeed9e096d95f95

 sub_pages/customer/trade/detail.vue

@@ -71,11 +71,27 @@
            <view class="m-r-15">剩余:{{ dto.stock || 0 }}</view>

            <view class=" ">{{ dto.unit || '-' }}</view>

         </view>

         <view class="flex m-t-12">

            <view class="price m-r-a">

               <span class="num">{{ dto.price || '-' }}</span>

               元/扎

            </view>

         <view class="flex m-t-12">
            <!-- #ifdef PUB_CUSTOMER_DEV -->
            <view>
               <view class="price m-r-a component-price-new">
                  <span class="tip">会员价</span><span class="num p">{{ dto.priceMember || dto.price || '-' }}</span>
                  元/扎
               </view>
               <view class="price m-r-a component-price-old">
                  <span class="num">{{ dto.price || '-' }}</span>
                  元/扎
               </view>
            </view>
            <!-- #endif -->
            <!-- #ifndef PUB_CUSTOMER_DEV -->
            <view class="price m-r-a">
               <span class="num">{{ dto.price || '-' }}</span>
               元/扎
            </view>
            <!-- #endif -->
				
				
            <view class="m-l-a m-r-15">

               <button open-type="contact" class="component-button-contact">

                  <image src="../../../static/common/icon-kf.png" class="icon-kf m-l-15 img100"></image>

@@ -103,7 +119,7 @@
      </view>

      <view class="info-detail" v-if="dto.params">

         <view class="title-before-blue" style="padding-top: 0rpx;padding-bottom: 0rpx;">详情</view>

         <view class="flex m-t-8" v-for="(param,index) of dto.params" :key="index">

         <view class="flex flex-wrap-normal m-t-8" v-for="(param,index) of dto.params" :key="index">

            <view class="label">{{ param.name}}：</view>

            <view class="value">{{ param.value || '-'}}</view>

         </view>