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

whb
Commit 71a9b3cfcbbe1e33255530ccf69d83ce2126382f 2 parents bf02b2e4 b15864f6
Showing 10 changed files with 139 additions and 117 deletions
library/WebPlugin/HelperSearch.php
template/www.yohobuy.com/actions/index/index/index.phtml
template/www.yohobuy.com/partials/layout/analysis.phtml
template/www.yohobuy.com/partials/layout/header.phtml
template/www.yohobuy.com/partials/layout/page-header.phtml
template/www.yohobuy.com/partials/layout/use.phtml
web-static/js/header.js
web-static/sass/home/_index-pliffy.scss
yohobuy/www.yohobuy.com/application/controllers/Common.php
yohobuy/www.yohobuy.com/application/models/Product/New.php
--- a/library/WebPlugin/HelperSearch.php
View file @71a9b3c
+++ b/library/WebPlugin/HelperSearch.php
View file @71a9b3c
@@ -191,19 +191,19 @@ class HelperSearch
                 $isSale = false;
             }
             $gender = 0;
-            if (isset(self::$options['gender'])) {
-                $genderArr = explode(',', self::$options['gender']);
+            if (isset(self::$params['gender'])) {
+                $genderArr = explode(',', self::$params['gender']);
                 $gender = $genderArr[0];
             }
             foreach($val['goods_list'] as $k => $v){
                 $goods_list[$k]['url'] = Helpers::getUrlBySkc($val['product_id'], $v['goods_id'], $val['cn_alphabet']);
-                //女封
-                if (isset($v['cover_1']) && $gender == 1) {
-                    $val['default_images'] = $v['images_url'];
-                }
                 //男封
-                if (isset($v['cover_2']) && $gender == 2) {
-                    $val['default_images'] = $v['images_url'];
+                if (isset($v['cover_1']) && !empty($v['cover_1'])  && $gender == 1) {
+                    $val['default_images'] = $v['cover_1'];
+                }
+                //女封
+                if (isset($v['cover_2']) && !empty($v['cover_2']) && $gender == 2) {
+                    $val['default_images'] = $v['cover_2'];
                 }
                 //筛选符合颜色条件的封面图片
                 if (isset($params['color']) && $params['color'] == $v['color_id']) {
@@ -232,6 +232,10 @@ class HelperSearch
                 'thumb' => $val['default_images'],
                 'name' => $val['product_name'],
                 'salePrice' => $val['sales_price'],
+                'brand' => array(
+                    'url' => Helpers::url('', '', $val['brand_domain']),
+                    'name' => $val['brand_name']
+                ),
                 'isFew' => $isFew,
                 'skn' => $val['product_skn'],
                 'showColBtn' => true,
@@ -492,7 +496,7 @@ class HelperSearch
                     $existName[] = $v['brand_name'];
                 }
                 if ($existBrandNum === 1){
-                    $existName[]= substr($v['brand_name'], 0, 3).'...';
+                    $existName[]= substr($v['brand_name'], 0, 4).'...';
                 }
                 $existBrandNum++;
             }
@@ -547,9 +551,30 @@ class HelperSearch
         if (self::checkSearch('brand')) {
             return array();
         }
-        //品牌数量小于等于10，隐藏更多按钮
-        $result['showMulti'] = count($result['brandsShow']) > 1 ? true :false;
-        $result['showMore'] = count($result['brandsShow']) > 10 ? true :false;
+        //品牌数量等于1,设置为已选中
+        $totalBrand = count($result['brandsShow']);
+        if ($totalBrand == 1) {
+            if (!in_array($totalBrand, $brandIds)) {
+                //设置已选中
+                self::$selected['brand'] = array(
+                    'name' => $result['brandsShow'][0]['name'],
+                    'href' => self::buildUrl($params, array('brand', $result['brandsShow'][0]['href']))
+                );
+                $result['default'][0]['checked'] = true;
+            }
+            if (self::$options['controller'] == 'Search') {
+                return array();
+            }
+        }
+        //品牌数量大于1小于10，显示多选
+        elseif ($totalBrand > 1 && $totalBrand < 10) {
+            $result['showMulti'] = true;
+        }
+        //品牌数量大于10，显示多选、更多按钮
+        else {
+            $result['showMulti'] = true;
+            $result['showMore'] = true;
+        }
         return $result;
     }
     /**
@@ -1380,7 +1405,12 @@ class HelperSearch
         $action = isset(self::$options['action']) ? strtolower(self::$options['action']) : '';
         //列表页面
         if ($controller == 'list' && $action == 'index') {
-            $type = isset(self::$params['msort']) && self::$params['msort'] ? self::$params['msort'] : '';
+            if (isset(self::$params['misort'])) {
+                $type = self::$params['misort'];
+            }
+            elseif (isset(self::$params['msort'])) {
+                $type = self::$params['msort'];
+            }
         }
         //新品到着
         elseif ($controller == 'list' && $action == 'new') {
--- a/template/www.yohobuy.com/actions/index/index/index.phtml
View file @71a9b3c
+++ b/template/www.yohobuy.com/actions/index/index/index.phtml
View file @71a9b3c
@@ -85,4 +85,5 @@
     {{/ newArrivls}}
 {{/ boys}}
 </div>
+<script>__custom = {"yopid":"index"};</script>
 {{> layout/footer}}
--- a/template/www.yohobuy.com/partials/layout/analysis.phtml
View file @71a9b3c
+++ b/template/www.yohobuy.com/partials/layout/analysis.phtml
View file @71a9b3c
@@ -2,6 +2,7 @@
 <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 <script>
 var _hmt = _hmt || [];
+var _gaq = _gaq || [];
 (function() {
     function async_load(){
         (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -10,6 +11,14 @@ var _hmt = _hmt || [];
             '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
         })(window,document,'script','dataLayer','GTM-W958MG');
         (function() {
+            _gaq.push(['_setAccount', 'UA-48997038-32']);
+            _gaq.push(['_trackPageview']);
+            var ga = document.createElement('script'); 
+            ga.type = 'text/javascript'; ga.async = true;
+            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+        })();
+        (function() {
             var hm = document.createElement("script");
             hm.src = "//hm.baidu.com/hm.js?c6ee7218b8321cb65fb2e98f284d8311";
             hm.async = 1;
@@ -30,6 +39,17 @@ var _hmt = _hmt || [];
             var s = document.getElementsByTagName("script")[0];
             s.parentNode.insertBefore(hm, s);
         })();
+        (function() {
+            var hm = document.createElement("script");
+            hm.src = "http://static.criteo.net/js/ld/ld.js";
+            hm.async = 1;
+            var s = document.getElementsByTagName("script")[0];
+            s.parentNode.insertBefore(hm, s);
+            var u = _ozuid || "";
+            u = (u == 0) ? "" : u;
+            window.criteo_q = window.criteo_q || [];
+            window.criteo_q.push({event: "setAccount", account: 16184 },{event: "setCustomerId", id: u},{event: "setSiteType", type: "d" },{event: "viewHome" });
+        })();
     }
     if (window.addEventListener) {
         window.addEventListener('load', async_load, false);
--- a/template/www.yohobuy.com/partials/layout/header.phtml
View file @71a9b3c
+++ b/template/www.yohobuy.com/partials/layout/header.phtml
View file @71a9b3c
@@ -10,6 +10,8 @@
     <title>{{title}}</title>
     <link rel="dns-prefetch" href="//cdn.yoho.cn">
     <link rel="dns-prefetch" href="//static.yohobuy.com">
+    <link rel="dns-prefetch" href="//img10.static.yhbimg.com">
+    <link rel="dns-prefetch" href="//img11.static.yhbimg.com">
     <link rel="dns-prefetch" href="//img12.static.yhbimg.com">
     <link rel="dns-prefetch" href="//img13.static.yhbimg.com">
 {{#if rlsEnv}}
--- a/template/www.yohobuy.com/partials/layout/page-header.phtml
View file @71a9b3c
+++ b/template/www.yohobuy.com/partials/layout/page-header.phtml
View file @71a9b3c
@@ -273,7 +273,7 @@
             \{\{/need_pay_gifts\}\}
         </ul>
         <ul class="activity-list">
-            \{{#equalone has_promotion\}\}
+            \{{#if has_promotion\}\}
             <li class="activity-item">
                 <span class="activity-name">活动</span>
                 <h3 class="activity-content">
@@ -286,13 +286,13 @@
                     \{\{/equalone\}\}
                 </h3>
             </li>
-            \{\{/equalone\}\}
-            \{\{#equalone fit_free_shipping \}\}
+            \{\{/if\}\}
+            \{\{#if fit_free_shipping \}\}
             <li  class="activity-item">
                 <span class="activity-name">免运费</span>
                 <h3 class="activity-content">全场满 ￥499免运费</h3>
             </li>
-            \{\{/equalone\}\}
+            \{\{/if\}\}
         </ul>
     </div>
     <div class="gobuy-notempty-footer">
@@ -317,7 +317,7 @@
                     <span class="has">\{\{vip.curYearCost\}\}</span>
                     <span class="total">\{\{vip.nextVipInfo.needCost\}\}</span>
                 </div>
-                <p class="\{\{#equalzero it.vip.curYearCostPer\}\}integrate\{\{/equalzero\}\}" style="width: \{\{vip.curYearCostPer\}\}%;"></p>
+                <p class="\{\{#unless vip.curYearCostPer\}\}integrate\{\{/unless\}\}" style="width: \{\{vip.curYearCostPer\}\}%;"></p>
             </div>
             <span class="cardcate float-left">\{\{vip.nextVipInfo.title\}\}</span>
         </div>
@@ -360,5 +360,6 @@
       </div>
     </script>
 </div>
+<input id="api-domain" type="hidden" value="{{apiDomain}}">
 {{/headerdata}}
--- a/template/www.yohobuy.com/partials/layout/use.phtml
View file @71a9b3c
+++ b/template/www.yohobuy.com/partials/layout/use.phtml
View file @71a9b3c
@@ -3,43 +3,39 @@
 </script>
 {{!-- 正常头部 --}}
 {{#headerdata}}
-    <script>
+<script>
     seajs.use('js/header');
-    </script>
+</script>
 {{/headerdata}}
 {{!-- 简单头部 --}}
 {{#simpleHeader}}
-    <script>
+<script>
     seajs.use('js/simple-header');
-    </script>
+</script>
 {{/simpleHeader}}
 {{!-- 首页 --}}
 {{#if boysHomePage}}
-    <script>
+<script>
     seajs.use('js/home/home');
-    </script>
+</script>
 {{/if}}
-
 {{!-- 搜索 --}}
 {{#if searchListPage}}
-    <script>
+<script>
     seajs.use('js/product/brand');
     seajs.use(['js/product/list', 'js/product/product'], function (list, product) {
-
         product.init(5);
         window.onresize = function () {
             setTimeout(function () {
                 product.init(5);
             }, 300);
         };
-
     });
-    </script>
+</script>
 {{/if}}
-
 {{!-- 列表 --}}
 {{#if productListPage}}
-    <script>
+<script>
     seajs.use(['js/product/list', 'js/product/product'], function (list, product) {
         product.init(4);
@@ -50,98 +46,84 @@
         };
     });
-    </script>
+</script>
 {{/if}}
-
 {{!-- 商品详情页 --}}
 {{#if productDetailPage}}
-    <script>
+<script>
     seajs.use('js/product/item');
-    </script>
+</script>
 {{/if}}
-
 {{!-- 逛 --}}
 {{#if guangIndexPage}}
-    <script>
+<script>
     seajs.use('js/guang/index');
-    </script>
+</script>
 {{/if}}
-
 {{!-- 逛详情页 --}}
 {{#if guangDetailPage}}
-    <script>
+<script>
     seajs.use('js/guang/detail');
-    </script>
+</script>
 {{/if}}
-
 {{!-- 逛列表页 --}}
 {{#if guangListPage}}
-    <script>
+<script>
     seajs.use('js/guang/list');
-    </script>
+</script>
 {{/if}}
-
 {{!-- SALE --}}
 {{#if saleIndexPage}}
-    <script>
+<script>
     seajs.use('js/sale/index');
-    </script>
+</script>
 {{/if}}
-
 {{!-- sale列表 --}}
 {{#if saleListPage}}
 <script>
     seajs.use(['js/product/list', 'js/product/product', 'js/sale/banner'], function (list, product) {
-
         product.init(4);
         window.onresize = function () {
             setTimeout(function () {
                 product.init(4);
             }, 300);
         };
-
     });
 </script>
 {{/if}}
-
 {{!-- sale 分类列表 --}}
 {{#if saleCatPage}}
 <script>
     seajs.use(['js/product/list', 'js/product/product', 'js/sale/banner'], function (list, product) {
-
         product.init(4);
         window.onresize = function () {
             setTimeout(function () {
                 product.init(4);
             }, 300);
         };
-
     });
 </script>
 {{/if}}
-
 {{!-- 登录注册找回密码--}}
 {{#if loginPage}}
-    <script>
+<script>
     seajs.use('js/passport/login');
-    </script>
+</script>
 {{/if}}
 {{!-- 第三方绑定--}}
 {{#if thirdLogin}}
-    <script>
+<script>
     seajs.use('js/passport/thirdlogin');
-    </script>
+</script>
 {{/if}}
-
 {{!-- 注册页--}}
 {{#if registerPage}}
-    <script>
+<script>
     seajs.use('js/passport/reg', function (reg) {
         reg.init('reg');
     });
-    </script>
+</script>
 {{/if}}
-
 {{!-- 第三方登录完善信息页--}}
 {{#if thirdPage}}
 <script>
@@ -150,43 +132,39 @@
     });
 </script>
 {{/if}}
-
 {{!-- 找回密码--}}
 {{#if backPage}}
-    <script>
+<script>
     seajs.use('js/passport/back');
-    </script>
+</script>
 {{/if}}
-
 {{!-- 重置密码--}}
 {{#if resetPage}}
-    <script>
+<script>
     seajs.use('js/passport/reset');
-    </script>
+</script>
 {{/if}}
-
 {{!-- 验证手机 --}}
 {{#if vertificationPage}}
-    <script>
+<script>
     seajs.use('js/passport/vertification');
-    </script>
+</script>
 {{/if}}
-
 {{!-- 热销排行--}}
 {{#if hotrankPage}}
-    <script>
+<script>
     seajs.use('js/product/hotrank');
-    </script>
+</script>
 {{/if}}
 {{!-- 品牌页 --}}
 {{#if brandsHomePage}}
-    <script>
+<script>
     seajs.use('js/brand/index');
-    </script>
+</script>
 {{/if}}
 {{!-- 订单保存--}}
 {{#if orderSavePage}}
-    <script>
+<script>
     seajs.use('js/order/save');
-    </script>
+</script>
 {{/if}}
--- a/web-static/js/header.js
View file @71a9b3c
+++ b/web-static/js/header.js
View file @71a9b3c
@@ -8,7 +8,7 @@ var handlebars = require('yoho.handlebars');
 var json2 = require('json2');
 var vipInfoCombine = null; //用户信息编译模板
 var loginInfoCombine = null; //登录信息编译模板
-var apiDomain = 'http://test.open.yohobuy.com/'; //获取数据的地址http://api.open.yohobuy.com
+var apiDomain = $('#api-domain').val(); //获取数据的地址
 var cartTpl = ''; //购物车模板
 /**
  * 搜寻的时候过滤非法字符（+-/:等非法字符单独出现）
@@ -65,6 +65,8 @@ var bannerMap = {
 };
 var cookieMap = {};
+$('#api-domain').remove(); //删除信息表单
+
 function getSource(column, postition, event) {
     try {
         dataLayer.push({
--- a/web-static/sass/home/_index-pliffy.scss
View file @71a9b3c
+++ b/web-static/sass/home/_index-pliffy.scss
View file @71a9b3c
@@ -120,7 +120,7 @@
         }
         .tpl-brands{
             width: 378px;
-            height: 504px;
+            height: 512px;
             li a{
                 height: 248px;
             }
--- a/yohobuy/www.yohobuy.com/application/controllers/Common.php
View file @71a9b3c
+++ b/yohobuy/www.yohobuy.com/application/controllers/Common.php
View file @71a9b3c
 <?php
+
 use Action\WebAction;
 use Index\HomeModel;
 use Configs\WebCacheConfig;
@@ -31,8 +32,8 @@ class CommonController extends WebAction
             $key = WebCacheConfig::KEY_WEB_INDEX_BRANDS_LIST_DATA . '_' . $type;
             // array('logoBrand'=>'','moreBrand'=>'')
             $data = Cache::get($key);
-        } 
-        while (false);
+            
+        } while (false);
         $this->echoJson($data);
     }
@@ -49,7 +50,7 @@ class CommonController extends WebAction
         $result = array();
         do {
             /* 判断是不是AJAX请求 */
-            if (! $this->isAjax()) {
+            if (!$this->isAjax()) {
                 break;
             }
             $channels = array(
@@ -61,7 +62,7 @@ class CommonController extends WebAction
             $channel = $this->post('type', '');
             $pageIndex = (int) $this->post('pageIndex', 0);
             $pageCount = (int) $this->post('pageCount', 8);
-            if (! in_array($channel, $channels)) {
+            if (!in_array($channel, $channels)) {
                 break;
             }
@@ -98,43 +99,34 @@ class CommonController extends WebAction
      */
     public function getbannerAction()
     {
-        $url = 'http://service.api.yohobuy.com/operations/api/v4/resource/get?';
-        $content_code = $this->get('content_code', '');
-        $client_type = $this->get('client_type', 'web');
+        $contentCode = $this->get('content_code', '');
         $callback = $this->get('callback', '');
         $width = $this->get('width', '');
         $height = $this->get('height', '');
-        $params = array(
-                'content_code' => $content_code, 
-                'client_type' => $client_type
-        );
-        $data = IndexData::getResourceData($content_code);//Yohobuy::get($url.http_build_query($params));
-        if(empty($data['data']))
-        {
+        
+        $data = IndexData::getResourceData($contentCode);
+        if (empty($data['data'])) {
             return $this->helpJsonCallbackResult($callback, 200, '没有数据', '');
-        }
-        else 
-        {
+        } else {
             $banner = '';
-            if(isset($data['data'][0]['data']))
-            {
-                if($data['data'][0]['template_name'] == 'single_image') {
+            if (isset($data['data'][0]['data'])) {
+                if ($data['data'][0]['template_name'] == 'single_image') {
                     $banner = current($data['data'][0]['data']);
-                } else if($data['data'][0]['template_name'] == 'single_name_image') {
+                } else if ($data['data'][0]['template_name'] == 'single_name_image') {
                     $banner = $data['data'][0]['data'];
                 }
-                if(!empty($banner)) {
-                    if(empty($width) || empty($height) ) {
-                          $width = 2600;//通栏广告
+                if (!empty($banner)) {
+                    if (empty($width) || empty($height)) {
+                        $width = 2600; //通栏广告
                         $height = 60;
                     }
-                    $banner['src'] = Images::getImageUrl($banner['src'], $width, $height ,2);
+                    $banner['src'] = Images::getImageUrl($banner['src'], $width, $height, 2);
                     //str_replace('?imageView/{mode}/w/{width}/h/{height}', '', $banner['src']);
                 }
             }
-        }
             return $this->helpJsonCallbackResult($callback, $data['code'], $data['message'], $banner);
         }
+    }
     /**
      * 获取邮件订阅
@@ -148,7 +140,7 @@ class CommonController extends WebAction
         $uid = intval($this->get('uid', '0'));
         $data = array();
         //验证邮件
-        if(Helpers::verifyEmail($email)) {
+        if (Helpers::verifyEmail($email)) {
             $data = IndexData::emailSubscriber($email, $uid);
             return $this->helpJsonCallbackResult($callback, $data['code'], $data['message'], $data['data']);
         } else {
@@ -168,7 +160,7 @@ class CommonController extends WebAction
         $question_id = intval($this->get('question_id', 0));
         $answer = trim($this->get('answer'));
         $solution = intval($this->get('solution', 0));
-        if(!empty($feedback_id) || !empty($question_id) || !empty($answer) || !empty($solution)) {
+        if (!empty($feedback_id) || !empty($question_id) || !empty($answer) || !empty($solution)) {
             $data = IndexData::suggestFeedback($feedback_id, $question_id, $answer, $solution);
             return $this->helpJsonCallbackResult($callback, $data['code'], $data['message'], $data['data']);
         } else {
@@ -179,7 +171,6 @@ class CommonController extends WebAction
     /*
      * 简单头部
      */
-
     public function getSimpleHeaderAction()
     {
         $result = array();
@@ -190,12 +181,11 @@ class CommonController extends WebAction
             }
             //获取用户
-            $uid = $this->getUid(true);
+            $uid = $this->getUid(false);
             if (!$uid) {
                 $isLogin = false;
                 $username = '';
-            }
-            else {
+            } else {
                 $isLogin = true;
                 $username = $this->_uname;
             }
@@ -212,8 +202,7 @@ class CommonController extends WebAction
                     'userCenter' => Helpers::url('/home?t=' . time()), //用户中心链接
                     'logout' => Helpers::url('/logout.html?t=' . time()), //退出
                 );
-            }
-            else {
+            } else {
                 $tool+=array(
                     'login' => Helpers::url('/signin.html'), //登录链接，已登录不传
                     'register' => Helpers::url('/reg.html'), //注册链接，已登录不传
@@ -233,8 +222,7 @@ class CommonController extends WebAction
                 'code' => 200,
                 'data' => $simpleHeader
             );
-        }
-        while (false);
+        } while (false);
         $this->echoJson($result);
     }
--- a/yohobuy/www.yohobuy.com/application/models/Product/New.php
View file @71a9b3c
+++ b/yohobuy/www.yohobuy.com/application/models/Product/New.php
View file @71a9b3c
@@ -21,7 +21,7 @@ class NewModel
         // 组合搜索商品url
         $urlList['product'] = SearchData::getProductUrl($searchCondition['condition']);
         // 组合搜索分类url
-        $urlList['sort'] = SearchData::getClassesUrl($searchCondition['sortCondition']);
+        $urlList['sort'] = SearchData::getClassesUrl();
         // 组合搜索最新上架url
         $urlList['recent'] = SearchData::getRecentShelveUrl($searchCondition['condition']);