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

xuxueyang

2024-09-09 15bd4823adb6c1b3a547f24ba613ac5c87ec3b2e

 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'
@@ -87,7 +104,9 @@
               var p = ''
               if (this.type === 'flower') {
                  p = 'name=' + this.search_flow
                  if (this.history_flower.indexOf(name) >= 0) {} else {
                  if (this.history_flower.indexOf(name) >= 0) {

                  } else {
                     this.history_flower.unshift(name)
                  }
                  if (this.history_flower.length >= 10) {
@@ -95,11 +114,13 @@
                  }
               } else {
                  p = 'supplierName=' + this.search_flow
                  if (this.history_supplier.indexOf(name) >= 0) {} else {
                     this..history_supplier.unshift(name)
                  if (this.history_supplier.indexOf(name) >= 0) {

                  } else {
                     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({