From 15bd4823adb6c1b3a547f24ba613ac5c87ec3b2e Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 09 九月 2024 23:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/v2' into remote-v2

---
 pages/home/components/home-search.vue |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/pages/home/components/home-search.vue b/pages/home/components/home-search.vue
index a0373a6..d8a366c 100644
--- a/pages/home/components/home-search.vue
+++ b/pages/home/components/home-search.vue
@@ -1,12 +1,15 @@
 <template>
 	<view class="p15 bg-white">
 		<view class="search-container m-t-12 flex">
-			<view class="flex m-r-20">
-				<view class="m-r-10" style="line-height: 80rpx;" @click="changeType">
+			<!-- <view class="flex m-r-20" @click="changeType">
+				<view class="m-r-10" style="line-height: 80rpx;" >
 					{{type=='flower'?'按鲜花':'按店铺'}}
 				</view>
 				<u-icon name="arrow-down"></u-icon>
 
+			</view> -->
+			<view class="flex m-r-20">
+				<um-dropdown width="200rpx" @change="fnChange" :defaultIndex="def" rangeKey="label" :optionList="typeList"></um-dropdown>
 			</view>
 			<view class="flex1 input">
 				<u-input placeholder="请输入花名" v-model="search_flow" clearable @confirm="buttonSearchFlow" @clear="()=>{
@@ -52,6 +55,17 @@
 				history_flower: [],
 
 				type: 'flower', //supplierName
+				def: 0,
+				typeList:[
+					{
+						label: '按鲜花',
+						value: 'flower',
+					},
+					{
+						label: '按店铺',
+						value: 'supplier',
+					},
+				],
 			}
 		},
 		onShow() {
@@ -72,6 +86,9 @@
 			}
 		},
 		methods: {
+			fnChange(e) {
+				this.type = e.value
+			},
 			changeType() {
 				if (this.type == 'flower') {
 					this.type = 'supplier'
@@ -100,10 +117,10 @@
 						if (this.history_supplier.indexOf(name) >= 0) {
 
 						} else {
-							this..history_supplier.unshift(name)
+							this.history_supplier.unshift(name)
 						}
-						if (this..history_supplier.length >= 10) {
-							this..history_supplier.splice(this..history_supplier.length - 1, 1)
+						if (this.history_supplier.length >= 10) {
+							this.history_supplier.splice(this.history_supplier.length - 1, 1)
 						}
 					}
 					uni.navigateTo({

--
Gitblit v1.9.3