Merge branch '商城搜索优化' into 楚楚/楚楚master

pages/index/market/index.js

@@ -117,6 +117,7 @@ Component({
     },
     /* 获取产品 */
     getList(init = false) {
+      wx.hideLoading()
       if (init.detail != undefined) init = init.detail;
       if (init) content.pageNumber = 1;
       if (content.pageNumber > content.pageTotal) return;
@@ -144,8 +145,16 @@ Component({
       detail
     }) {
       content.where.condition = detail;
+      wx.showLoading({
+        title: '搜索中...',
+      })
       this.getList(true)
     },
+    onChange({
+      detail
+    }) {
+      content.where.condition = detail;
+    },
     /* 获取领域 */
     getTradefie() {
       _Http.basic({

pages/index/market/index.wxml

@@ -1,4 +1,4 @@
-<van-search use-action-slot placeholder='请输入搜索关键词' shape='round' bind:search="onSearch" bind:clear="onSearch">
+<van-search use-action-slot placeholder='请输入搜索关键词' shape='round' bind:change='onChange' bind:search="onSearch" bind:clear="onSearch">
 	<view style="padding: 0 10rpx;" slot="action" bind:tap="openPopup">筛选</view>
 </van-search>
 <Tabs active='0' id="tradefieList" list="{{tradefieList}}" wx:if="{{tradefieList.length>1}}" box-class='brand-box' tab-class='brand-tab-class' active-class='brand-active-class' name='tradefield' bind:onChange="tradefieChange" />