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

陶杰

2024-09-11 e8d258576a34f35cfefbd6bfe07b7f22e72d87d4

 sub_pages/customer/trade/trade.vue

@@ -1,15 +1,12 @@
<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

@@ -58,7 +55,6 @@
                     </view>

                     <view class="cateen_infos list">

                        <view class="title">{{item.name}}</view>
                        <!-- #ifdef PUB_CUSTOMER_DEV -->
                        
                        <view class="price">
                           <view>会员价</view>
@@ -66,10 +62,7 @@
                        </view>                        
                        <view class="price component-price-old">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
                        
                        <!-- #endif -->
                        <!-- #ifndef PUB_CUSTOMER_DEV -->
                        <view class="price">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
                        <!-- #endif -->


                        <view class="desc">在售 {{item.stock||'0'}} 扎</view>

                     </view>



@@ -133,17 +126,7 @@
            },

            currentCategory: {},

            type: 'category', //supplier

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




         }

      },

@@ -209,9 +192,6 @@
         })

      },

      methods: {

          fnChange(e) {

                     this.type = e.value

                  },

         changeSearchType() {

            if (this.type == 'category') {

               this.type = 'supplier'