Authored by 毕凯

Merge remote-tracking branch 'origin/hotfix/originallow'

... ... @@ -295,7 +295,7 @@ function search(opt) {
$.ajax({
type: 'GET',
url: '/index/search/search',
url: location.protocol + '//m.yohobuy.com/index/search/search',
data: setting,
success: function(data) {
var noResult = '<p class="no-result">未找到相关搜索结果</p>',
... ... @@ -375,7 +375,7 @@ require('./suspend-cart'); //悬浮购物车
$.ajax({
type: 'GET',
url: '/search/filter',
url: location.protocol + '//m.yohobuy.com/search/filter',
data: defaultOpt,
success: function(data) {
$goodsContainer.append(data);
... ...
... ... @@ -233,6 +233,7 @@ class SearchController extends AbstractAction
*/
public function searchAction()
{
header('Access-Control-Allow-Origin:*');
$data = array();
do {
... ... @@ -397,6 +398,7 @@ class SearchController extends AbstractAction
*/
public function filterAction()
{
header('Access-Control-Allow-Origin:*');
$data = array();
if ($this->isAjax()) {
... ...