From c5bb12f327fa7b2ba7834631f1e1a8c7f2cc118e Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 14 Oct 2021 17:08:52 +0800
Subject: [PATCH] search

---
 components/free-input/index.js    |  2 +-
 components/free-input/index.wxml  | 26 ++++++++------------------
 pages/mall/search-list/index.wxml |  2 +-
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/components/free-input/index.js b/components/free-input/index.js
index 5c0bf09..9d605dc 100644
--- a/components/free-input/index.js
+++ b/components/free-input/index.js
@@ -64,7 +64,7 @@ Component({
     // send、search、next、go、done
     confirmType:{
       type:String,
-      value:'done'
+      value:'search'
     },
     // 提示词
     placeholder:{
diff --git a/components/free-input/index.wxml b/components/free-input/index.wxml
index 3b9a212..44f8ca9 100644
--- a/components/free-input/index.wxml
+++ b/components/free-input/index.wxml
@@ -1,34 +1,24 @@
 <view class='box' style="position:{{position}};background:{{bgColor}};">
-  <view  class="{{inputStyle == 0?'inputStyle':'inputStyles'}} {{inputStyle == 1 &&disabled?'disabled':''}}" style="border-radius:{{radius}};background:{{inputBg}};">
+  <view class="{{inputStyle == 0?'inputStyle':'inputStyles'}} {{inputStyle == 1 &&disabled?'disabled':''}}"
+    style="border-radius:{{radius}};background:{{inputBg}};">
     <!-- 前置图标 -->
     <view style="margin: 2px 0 0 0.8em;" wx:if="{{prefixIcon}}">
       <!-- <text class="cuIcon-search text-gray" style="font-size:16px;padding-top: 8rpx;"></text> -->
       <image src="/assets/image/icon-search.png" style="height: 30rpx;width: 30rpx;margin-top: 20rpx;"></image>
     </view>
-    <input type="{{type}}" 
-    style="color:{{color}}"
-    placeholder-style="color:{{color}}"
-    confirm-type="{{confirmType}}"
-    placeholder="{{placeholder}}" 
-    value="{{value}}" 
-    bindinput="getInput"  
-    bindfocus="getFocus"
-    bindblur="getBlur"
-    bindconfirm="getConfirm"
-    password="{{password}}"
-    disabled="{{disabled}}" 
-    focus="{{ focus }}"
-    class="input"/>
+    <input type="{{type}}" style="color:{{color}}" placeholder-style="color:{{color}}" confirm-type="{{confirmType}}"
+      placeholder="{{placeholder}}" value="{{value}}" bindinput="getInput" bindfocus="getFocus" bindblur="getBlur"
+      bindconfirm="getConfirm" password="{{password}}" disabled="{{disabled}}" focus="{{ focus }}" class="input" />
     <!-- 删除 -->
     <view class="deleStyle" wx:if="{{value && close}}" bindtap="close">
       <text class="cuIcon-close text-gray" style="font-size:16px;"></text>
     </view>
     <!-- 后置图标 -->
-    <view style="padding: 0 20rpx;" wx:if="{{suffixIcon}}" >
+    <view style="padding: 0 20rpx;" wx:if="{{suffixIcon}}">
       <!-- <slot name='suffix' ></slot> -->
-    </view>    
+    </view>
   </view>
   <view class="extreaBtn" wx:if='{{extreaWord}}' style="color:{{extreaColor}}" bindtap="extreaBtn">
     <text>{{extreaWord}}</text>
   </view>
-</view>
+</view>
\ No newline at end of file
diff --git a/pages/mall/search-list/index.wxml b/pages/mall/search-list/index.wxml
index 4b3b59a..4e19662 100644
--- a/pages/mall/search-list/index.wxml
+++ b/pages/mall/search-list/index.wxml
@@ -3,7 +3,7 @@
 </cu-custom>
 
 <view class="bg-white">
-  <free-input value="{{form.searchKey}}" placeholder="请输入关键字" extreaWord="搜索" bind:focus="onFocusChange" bind:blur="onBlurChange" focus="{{focus}}" close="{{true}}" bind:extrea="onSearchList"></free-input>
+  <free-input value="{{form.searchKey}}" placeholder="请输入关键字" extreaWord="搜索" focus="{{focus}}" close="{{true}}" bind:focus="onFocusChange" bind:blur="onBlurChange" bind:confirm="onSearchList" bind:extrea="onSearchList"></free-input>
 </view>
 <view class="bg-white" style="height:90rpx;border-bottom:2rpx solid #f3f3f3" wx:if="{{!focus || searchList.length == 0}}">
 	<wux-tabi tab-data="{{tabList}}" tab-index="{{tabIndex}}" disable="{{requesting || loading}}" scroll="{{false}}" bind:change="onTabChange"/>