From 6b489b8edfedc8dd757f6868464087eef914b78a Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Sun, 10 Jan 2021 13:51:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/SearchService.php                  | 10 ++++++++++
 .../default/pages/goods-search/goods-search.axml       |  2 +-
 .../alipay/default/pages/goods-search/goods-search.js  |  2 +-
 .../baidu/default/pages/goods-search/goods-search.js   |  2 +-
 .../baidu/default/pages/goods-search/goods-search.swan |  2 +-
 .../qq/default/pages/goods-search/goods-search.js      |  2 +-
 .../qq/default/pages/goods-search/goods-search.qml     |  2 +-
 .../toutiao/default/pages/goods-search/goods-search.js |  2 +-
 .../default/pages/goods-search/goods-search.ttml       |  2 +-
 .../weixin/default/pages/goods-search/goods-search.js  |  2 +-
 .../default/pages/goods-search/goods-search.wxml       |  2 +-
 11 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/application/service/SearchService.php b/application/service/SearchService.php
index 958f5615b..0896383e2 100755
--- a/application/service/SearchService.php
+++ b/application/service/SearchService.php
@@ -195,6 +195,16 @@ class SearchService
             }
         }
 
+        // 指定价格筛选
+        if(!empty($params['min_price']))
+        {
+            $where_base[] = ['g.min_price', 'EGT', $params['min_price']];
+        }
+        if(!empty($params['max_price']))
+        {
+            $where_base[] = ['g.min_price', 'LT', $params['max_price']];
+        }
+
         return [
             'base'              => $where_base,
             'keywords'          => $where_keywords,
diff --git a/sourcecode/alipay/default/pages/goods-search/goods-search.axml b/sourcecode/alipay/default/pages/goods-search/goods-search.axml
index aad64f9cd..5f508abed 100755
--- a/sourcecode/alipay/default/pages/goods-search/goods-search.axml
+++ b/sourcecode/alipay/default/pages/goods-search/goods-search.axml
@@ -50,7 +50,7 @@
     </view>
     <view class="item keywords">
       <view class="title cr-666">关键字</view>
-      <input type="text" placeholder="关键字" name="keywords" value="{{(params.keywords || '')}}" class="br" />
+      <input type="text" placeholder="关键字" name="wd" value="{{(params.keywords || '')}}" class="br" />
     </view>
     <button formType="submit" class="bg-main form-submit wh-auto" disabled="{{popup_form_loading_status}}" hover-class="none">确认</button>
   </form>
diff --git a/sourcecode/alipay/default/pages/goods-search/goods-search.js b/sourcecode/alipay/default/pages/goods-search/goods-search.js
index f9f0908c5..4cbdeb3be 100755
--- a/sourcecode/alipay/default/pages/goods-search/goods-search.js
+++ b/sourcecode/alipay/default/pages/goods-search/goods-search.js
@@ -30,7 +30,7 @@ Page({
     this.setData({
       params: params,
       post_data: {
-        keywords: params.keywords || ''
+        wd: params.keywords || ''
       }
     });
   },
diff --git a/sourcecode/baidu/default/pages/goods-search/goods-search.js b/sourcecode/baidu/default/pages/goods-search/goods-search.js
index 269d54c68..f479baf09 100755
--- a/sourcecode/baidu/default/pages/goods-search/goods-search.js
+++ b/sourcecode/baidu/default/pages/goods-search/goods-search.js
@@ -30,7 +30,7 @@ Page({
     this.setData({
       params: params,
       post_data: {
-        keywords: params.keywords || ''
+        wd: params.keywords || ''
       }
     });
   },
diff --git a/sourcecode/baidu/default/pages/goods-search/goods-search.swan b/sourcecode/baidu/default/pages/goods-search/goods-search.swan
index 86b4c7ff6..2b6b42d25 100755
--- a/sourcecode/baidu/default/pages/goods-search/goods-search.swan
+++ b/sourcecode/baidu/default/pages/goods-search/goods-search.swan
@@ -49,7 +49,7 @@
     </view>
     <view class="item keywords">
       <view class="title cr-666">关键字</view>
-      <input type="text" placeholder="关键字" name="keywords" value="{=(params.keywords || '')=}" class="br" />
+      <input type="text" placeholder="关键字" name="wd" value="{=(params.keywords || '')=}" class="br" />
     </view>
     <button formType="submit" class="bg-main form-submit wh-auto" disabled="{{popup_form_loading_status}}" hover-class="none">确认</button>
   </form>
diff --git a/sourcecode/qq/default/pages/goods-search/goods-search.js b/sourcecode/qq/default/pages/goods-search/goods-search.js
index fd9bab442..69bedc9f0 100755
--- a/sourcecode/qq/default/pages/goods-search/goods-search.js
+++ b/sourcecode/qq/default/pages/goods-search/goods-search.js
@@ -30,7 +30,7 @@ Page({
     this.setData({
       params: params,
       post_data: {
-        keywords: params.keywords || ''
+        wd: params.keywords || ''
       }
     });
   },
diff --git a/sourcecode/qq/default/pages/goods-search/goods-search.qml b/sourcecode/qq/default/pages/goods-search/goods-search.qml
index 00e7efb9c..82adbdf58 100755
--- a/sourcecode/qq/default/pages/goods-search/goods-search.qml
+++ b/sourcecode/qq/default/pages/goods-search/goods-search.qml
@@ -49,7 +49,7 @@
     </view>
     <view class="item keywords">
       <view class="title cr-666">关键字</view>
-      <input type="text" placeholder="关键字" name="keywords" value="{{(params.keywords || '')}}" class="br" />
+      <input type="text" placeholder="关键字" name="wd" value="{{(params.keywords || '')}}" class="br" />
     </view>
     <button formType="submit" class="bg-main form-submit wh-auto" disabled="{{popup_form_loading_status}}" hover-class="none">确认</button>
   </form>
diff --git a/sourcecode/toutiao/default/pages/goods-search/goods-search.js b/sourcecode/toutiao/default/pages/goods-search/goods-search.js
index 2f6357f7a..64d90df71 100755
--- a/sourcecode/toutiao/default/pages/goods-search/goods-search.js
+++ b/sourcecode/toutiao/default/pages/goods-search/goods-search.js
@@ -30,7 +30,7 @@ Page({
     this.setData({
       params: params,
       post_data: {
-        keywords: params.keywords || ''
+        wd: params.keywords || ''
       }
     });
   },
diff --git a/sourcecode/toutiao/default/pages/goods-search/goods-search.ttml b/sourcecode/toutiao/default/pages/goods-search/goods-search.ttml
index 26f72ddbf..d5e5626c2 100755
--- a/sourcecode/toutiao/default/pages/goods-search/goods-search.ttml
+++ b/sourcecode/toutiao/default/pages/goods-search/goods-search.ttml
@@ -49,7 +49,7 @@
     </view>
     <view class="item keywords">
       <view class="title cr-666">关键字</view>
-      <input type="text" placeholder="关键字" name="keywords" value="{{(params.keywords || '')}}" class="br" />
+      <input type="text" placeholder="关键字" name="wd" value="{{(params.keywords || '')}}" class="br" />
     </view>
     <button formType="submit" class="bg-main form-submit wh-auto" disabled="{{popup_form_loading_status}}" hover-class="none">确认</button>
   </form>
diff --git a/sourcecode/weixin/default/pages/goods-search/goods-search.js b/sourcecode/weixin/default/pages/goods-search/goods-search.js
index 022e9e855..f68558576 100755
--- a/sourcecode/weixin/default/pages/goods-search/goods-search.js
+++ b/sourcecode/weixin/default/pages/goods-search/goods-search.js
@@ -30,7 +30,7 @@ Page({
     this.setData({
       params: params,
       post_data: {
-        keywords: params.keywords || ''
+        wd: params.keywords || ''
       }
     });
 
diff --git a/sourcecode/weixin/default/pages/goods-search/goods-search.wxml b/sourcecode/weixin/default/pages/goods-search/goods-search.wxml
index 9b9574a4e..c15443524 100755
--- a/sourcecode/weixin/default/pages/goods-search/goods-search.wxml
+++ b/sourcecode/weixin/default/pages/goods-search/goods-search.wxml
@@ -49,7 +49,7 @@
     </view>
     <view class="item keywords">
       <view class="title cr-666">关键字</view>
-      <input type="text" placeholder="关键字" name="keywords" value="{{(params.keywords || '')}}" class="br" />
+      <input type="text" placeholder="关键字" name="wd" value="{{(params.keywords || '')}}" class="br" />
     </view>
     <button formType="submit" class="bg-main form-submit wh-auto" disabled="{{popup_form_loading_status}}" hover-class="none">确认</button>
   </form>