Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

梁志锋
Commit 09500b4de29d35d7edb9526feaef5cfda53bc48b 2 parents b3d45dcf da2dd89e
Showing 6 changed files with 0 additions and 36 deletions
yohobuy/m.yohobuy.com/application/controllers/Search.php
yohobuy/m.yohobuy.com/application/modules/Product/controllers/Index.php
yohobuy/m.yohobuy.com/configs/application.developer.ini
yohobuy/m.yohobuy.com/configs/application.preview.ini
yohobuy/m.yohobuy.com/configs/application.production.ini
yohobuy/m.yohobuy.com/configs/application.testing.ini
--- a/yohobuy/m.yohobuy.com/application/controllers/Search.php
View file @09500b4
+++ b/yohobuy/m.yohobuy.com/application/controllers/Search.php
View file @09500b4
@@ -51,13 +51,10 @@ class SearchController extends AbstractAction
         if (isset($condition['discount'])) {
             $condition['p_d'] = rawurldecode($condition['discount']);
             // unset($condition['discount']); 为了兼容js中传参的discount
-<<<<<<< HEAD
-=======
         }
         // 为了兼容现在运营在用的p_d
         if (isset($condition['p_d'])) {
             $condition['discount'] = rawurldecode($condition['p_d']);
->>>>>>> master
         }
         if (isset($condition['query'])) {
             $condition['query'] = rawurlencode($condition['query']);
@@ -236,13 +233,10 @@ class SearchController extends AbstractAction
             if (isset($condition['price'])) {
                 $condition['price'] = rawurldecode($condition['price']);
             }
-<<<<<<< HEAD
-=======
             // 转义风格
             if (isset($condition['style'])) {
                 $condition['style'] = rawurldecode($condition['style']);
             }
->>>>>>> master
             // 转换折扣
             if (isset($condition['discount'])) {
                 $condition['p_d'] = rawurldecode($condition['discount']);
@@ -331,13 +325,10 @@ class SearchController extends AbstractAction
             if (isset($condition['price'])) {
                 $condition['price'] = rawurldecode($condition['price']);
             }
-<<<<<<< HEAD
-=======
             // 转义风格
             if (isset($condition['style'])) {
                 $condition['style'] = rawurldecode($condition['style']);
             }
->>>>>>> master
             // 区别各种列表页面的筛选数据
             $data = Product\SearchModel::getFilterData($condition);
--- a/yohobuy/m.yohobuy.com/application/modules/Product/controllers/Index.php
View file @09500b4
+++ b/yohobuy/m.yohobuy.com/application/modules/Product/controllers/Index.php
View file @09500b4
@@ -73,13 +73,10 @@ class IndexController extends AbstractAction
         if (isset($condition['discount'])) {
             $condition['p_d'] = rawurldecode($condition['discount']);
         }
-<<<<<<< HEAD
-=======
         // 为了兼容现在运营在用的p_d
         if (isset($condition['p_d'])) {
             $condition['discount'] = rawurldecode($condition['p_d']);
         }
->>>>>>> master
         // 性别参数，不传则从COOKIE获取
         if (!isset($condition['gender'])) {
             $condition['gender'] = Helpers::getGenderByCookie();
@@ -166,11 +163,6 @@ class IndexController extends AbstractAction
             'gender' => FILTER_DEFAULT,
             'p_d' => FILTER_DEFAULT,), false);
         $condition['brand'] = $brandId;
-<<<<<<< HEAD
-        
-=======
-
->>>>>>> master
         // 转义分类
         if (isset($condition['sort'])) {
             $condition['sort'] = rawurldecode($condition['sort']);
@@ -203,13 +195,10 @@ class IndexController extends AbstractAction
         if (isset($condition['discount'])) {
             $condition['p_d'] = rawurldecode($condition['discount']);
         }
-<<<<<<< HEAD
-=======
         // 为了兼容现在运营在用的p_d
         if (isset($condition['p_d'])) {
             $condition['discount'] = rawurldecode($condition['p_d']);
         }
->>>>>>> master
         if ($brandId === 0) {
             $condition['query'] = $domain;
         }
--- a/yohobuy/m.yohobuy.com/configs/application.developer.ini
View file @09500b4
+++ b/yohobuy/m.yohobuy.com/configs/application.developer.ini
View file @09500b4
@@ -53,10 +53,6 @@ application.assets.path = ROOT_PATH "/assets"
 application.version = "1.1.8"
 ; 网站SEO信息
-<<<<<<< HEAD
 application.seo.title = "Yoho!Buy有货 | 年轻人潮流购物中心"
-=======
-application.seo.title = "Yoho!Buy有货 丨 年轻人潮流购物中心"
->>>>>>> 1483b137ec3273153d3dfa8f47aadd6b4b88fb9c
 application.seo.keywords = "Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款"
 application.seo.description = "YOHO! 有货，年轻人潮流购物中心，中国最大的潮流商品购物网站。100%品牌正品保证，支持货到付款。作为YOHO!旗下的购物平台，汇集了全球潮流时尚商品和中国最流行的商品，也是国内最大的原创文化商品平台，也是香港，台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌，带给您全新潮流购物体验。"
--- a/yohobuy/m.yohobuy.com/configs/application.preview.ini
View file @09500b4
+++ b/yohobuy/m.yohobuy.com/configs/application.preview.ini
View file @09500b4
@@ -53,10 +53,6 @@ application.assets.path = ROOT_PATH "/assets"
 application.version = "1.1.8"
 ; 网站SEO信息
-<<<<<<< HEAD
 application.seo.title = "Yoho!Buy有货 | 年轻人潮流购物中心"
-=======
-application.seo.title = "Yoho!Buy有货 丨 年轻人潮流购物中心"
->>>>>>> 1483b137ec3273153d3dfa8f47aadd6b4b88fb9c
 application.seo.keywords = "Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款"
 application.seo.description = "YOHO! 有货，年轻人潮流购物中心，中国最大的潮流商品购物网站。100%品牌正品保证，支持货到付款。作为YOHO!旗下的购物平台，汇集了全球潮流时尚商品和中国最流行的商品，也是国内最大的原创文化商品平台，也是香港，台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌，带给您全新潮流购物体验。"
--- a/yohobuy/m.yohobuy.com/configs/application.production.ini
View file @09500b4
+++ b/yohobuy/m.yohobuy.com/configs/application.production.ini
View file @09500b4
@@ -53,10 +53,6 @@ application.assets.path = ROOT_PATH "/assets"
 application.version = "1.1.8"
 ; 网站SEO信息
-<<<<<<< HEAD
 application.seo.title = "Yoho!Buy有货 | 年轻人潮流购物中心"
-=======
-application.seo.title = "Yoho!Buy有货 丨 年轻人潮流购物中心"
->>>>>>> 1483b137ec3273153d3dfa8f47aadd6b4b88fb9c
 application.seo.keywords = "Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款"
 application.seo.description = "YOHO! 有货，年轻人潮流购物中心，中国最大的潮流商品购物网站。100%品牌正品保证，支持货到付款。作为YOHO!旗下的购物平台，汇集了全球潮流时尚商品和中国最流行的商品，也是国内最大的原创文化商品平台，也是香港，台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌，带给您全新潮流购物体验。"
--- a/yohobuy/m.yohobuy.com/configs/application.testing.ini
View file @09500b4
+++ b/yohobuy/m.yohobuy.com/configs/application.testing.ini
View file @09500b4
@@ -53,10 +53,6 @@ application.assets.path = ROOT_PATH "/assets"
 application.version = "1.1.8"
 ; 网站SEO信息
-<<<<<<< HEAD
 application.seo.title = "Yoho!Buy有货 | 年轻人潮流购物中心"
-=======
-application.seo.title = "Yoho!Buy有货 丨 年轻人潮流购物中心"
->>>>>>> 1483b137ec3273153d3dfa8f47aadd6b4b88fb9c
 application.seo.keywords = "Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款"
 application.seo.description = "YOHO! 有货，年轻人潮流购物中心，中国最大的潮流商品购物网站。100%品牌正品保证，支持货到付款。作为YOHO!旗下的购物平台，汇集了全球潮流时尚商品和中国最流行的商品，也是国内最大的原创文化商品平台，也是香港，台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌，带给您全新潮流购物体验。"