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

+{{> layout/header}}
+    <div class="channel-page yoho-page">
+        {{> home/channel}}
+    </div>
+{{> layout/footer}}

+{{# content}}
+    {{! 头部banner}}
+    {{# bannerTop}}
+        {{> home/banner_top}}
+    {{/ bannerTop}}
+    {{! 图标入口}}
+    {{# iconsEnter}}
+        {{> home/icons_enter}}
+    {{/ iconsEnter}}
+    {{! 首页公告}}
+    {{# notice}}
+        {{> home/notice}}
+    {{/ notice}}
+    {{! 中间banner}}
+    {{# banner}}
+        {{> home/banner}}
+    {{/ banner}}
+    {{! 两个小图}}
+    {{# smallPic}}
+        {{> home/thumb_row}}
+    {{/ smallPic}}
+    {{! 热门品类}}
+    {{# hotCategory}}
+        {{> home/hot_category}}
+    {{/ hotCategory}}
+    {{! 热门品牌}}
+    {{# hotBrands}}
+        {{> home/hot_brands_list}}
+    {{/ hotBrands}}
+    {{! 热门品牌可滑动}}
+    {{# hotBrandsScroll}}
+        {{> home/hot_brands_swipe}}
+    {{/ hotBrandsScroll}}
+    {{! 潮人搭配}}
+    {{# trendColloaction}}
+        {{> home/trendsetter_collocation}}
+    {{/trendColloaction}}
+    {{! 潮流话题}}
+    {{# trendTopics}}
+        {{> home/trend_topics}}
+    {{/ trendTopics}}
+    {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装}}
+    {{# goodsCategory}}
+        {{> home/goods_category}}
+    {{/ goodsCategory}}
+    {{! 新入住品牌/品味生活/创意生活}}
+    {{# creativeLife}}
+       {{> home/creative_life}}
+    {{/ creativeLife}}
+    {{! PLUS}}
+    {{# plusStar}}
+        {{> home/plus_star}}
+    {{/ plusStar}}
+{{/ content}}
+
+{{! 可能喜欢}}
+{{> home/maybe_like}}

@@ -41,7 +41,7 @@ class HfController extends AbstractAction
      *   patchv         当前补丁的版本号，没有就传空            string	"100"
      *   filecode       md5(md5(文件内容) + "yohopatch2016")    string	"1233321121212332"
      * ]
-     * echo md5(file_get_contents('http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.1/main-4.js')); exit;
+     * echo md5(file_get_contents('http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.1/main-6.js')); exit;
      */
     public function v1Action()
     {
@@ -51,13 +51,10 @@ class HfController extends AbstractAction
         $version = $this->post('app_version');
         switch ($version) {
             case '4.0.1': // 版本
-                $uid = $this->post('uid');
-                if ($uid == 5448919) {
-                    $result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.1/main-5.js';
-                    $result['data']['patchv'] = '104';
-                    $result['data']['filecode'] = md5('cf2e3b73963de5c0d538192ea8779458' . 'yohopatch2016');
-                    $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));
-                }
+                $result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.1/main-7.js';
+                $result['data']['patchv'] = '105';
+                $result['data']['filecode'] = md5('a12c558bb96e1ef27963ab6f74cc7dc3' . 'yohopatch2016');
+                $result['md5'] = md5(self::PRIVATE_KEY . ':' . json_encode($result['data']));
                 break;
             case '4.0.0': // 版本
                 $result['data']['url'] = 'http://cdn.yoho.cn/app-hotfix/yohobuy/4.0.0/main2.js';