merge master css js code

@@ -16,29 +16,17 @@ use Plugin\Cache;
 
 class Yohobuy
 {
-<<<<<<< HEAD
-
+    
 //    /* 正式环境 */
 //    const API_URL = 'http://api2.open.yohobuy.com/';
 //    const SERVICE_URL = 'http://service.api.yohobuy.com/';
 //    const YOHOBUY_URL = 'http://www.yohobuy.com/';
-=======
-    /* 正式环境 */
-   // const API_URL = 'http://api2.open.yohobuy.com/';
-   // const SERVICE_URL = 'http://service.api.yohobuy.com/';
-   // const YOHOBUY_URL = 'http://www.yohobuy.com/';
->>>>>>> 1483b137ec3273153d3dfa8f47aadd6b4b88fb9c
 
   /* 测试环境 */
     const API_URL = 'http://test2.open.yohobuy.com/';
     const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
     const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
-//    /* 测试环境 */
-//    const API_URL = 'http://test2.open.yohobuy.com/';
-//    const SERVICE_URL = 'http://test.service.api.yohobuy.com/';
-//    const YOHOBUY_URL = 'http://www.yohobuy.com/';
-
     /**
      * 私钥列表
      * 

@@ -143,11 +143,7 @@ class SearchData
 
         $param = array();
         $param['status'] = 1; // 是否上架，1表示在架，2表示不在
-<<<<<<< HEAD
-        $param['sales'] = 'Y'; // 是否在销售
-=======
         $param['sales'] = 'Y'; // 只搜索销售的产品
->>>>>>> 1483b137ec3273153d3dfa8f47aadd6b4b88fb9c
         // $param['needFilter'] = 1; // 是否需要返回筛选条件
         if (!isset($condition['order'])) {
             $param['order'] = $orderMaps['s_t_desc'];