Merge branch 'master' into hotfix/shopBetter

@@ -155,16 +155,11 @@ class PlusstarData
                     if (isset($getUidBrandFav['code']) && $getUidBrandFav['code'] == 200) {
                     if (isset($getUidBrandFav['code']) && $getUidBrandFav['code'] == 200) {
                         $cached['getUidBrandFav'] = true;
                         $cached['getUidBrandFav'] = true;
                     }else{
                     }else{
-                        $getUidBrandFavResult = false;
+                        $cached['getUidBrandFav'] = false;
                     }
                     }
 
 
                 }
                 }
-            }else{
-                $getUidBrandFavResult = false;
-            }
 
 
-            if (!empty($cached)) {
-                $cached['getUidBrandFav'] = $getUidBrandFavResult;
                 return $cached;
                 return $cached;
             }
             }
         }
         }
@@ -177,14 +172,18 @@ class PlusstarData
         $param['client_secret'] = Sign::getSign($param);
         $param['client_secret'] = Sign::getSign($param);
         $brandInfo = Yohobuy::get(SERVICE_URL . self::URI_BRANDINFO_PLUSSTAR_NEW . 'getbrandinfo', $param, 3600);
         $brandInfo = Yohobuy::get(SERVICE_URL . self::URI_BRANDINFO_PLUSSTAR_NEW . 'getbrandinfo', $param, 3600);
 
 
-        if (!isset($brandInfo['data']['brand_id'])) {
-            // 再尝试获取二级缓存(master), 有数据则直接返回.
-            $cached = Cache::get($key, 'slave');
-            if (!empty($cached)) {
-                return $cached;
-            }
-            return $result;
-        } else {
+//        if (!isset($brandInfo['data']['brand_id'])) {
+//            // 再尝试获取二级缓存(master), 有数据则直接返回.
+//            $cached = Cache::get($key, 'slave');
+//            if (!empty($cached)) {
+//                return $cached;
+//            }
+//            return $result;
+//        } else {
+//            $result['getBrandInfo'] = $brandInfo;
+//        }
+
+        if (isset($brandInfo['data']['brand_id'])) {
             $result['getBrandInfo'] = $brandInfo;
             $result['getBrandInfo'] = $brandInfo;
         }
         }
 
 

 {
 {
   "name": "yohobuy",
   "name": "yohobuy",
-  "version": "4.9.20",
+  "version": "4.9.22",
   "description": "yohobuy statics",
   "description": "yohobuy statics",
   "keywords": [],
   "keywords": [],
   "homepage": "",
   "homepage": "",

@@ -91,7 +91,7 @@
                     {{! 热门品类}}
                     {{! 热门品类}}
                     <div class="first">
                     <div class="first">
                     {{# hotCategory}}
                     {{# hotCategory}}
-                        {{> home/hot_category}}
+                        {{> product/hot_category}}
                     {{/ hotCategory}}
                     {{/ hotCategory}}
                     </div>
                     </div>
 
 

@@ -74,7 +74,7 @@
 
 
                     {{! 热门品类}}
                     {{! 热门品类}}
                     {{# hotCategory}}
                     {{# hotCategory}}
-                        {{> home/hot_category}}
+                        {{> product/hot_category}}
                     {{/ hotCategory}}
                     {{/ hotCategory}}
 
 
                     <div class="popularity-title">
                     <div class="popularity-title">

@@ -14,7 +14,6 @@
                     <img src="{{img}}" alt="">
                     <img src="{{img}}" alt="">
                 </div>
                 </div>
             </a>
             </a>
-            <div class="img-cover">{{name}}</div>
         </li>
         </li>
         {{/ list}}
         {{/ list}}
     </ul>
     </ul>

+<div class="hot-category">
+    {{> home/floor_header}}
+    
+    {{# banner}}
+    <a class="category-banner" href="{{url}}">
+        <img class="lazy" data-original="{{img}}">
+    </a>
+    {{/ banner}}
+    <ul class="category-list clearfix">
+        {{# list}}
+        <li data-bp-id="shop_hotcategory_{{img}}_0" class="buriedpoint">
+            <a href="{{url}}">
+                <div class="img-box">
+                    <img src="{{img}}" alt="">
+                </div>
+            </a>
+            <div class="img-cover">{{name}}</div>
+        </li>
+        {{/ list}}
+    </ul>
+</div>

@@ -89,7 +89,7 @@ class IndexModel
             }
             }
             $data['guang']['infos'][] = $build;
             $data['guang']['infos'][] = $build;
         }
         }
-        print_r($data['guang']['infos']);
+        //print_r($data['guang']['infos']);
 
 
         // 分页需要参数
         // 分页需要参数
         $data['guang']['gender'] = $gender;
         $data['guang']['gender'] = $gender;
@@ -190,6 +190,7 @@ class IndexModel
 
 
         // 内容列表
         // 内容列表
         if (!empty($article['data']['list']['artList'])) {
         if (!empty($article['data']['list']['artList'])) {
+
             foreach ($article['data']['list']['artList'] as $value) {
             foreach ($article['data']['list']['artList'] as $value) {
                 $data['guang']['infos'][$curIndex]['info'][] = Helpers::formatArticle($value, true, false, true);
                 $data['guang']['infos'][$curIndex]['info'][] = Helpers::formatArticle($value, true, false, true);
             }
             }
@@ -214,7 +215,7 @@ class IndexModel
         $category = array();
         $category = array();
         $article = array();
         $article = array();
 
 
-        
+        //print_r($data);
         return $data;
         return $data;
     }
     }
 
 

@@ -24,12 +24,8 @@ class IndexController extends AbstractAction
         $this->setTitle('逛');
         $this->setTitle('逛');
         $this->setNavHeader('逛', true, SITE_MAIN);
         $this->setNavHeader('逛', true, SITE_MAIN);
 
 
-        // $uid = $this->getUid();
         $udid = $this->getUdid();
         $udid = $this->getUdid();
 
 
-        $uid = 8039759;
-        //$udid = P_YDoclyC4l9GWC9gScyTpbMiWnQpaYA;
-
         $type = $this->get('id', 0);
         $type = $this->get('id', 0);
         $gender = $this->get('gender');
         $gender = $this->get('gender');
         if (is_string($gender)) {
         if (is_string($gender)) {

@@ -19,8 +19,8 @@ class InfoController extends AbstractAction
      */
      */
     public function indexAction()
     public function indexAction()
     {
     {
-        //$id = $this->get('id');
-        $id= 34282;
+        $id = $this->get('id');
+        // $id= 34282;
 
 
         // 判断参数是否有效, 无效会跳转到错误页面
         // 判断参数是否有效, 无效会跳转到错误页面
         if (!is_numeric($id)) {
         if (!is_numeric($id)) {

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 application.assets.path = ROOT_PATH "/assets"
 
 
 ; 应用的版本号
 ; 应用的版本号
-application.version = "4.9.20"
+application.version = "4.9.22"
 
 
 ; 网站SEO信息
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 application.assets.path = ROOT_PATH "/assets"
 
 
 ; 应用的版本号
 ; 应用的版本号
-application.version = "4.9.20"
+application.version = "4.9.22"
 
 
 ; 网站SEO信息
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 application.assets.path = ROOT_PATH "/assets"
 
 
 ; 应用的版本号
 ; 应用的版本号
-application.version = "4.9.20"
+application.version = "4.9.22"
 
 
 ; 网站SEO信息
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets"
 application.assets.path = ROOT_PATH "/assets"
 
 
 ; 应用的版本号
 ; 应用的版本号
-application.version = "4.9.20"
+application.version = "4.9.22"
 
 
 ; 网站SEO信息
 ; 网站SEO信息
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"