From 9562e51ee6f80924f48b16659d28851c86d3adfe Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Fri, 31 May 2019 00:50:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/view/default/search/index.html | 2 +-
 application/index/view/default/user/index.html   | 4 ++--
 application/service/GoodsService.php             | 4 ++--
 public/static/index/default/css/search.css       | 3 ---
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/application/index/view/default/search/index.html b/application/index/view/default/search/index.html
index a6b3696e1..dfe479f55 100755
--- a/application/index/view/default/search/index.html
+++ b/application/index/view/default/search/index.html
@@ -15,7 +15,7 @@
 <!-- content -->
 <div class="am-container search-content" data-category-id="{{$params.category_id}}">
     <div class="search-list">
-        <div class="am-u-sm-12 am-u-md-12">
+        <div class="am-u-sm-12 am-u-md-12 am-padding-left-0 am-padding-right-0">
             <div class="theme-popover">
                 <ul class="select">
                     <p class="title-tips">
diff --git a/application/index/view/default/user/index.html b/application/index/view/default/user/index.html
index b828dafee..7f3290814 100755
--- a/application/index/view/default/user/index.html
+++ b/application/index/view/default/user/index.html
@@ -255,7 +255,7 @@
                                                 <a href="{{:MyUrl('index/goods/index', ['id'=>$goods['goods_id']])}}" target="_blank">
                                                     <img src="{{$goods.images}}" alt="{{$goods.title}}" class="am-img-thumbnail am-radius" />
                                                     <h3 class="am-gallery-title">{{$goods.title}}</h3>
-                                                    <div class="am-gallery-desc line-price">￥{{$goods.price}}</div>
+                                                    <div class="am-gallery-desc line-price">￥{{$goods.min_price}}</div>
                                                 </a>
                                             </div>
                                         </li>
@@ -294,7 +294,7 @@
                                                     <img src="{{$goods.images}}" alt="{{$goods.title}}" class="am-img-thumbnail am-circle" />
                                                     <h3 class="am-gallery-title">{{$goods.title}}</h3>
                                                 </a>
-                                                <div class="am-gallery-desc line-price">￥{{$goods.price}}</div>
+                                                <div class="am-gallery-desc line-price">￥{{$goods.min_price}}</div>
                                             </div>
                                         </li>
                                     {{/foreach}}
diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php
index 34dc12c18..8635b2a5f 100755
--- a/application/service/GoodsService.php
+++ b/application/service/GoodsService.php
@@ -671,7 +671,7 @@ class GoodsService
         $m = isset($params['m']) ? intval($params['m']) : 0;
         $n = isset($params['n']) ? intval($params['n']) : 10;
         $order_by = empty($params['order_by']) ? 'f.id desc' : $params['order_by'];
-        $field = 'f.*, g.title, g.original_price, g.price, g.images';
+        $field = 'f.*, g.title, g.original_price, g.price, g.min_price, g.images';
 
         // 获取数据
         $data = Db::name('GoodsFavor')->alias('f')->join(['__GOODS__'=>'g'], 'g.id=f.goods_id')->field($field)->where($where)->limit($m, $n)->order($order_by)->select();
@@ -817,7 +817,7 @@ class GoodsService
         $m = isset($params['m']) ? intval($params['m']) : 0;
         $n = isset($params['n']) ? intval($params['n']) : 10;
         $order_by = empty($params['order_by']) ? 'b.id desc' : $params['order_by'];
-        $field = 'b.*, g.title, g.original_price, g.price, g.images';
+        $field = 'b.*, g.title, g.original_price, g.price, g.min_price, g.images';
 
         // 获取数据
         $data = Db::name('GoodsBrowse')->alias('b')->join(['__GOODS__'=>'g'], 'g.id=b.goods_id')->field($field)->where($where)->limit($m, $n)->order($order_by)->select();
diff --git a/public/static/index/default/css/search.css b/public/static/index/default/css/search.css
index e01f43472..5ac6be636 100755
--- a/public/static/index/default/css/search.css
+++ b/public/static/index/default/css/search.css
@@ -5,7 +5,6 @@
 .select .title-tips { font-size: 12px; color: #888; }
 .select .title-tips strong { font-weight: 500; color: #fe90a0; }
 
-
 /* select */
 .sort-nav{padding:0px;font-size:12px}
 .suggest{ display:none;}
@@ -38,9 +37,7 @@ li.select-result dt {left:-26px; top:0;font-weight:bold;width:50px;}
       
 /*筛选条件*/
 .select-list{ float:left;display:inline; left:0;width:33.33%; height:30px;}
-
 .select-list dl dt{left:0px; cursor:pointer; text-align: center;}
-{display:none ;float:left; top:20px; padding-top:5px; z-index:10; left:0px; width:300%;position:absolute;}
 .select-list .dd-conent{display:none ;z-index:10; left:0; width:100%;position:fixed; background:#fff;max-height: 50%; padding-bottom: 10px; }
 .select-list .dd-conent dd{width:33.33% ;text-align: center;margin-left: 0px;height:25px ;}
 dl#select2 .dd-conent{ left:-100%; right:-100%;}