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

陶杰

2024-09-11 6fcfe40675f7eb14e820b9d7f13f73a87540999b

 sub_pages/customer/trade/trade.vue

@@ -1,12 +1,15 @@
<template>
   <view class="container-trade" :style="{'min-height':hidefooter?'':'calc(100vh - 20rpx)'}">
      <view class="search-container m-t-12 flex" v-if="!hidefooter">
         <view class="flex m-r-20">
         <!-- <view class="flex m-r-20">
            <view class="m-r-10" style="line-height: 80rpx;" @click="changeSearchType">
               {{type=='category'?'按分类':'按店铺'}}
            </view>
            <u-icon name="arrow-down"></u-icon>

         </view> -->
         <view class="flex m-r-20">
             <um-dropdown width="200rpx" style="line-height: 80rpx;" @change="fnChange" :defaultIndex="def" rangeKey="label" :optionList="typeList"></um-dropdown>
         </view>
         <view class="flex1 input">
            <u-input :placeholder="type==='category'?'请输入分类名称':'请输入店铺名称'" v-model="query.name" clearable
@@ -57,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>
@@ -126,7 +129,17 @@
            },
            currentCategory: {},
            type: 'category', //supplier

            def: 0,
            typeList:[
              {
                label: '按分类',
                value: 'category',
              },
              {
                label: '按店铺',
                value: 'supplier',
              },
            ],

         }
      },
@@ -192,6 +205,9 @@
         })
      },
      methods: {
         fnChange(e) {
            this.type = e.value
         },
         changeSearchType() {
            if (this.type == 'category') {
               this.type = 'supplier'
@@ -447,7 +463,7 @@

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