shopId问题解决

郭成尧
Commit a86b8677fae0322635168971ff547c9ccf9f8c6a 1 parent 3362d387
Showing 3 changed files with 37 additions and 33 deletions
yohobuy/m.yohobuy.com/application/controllers/Search.php
yohobuy/m.yohobuy.com/application/models/Product/List.php
yohobuy/m.yohobuy.com/application/modules/Product/controllers/Index.php
--- a/yohobuy/m.yohobuy.com/application/controllers/Search.php
View file @a86b867
+++ b/yohobuy/m.yohobuy.com/application/controllers/Search.php
View file @a86b867
 <?php
 use Action\AbstractAction;
-// use LibModels\Wap\Product\SearchData;
-// use Plugin\DataProcess\ListProcess;
+use LibModels\Wap\Product\SearchData;
+use Plugin\DataProcess\ListProcess;
 use Plugin\Helpers;
 /**
@@ -39,6 +39,7 @@ class SearchController extends AbstractAction
             'shop' => FILTER_DEFAULT,
             'categoryId' => FILTER_DEFAULT,
             'subCategoryId' => FILTER_DEFAULT,
+            'title' => FILTER_DEFAULT,
             'query' => FILTER_DEFAULT,
             'brand' => FILTER_DEFAULT,
             'sort' => FILTER_DEFAULT,
@@ -151,13 +152,11 @@ class SearchController extends AbstractAction
         if ($isQueryFirstClass) {
             $this->setTitle('全部' . $query);
             $this->setNavHeader('全部' . $query, true, SITE_MAIN);
-        }
-        // 搜索是二级品类
+        } // 搜索是二级品类
         elseif ($isQuerySecondClass) {
             $this->setTitle($query);
             $this->setNavHeader($query, true, SITE_MAIN);
-        }
-        // 搜索其它内容
+        } // 搜索其它内容
         else {
             $from = $this->get('from');
             if ($haveQuery || $from) {
@@ -196,6 +195,11 @@ class SearchController extends AbstractAction
             $listData = array();
         }
+        if($condition['title']){
+            $this->setTitle($condition['title']);
+            $this->setNavHeader($condition['title'], true, SITE_MAIN);
+        }
+
         $this->_view->display('list', $data);
     }
@@ -254,8 +258,7 @@ class SearchController extends AbstractAction
             // 为了兼容现在运营在用的p_d
             if (isset($condition['p_d'])) {
                 $condition['p_d'] = rawurldecode($condition['p_d']);
-            }
-            // 转换折扣
+            } // 转换折扣
             elseif (isset($condition['discount'])) {
                 $condition['p_d'] = rawurldecode($condition['discount']);
                 unset($condition['discount']);
@@ -345,8 +348,7 @@ class SearchController extends AbstractAction
             // 为了兼容现在运营在用的p_d
             if (isset($condition['p_d'])) {
                 $condition['p_d'] = rawurldecode($condition['p_d']);
-            }
-            // 转换折扣
+            } // 转换折扣
             elseif (isset($condition['discount'])) {
                 $condition['p_d'] = rawurldecode($condition['discount']);
                 unset($condition['discount']);
--- a/yohobuy/m.yohobuy.com/application/models/Product/List.php
View file @a86b867
+++ b/yohobuy/m.yohobuy.com/application/models/Product/List.php
View file @a86b867
@@ -5,6 +5,7 @@ namespace Product;
 use Configs\CacheConfig;
 use LibModels\Wap\Category\ClassData;
 use LibModels\Wap\Category\BrandData;
+use LibModels\Wap\Product\ShopData;
 use Plugin\DataProcess\ListProcess;
 use Plugin\Helpers;
 use Plugin\Cache;
@@ -57,8 +58,7 @@ class ListModel
             // 接口调用异常时, 不害怕，从我们的二级缓存(slave)里再取数据.
             if (empty($result)) {
                 $result = Cache::get($key, 'slave');
-            }
-            // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
+            } // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
             else {
                 Cache::set($key, $result, 1800); // 缓存30分钟
             }
@@ -140,8 +140,7 @@ class ListModel
             // 接口调用异常时, 不害怕，从我们的二级缓存(slave)里再取数据.
             if (empty($result)) {
                 $result = Cache::get($key, 'slave');
-            }
-            // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
+            } // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
             else {
                 Cache::set($key, $result, 1800); // 缓存30分钟
             }
@@ -186,8 +185,7 @@ class ListModel
             // 接口调用异常时, 不害怕，从我们的二级缓存(slave)里再取数据.
             if (empty($result)) {
                 $result = Cache::get($key, 'slave');
-            }
-            // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
+            } // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
             else {
                 Cache::set($key, $result); // 缓存1小时
             }
@@ -233,8 +231,7 @@ class ListModel
             // 接口调用异常时, 不害怕，从我们的二级缓存(slave)里再取数据.
             if (empty($result)) {
                 $result = Cache::get($key, 'slave');
-            }
-            // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
+            } // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
             else {
                 Cache::set($key, $result); // 缓存1小时
             }
@@ -284,8 +281,7 @@ class ListModel
             // 接口调用异常时, 不害怕，从我们的二级缓存(slave)里再取数据.
             if (empty($result)) {
                 $result = Cache::get($key, 'slave');
-            }
-            // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
+            } // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
             else {
                 Cache::set($key, $result);
             }
@@ -335,8 +331,7 @@ class ListModel
             // 接口调用异常时, 不害怕，从我们的二级缓存(slave)里再取数据.
             if (empty($result)) {
                 $result = Cache::get($key, 'slave');
-            }
-            // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
+            } // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
             else {
                 Cache::set($key, $result);
             }
@@ -347,10 +342,11 @@ class ListModel
     /**
      * @param $data
+     * @param $shop_id
      * @return array 返回的处理好的数据
      * @author chengyao.guo
      */
-    public static function categoryData($data)
+    public static function categoryData($data , $shop_id)
     {
         $result = array();
         $result['class'] = array();
@@ -358,9 +354,13 @@ class ListModel
         foreach ($data as &$item) {
             array_push($result['class'], array('name' => $item['category_name']));
             foreach ($item['sub'] as &$item2) {
-                $item2['url'] = Helpers::url('/search/list',array(
-                    'shop' => '326'
-                )); // tar mark 还有其他参数
+                $item2['url'] = Helpers::url('/search/list', array(
+                    'shop' => $shop_id,
+                    'categoryId' => $item['category_id'],
+                    'subCategoryId' => $item2['category_id'],
+                    'title' => $item2['category_name'],
+                    'query' => $item2['category_name'],
+                ));
             }
             array_push($result['category'], array('subcategory' => $item['sub']));
         }
@@ -371,14 +371,19 @@ class ListModel
      * 店铺所有品牌信息处理
      * @author chengyao.guo
      * @param $data
+     * @param $shop_id
      * @return mixed
      */
-    public static function brandData($data)
+    public static function brandData($data,$shop_id)
     {
         // 处理图片链接
         foreach ($data as &$item) {
             $item['brand_ico'] = Images::getImageUrl($item['brand_ico'], 0, 0);
-            $item['url'] = Helpers::url('',array(),$item['brand_domain']);
+            $item['url'] = Helpers::url('/search/list', array(
+                'shop' => $shop_id,
+                'brand' => $item['brand_id'],
+                'title' => $item['brand_name'],
+            ));
         }
         return $data;
     }
--- a/yohobuy/m.yohobuy.com/application/modules/Product/controllers/Index.php
View file @a86b867
+++ b/yohobuy/m.yohobuy.com/application/modules/Product/controllers/Index.php
View file @a86b867
@@ -255,9 +255,8 @@ class IndexController extends AbstractAction
         $result = array();
         $resource = ShopData::getShopBrands($requestData['shop_id']);
         if($resource['code'] === 200){
-            $result = ListModel::brandData($resource['data']);
+            $result = ListModel::brandData($resource['data'],$requestData['shop_id']);
         }
-//        ShopData::debugOut($resource);
         if(Mobile::isMobile()){
             $this->setTitle('品牌');
         }else{
@@ -285,14 +284,13 @@ class IndexController extends AbstractAction
         $result = array();
         $resource = ShopData::getShopCategory($requestData['shop_id'], Helpers::getChannelByCookie(), Helpers::getGenderByCookie());
         if ($resource['code'] === 200) {
-            $result = ListModel::categoryData($resource['data']);
+            $result = ListModel::categoryData($resource['data'],$requestData['shop_id']);
         }
         if(Mobile::isMobile()){
             $this->setTitle('品类');
         }else{
             $this->setNavHeader('品类', true, SITE_MAIN);
         }
-//        ShopData::debugOut($resource);
         return $this->_view->display('category', array(
             'productCategoryPage' => true,
             'content' => $result,
@@ -322,7 +320,6 @@ class IndexController extends AbstractAction
         }else{
             $this->setNavHeader('店铺简介', true, SITE_MAIN);
         }
-//        ShopData::debugOut($resource);
         return $this->_view->display('intro', array(
             'content' => $result,
         ));