From 332d3ba3facf4e7181514259a3e266c06d7e690f Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Mon, 10 Sep 2018 13:27:34 +0800
Subject: [PATCH] search

---
 service/Application/Home/View/Default/Index/Index.html      | 6 +++---
 service/Application/Home/View/Default/Search/Index.html     | 5 ++---
 .../Runtime/Temp/0ece5e1f7d67f6940df0fdd2e23f8de3.php       | 0
 .../Runtime/Temp/0f93a90c5fd846c3021a94cae907eb94.php       | 0
 .../Runtime/Temp/38432eb7369925b9a826f2b9f64e2262.php       | 0
 service/Application/Service/SearchService.class.php         | 2 +-
 service/Public/Home/Default/Js/Search.js                    | 1 +
 7 files changed, 7 insertions(+), 7 deletions(-)
 mode change 100755 => 100644 service/Application/Runtime/Temp/0ece5e1f7d67f6940df0fdd2e23f8de3.php
 mode change 100755 => 100644 service/Application/Runtime/Temp/0f93a90c5fd846c3021a94cae907eb94.php
 mode change 100755 => 100644 service/Application/Runtime/Temp/38432eb7369925b9a826f2b9f64e2262.php

diff --git a/service/Application/Home/View/Default/Index/Index.html b/service/Application/Home/View/Default/Index/Index.html
index 9d756ed1e..a39d17087 100755
--- a/service/Application/Home/View/Default/Index/Index.html
+++ b/service/Application/Home/View/Default/Index/Index.html
@@ -111,7 +111,7 @@
                 							<if condition="!empty($category['items'])">
 		                						<foreach name="category.items" key="keys" item="categorys">
 		                							<if condition="$key lt 6 and $keys eq 0 and isset($categorys['is_home_recommended']) and $categorys['is_home_recommended'] eq 1">
-														<a href="#">{{$categorys.name}}</a>
+														<a href="{{:U('Home/Search/Index', ['category_id'=>$categorys['id']])}}">{{$categorys.name}}</a>
 													</if>
 												</foreach>
 											</if>
@@ -119,7 +119,7 @@
 									</if>
 								</div>
 								<span class="more">
-			            			<a href="#">更多<i class="am-icon-angle-right" style="padding-left:10px ;" ></i></a>
+			            			<a href="{{:U('Home/Search/Index', ['category_id'=>$floor['id']])}}">更多<i class="am-icon-angle-right" style="padding-left:10px ;" ></i></a>
 			                	</span>
 							</div>
 						</div>
@@ -130,7 +130,7 @@
 									<if condition="!empty($floor['items'])">
                 						<foreach name="floor.items" item="category">
                 							<if condition="$key lt 6 and isset($category['is_home_recommended']) and $category['is_home_recommended'] eq 1">
-												<a class="outer" href="#">
+												<a href="{{:U('Home/Search/Index', ['category_id'=>$category['id']])}}" class="outer">
 													<span class="inner">
 														<b class="text">{{:mb_substr($category['name'], 0, 4, 'utf-8')}}</b>
 													</span>
diff --git a/service/Application/Home/View/Default/Search/Index.html b/service/Application/Home/View/Default/Search/Index.html
index 15bc5effe..49bb2039d 100755
--- a/service/Application/Home/View/Default/Search/Index.html
+++ b/service/Application/Home/View/Default/Search/Index.html
@@ -12,12 +12,11 @@
 <!-- goods category -->
 <include file="Public/GoodsCategory" />
 
-
-<div class="am-container">
+<!-- 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="theme-popover">
-            
             <div class="searchAbout">
                 <span class="font-pale">相关搜索：</span>
                 <a title="坚果" href="#">坚果</a>
diff --git a/service/Application/Runtime/Temp/0ece5e1f7d67f6940df0fdd2e23f8de3.php b/service/Application/Runtime/Temp/0ece5e1f7d67f6940df0fdd2e23f8de3.php
old mode 100755
new mode 100644
diff --git a/service/Application/Runtime/Temp/0f93a90c5fd846c3021a94cae907eb94.php b/service/Application/Runtime/Temp/0f93a90c5fd846c3021a94cae907eb94.php
old mode 100755
new mode 100644
diff --git a/service/Application/Runtime/Temp/38432eb7369925b9a826f2b9f64e2262.php b/service/Application/Runtime/Temp/38432eb7369925b9a826f2b9f64e2262.php
old mode 100755
new mode 100644
diff --git a/service/Application/Service/SearchService.class.php b/service/Application/Service/SearchService.class.php
index 8316cf892..2e278316e 100644
--- a/service/Application/Service/SearchService.class.php
+++ b/service/Application/Service/SearchService.class.php
@@ -80,7 +80,7 @@ class SearchService
         {
             $category_ids = GoodsService::GoodsCategoryItemsIds(['category_id'=>$params['category_id']]);
             $category_ids[] = $params['category_id'];
-            $where['gci.id'] = ['in', $category_ids];
+            $where['gci.category_id'] = ['in', $category_ids];
         }
 
         // 筛选价格
diff --git a/service/Public/Home/Default/Js/Search.js b/service/Public/Home/Default/Js/Search.js
index 566371b92..36b5b50f6 100755
--- a/service/Public/Home/Default/Js/Search.js
+++ b/service/Public/Home/Default/Js/Search.js
@@ -144,6 +144,7 @@ $(function()
     {
         // 请求参数处理
         var data = {
+            category_id: $('.search-content').data('category-id') || 0,
             keywords: $('#search-input').val() || '',
             page: page || parseInt($('.search-pages-submit').attr('data-page')) || 1,
             order_by_field: $('.sort-nav li.active').attr('data-field') || 'default',