From cdcc4bacee35b4bba9ea00e7259a532ab606e45a Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Sat, 20 Feb 2021 13:48:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96+=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=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 | 27 +++++++++++++++++++++++----
 public/static/common/css/common.css   |  1 +
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/application/service/SearchService.php b/application/service/SearchService.php
index f5634499c..1861552eb 100755
--- a/application/service/SearchService.php
+++ b/application/service/SearchService.php
@@ -197,10 +197,29 @@ class SearchService
                     $temp = explode('-', $v);
                     if(count($temp) == 2)
                     {
-                        $where_screening_price[] = [
-                            ['min_price', 'EGT', $temp[0]],
-                            ['min_price', 'LT', $temp[1]],
-                        ];
+                        // 最小金额等于0、最大金额大于0
+                        if(empty($temp[0]) && !empty($temp[1]))
+                        {
+                            $where_screening_price[] = [
+                                ['min_price', 'elt', $temp[1]],
+                            ];
+
+                        // 最小金额大于0、最大金额大于0
+                        // 最小金额等于0、最大金额等于0
+                        } elseif((!empty($temp[0]) && !empty($temp[1])) || (empty($temp[0]) && empty($temp[1])))
+                        {
+                            $where_screening_price[] = [
+                                ['min_price', 'egt', $temp[0]],
+                                ['min_price', 'elt', $temp[1]],
+                            ];
+
+                        // 最小金额大于0、最大金额等于0
+                        } elseif(!empty($temp[0]) && empty($temp[1]))
+                        {
+                            $where_screening_price[] = [
+                                ['min_price', 'egt', $temp[0]],
+                            ];
+                        }
                     }
                 }
             }
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index 54bd7cf72..4844abd5f 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -140,6 +140,7 @@ form.am-form .am-form-group-refreshing, .plug-file-upload-view { border-bottom:
     margin-left: 0;
     margin-top: 0;
 }
+.am-modal-dialog .am-modal-hd,
 .am-modal-dialog .am-modal-bd {
     background: #fff;
 }
-- 
GitLab