fe / YOHOBUYPC · Commits

Go to a project

Authored by ccbikai
Commit 0ff1e35337c656c288243a40602bd0cb7a85fdb4 2 parents 88ef01d3 cdba8278

merge code

Inline Side-by-side
Showing 2 changed files with 1 additions and 5 deletions
@@ -22,7 +22,7 @@ class Yohobuy @@ -22,7 +22,7 @@ class Yohobuy
22 // const SERVICE_URL = 'http://service.api.yohobuy.com/'; 22 // const SERVICE_URL = 'http://service.api.yohobuy.com/';
23 // const YOHOBUY_URL = 'http://www.yohobuy.com/'; 23 // const YOHOBUY_URL = 'http://www.yohobuy.com/';
24 24
25 -// /* 测试环境 */ 25 + /* 测试环境 */
26 const API_URL = 'http://test2.open.yohobuy.com/'; 26 const API_URL = 'http://test2.open.yohobuy.com/';
27 const SERVICE_URL = 'http://test.service.api.yohobuy.com/'; 27 const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
28 const YOHOBUY_URL = 'http://www.yohobuy.com/'; 28 const YOHOBUY_URL = 'http://www.yohobuy.com/';
@@ -143,11 +143,7 @@ class SearchData @@ -143,11 +143,7 @@ class SearchData
143 143
144 $param = array(); 144 $param = array();
145 $param['status'] = 1; // 是否上架，1表示在架，2表示不在 145 $param['status'] = 1; // 是否上架，1表示在架，2表示不在
146 -<<<<<<< HEAD  
147 - $param['sales'] = 'Y'; // 是否在销售  
148 -=======  
149 $param['sales'] = 'Y'; // 只搜索销售的产品 146 $param['sales'] = 'Y'; // 只搜索销售的产品
150 ->>>>>>> 1483b137ec3273153d3dfa8f47aadd6b4b88fb9c  
151 // $param['needFilter'] = 1; // 是否需要返回筛选条件 147 // $param['needFilter'] = 1; // 是否需要返回筛选条件
152 if (!isset($condition['order'])) { 148 if (!isset($condition['order'])) {
153 $param['order'] = $orderMaps['s_t_desc']; 149 $param['order'] = $orderMaps['s_t_desc'];