From 3d90d9a71858bea619944ce081632581f0f93644 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 九月 2024 18:04:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-2.0' into master-2.0

---
 sub_pages/customer/trade/trade.vue |   20 ++------------------
 1 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/sub_pages/customer/trade/trade.vue b/sub_pages/customer/trade/trade.vue
index 32be55a..2617e1b 100644
--- a/sub_pages/customer/trade/trade.vue
+++ b/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
@@ -129,17 +126,7 @@
 				},
 				currentCategory: {},
 				type: 'category', //supplier
-				def: 0,
-				typeList:[
-				  {
-				    label: '按分类',
-				    value: 'category',
-				  },
-				  {
-				    label: '按店铺',
-				    value: 'supplier',
-				  },
-				],
+
 
 			}
 		},
@@ -205,9 +192,6 @@
 			})
 		},
 		methods: {
-			fnChange(e) {
-				this.type = e.value
-			},
 			changeSearchType() {
 				if (this.type == 'category') {
 					this.type = 'supplier'

--
Gitblit v1.9.3