Merge branch 'feature/cartNum' into release/5.2

@@ -75,18 +75,4 @@
     }
     window.addEventListener('load', async_load, false);
 </script>
-<script>
-    window._py = window._py||[];
-    window._py.push(['a', 'MC..o8vMMWxEXDCiqYckD81lUX']);
-    window._py.push(['domain','stats.ipinyou.com']);
-    window._py.push(['e','']);
-    if(typeof _goodsData!='undefined'){
-        window._py.push(['pi',_goodsData]);
-    }
-    -function(d){
-        var f = 'https:' == d.location.protocol;var c = d.createElement('script');c.type='text/javascript';c.async=1;
-        c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js';
-        var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
-    }(document);
-</script>
 </html>
\ No newline at end of file

@@ -93,18 +93,4 @@
     }
     window.addEventListener('load', async_load, false);
 </script>
-<script>
-    window._py = window._py||[];
-    window._py.push(['a', 'MC..o8vMMWxEXDCiqYckD81lUX']);
-    window._py.push(['domain','stats.ipinyou.com']);
-    window._py.push(['e','']);
-    if(typeof _goodsData!='undefined'){
-        window._py.push(['pi',_goodsData]);
-    }
-    -function(d){
-        var f = 'https:' == d.location.protocol;var c = d.createElement('script');c.type='text/javascript';c.async=1;
-        c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js';
-        var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
-    }(document);
-</script>
 </html>
\ No newline at end of file

@@ -107,18 +107,4 @@
     }
     window.addEventListener('load', async_load, false);
 </script>
-<script>
-    window._py = window._py||[];
-    window._py.push(['a', 'MC..o8vMMWxEXDCiqYckD81lUX']);
-    window._py.push(['domain','stats.ipinyou.com']);
-    window._py.push(['e','']);
-    if(typeof _goodsData!='undefined'){
-        window._py.push(['pi',_goodsData]);
-    }
-    -function(d){
-        var f = 'https:' == d.location.protocol;var c = d.createElement('script');c.type='text/javascript';c.async=1;
-        c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js';
-        var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
-    }(document);
-</script>
 </html>
\ No newline at end of file

+<?php
+/**
+ * Created by PhpStorm.
+ * User: sefon
+ * Date: 16/11/14
+ * Time: 下午2:15
+ */
\ No newline at end of file

@@ -191,7 +191,7 @@ class OrderData
         $param['client_secret'] = Sign::getSign($param);
 
         // 调用接口获得数据
-        return Yohobuy::get(API_URL, $param);
+        return Yohobuy::get(API_URL, $param, 3600);
     }
 
     /**

@@ -757,8 +757,6 @@ class Helpers
                 
                 // 分析用: 商品ID列表
                 $analysis['ids'][] = $value['product_id'];
-                // 分析用: 品友
-                $analysis['ipinyou'] .= $value['product_skn'] . ',' . $value['buy_number'] . ';';//iponyou变更为skn
                 // 分析用: CRITEO
                 $analysis['criteo'][] = array(
                     'id' => $value['product_skn'],
@@ -769,8 +767,6 @@ class Helpers
             else {
                 // 分析用: 商品ID列表
                 $analysis['ids'][] = $value['product_id'];
-                // 分析用: 品友
-                $analysis['ipinyou'] .= $value['product_skn'] . ',' . $value['buy_number'] . ';';
                 // 分析用: CRITEO
                 $analysis['criteo'][] = array(
                     'id' => $value['product_skn'],

@@ -377,12 +377,4 @@ _mvq.push(['$logConversion']);
 _mvq.push(['$addItem', '', /*商品id*/ '{{cartEnsure.ids}}', '', '']);
 _mvq.push(['$logData']);
 </script>
-<script>
-!function(w,d,e){
-var _money='{{cartEnsure.ipinyouAmount}}';
-var _productList='{{cartEnsure.ipinyou}}';
-var b=location.href,c=d.referrer,f,s,g=d.cookie,h=g.match(/(^|;)\s*ipycookie=([^;]*)/),i=g.match(/(^|;)\s*ipysession=([^;]*)/);if (w.parent!=w){f=b;b=c;c=f;};u='//stats.ipinyou.com/cvt?a='+e('MC.Ok.7NFMIlCH_F_LE2riRlF2r_')+'&c='+e(h?h[2]:'')+'&s='+e(i?i[2].match(/jump\%3D(\d+)/)[1]:'')+'&u='+e(b)+'&r='+e(c)+'&rd='+(new Date()).getTime()+'&Money='+e(_money)+'&ProductList='+e(_productList)+'&e=';
-function _(){if(!d.body){setTimeout(_(),100);}else{s= d.createElement('script');s.src = u;d.body.insertBefore(s,d.body.firstChild);}}_();
-}(window,document,encodeURIComponent);
-</script>
 {{> layout/footer}}
\ No newline at end of file

@@ -62,9 +62,6 @@
     {{/ shoppingpay}}
 </div>
 
-{{!-- 品有统计代码 --}}
-{{> shopping/pinyou-analysis}}
-
 {{!-- criteo统计代码 --}}
 {{> pay/pay-analysis}}
 

@@ -148,7 +148,4 @@
     {{> shopping/box-buy-analysis}}
 {{/ shoppingpay}}
 
-{{!-- 品有统计代码 --}}
-{{> shopping/pinyou-analysis}}
-
 {{> layout/footer}}

@@ -26,9 +26,6 @@
 </script>
 {{/shoppingpay}}
 
-{{!-- 品有统计代码 --}}
-{{> shopping/pinyou-analysis}}
-
 {{!-- criteo统计代码 --}}
 {{> pay/pay-analysis}}
 

@@ -31,18 +31,4 @@ var _gaq = _gaq || [];
        window.attachEvent('onload', async_load);
     }
 })();
-</script>
-<script>
-    window._py = window._py||[];
-    window._py.push(['a', 'MC..o8vMMWxEXDCiqYckD81lUX']);
-    window._py.push(['domain','stats.ipinyou.com']);
-    window._py.push(['e','']);
-    if(typeof _goodsData!='undefined'){
-        window._py.push(['pi',_goodsData]);
-    }
-    -function(d){
-        var f = 'https:' == d.location.protocol;var c = d.createElement('script');c.type='text/javascript';c.async=1;
-        c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js';
-        var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
-    }(document);
 </script>
\ No newline at end of file

@@ -144,7 +144,7 @@
                 </div>
                 <div class="gobuy float-left {{gobytype}}" id="miniCartBox">
 
-                    <span class="ic-infomation">0</span>
+                    <span class="ic-infomation hide">0</span>
                     <div class="gobuy-wrapper"></div>
 
                 </div>

-{{# pinyou}}
-<script>
-!function(w,d,e){
-var _orderno='{{orderNum}}';
-var _money='{{count}}';
-var _productList='{{productList}}';
-var b=location.href,c=d.referrer,f,s,g=d.cookie,h=g.match(/(^|;)\s*ipycookie=([^;]*)/),i=g.match(/(^|;)\s*ipysession=([^;]*)/);if (w.parent!=w){f=b;b=c;c=f;};u='//stats.ipinyou.com/cvt?a='+e('MC.2z.Rg-AQqSqQi2GykX12LUxI0')+'&c='+e(h?h[2]:'')+'&s='+e(i?i[2].match(/jump\%3D(\d+)/)[1]:'')+'&u='+e(b)+'&r='+e(c)+'&rd='+(new Date()).getTime()+'&OrderNo='+e(_orderno)+'&Money='+e(_money)+'&ProductList='+e(_productList)+'&e=';
-function _(){if(!d.body){setTimeout(_(),100);}else{s= d.createElement('script');s.src = u;d.body.insertBefore(s,d.body.firstChild);}}_();
-}(window,document,encodeURIComponent);
-</script>
-{{/ pinyou}}
\ No newline at end of file

@@ -156,6 +156,8 @@ function actionGoodsCart() {
     var text = '';
 
     $.fn.miniCart = function(options) {
+        var $cartNum = $(params.cartNum);
+
         params = $.extend(defaults, options);
         if (typeof window.cookie(params.cookie) === 'undefined') {
             cartInfo = null;
@@ -177,8 +179,10 @@ function actionGoodsCart() {
             } else {
                 $('#icart-num').attr('class', 'icart-num');
             }
-            $(params.cartNum).html(totalNum);
+            $cartNum.html(totalNum);
         }
+
+        totalNum ? $cartNum.removeClass('hide') : $cartNum.addClass('hide');
     };
     $.fn.search = function(searchDomain) {
 

 {
   "name": "web-yohobuy",
-  "version": "5.1.0",
+  "version": "5.1.3",
   "description": "web yohobuy static",
   "keywords": [],
   "homepage": "",

@@ -42,7 +42,7 @@ class CartModel
         $result = array();
 
         // 存放分析用的数据
-        $analysisData = array('ipinyou' => '');
+        $analysisData = array();
 
         do {
             $result['isEmpty'] = false;
@@ -200,8 +200,6 @@ class CartModel
 
         // 增加第三方分析用的数据
         $result['ids'] = empty($analysisData['ids']) ? '' : implode(',', $analysisData['ids']);
-        $result['ipinyou'] = empty($analysisData['ipinyou']) ? '' : $analysisData['ipinyou'];
-        $result['ipinyouAmount'] = isset($result['productAllA']) ? $result['productAllA'] : '0.00';
         $result['criteo'] = empty($analysisData['criteo']) ? "''" : json_encode($analysisData['criteo']);
 
         return $result;
@@ -707,7 +705,7 @@ class CartModel
     private static function filterCartPay($pay, $cartType, $isAdvanceCart, $uid)
     {
         // 存放分析用的数据
-        $analysisData = array('ipinyou' => '');
+        $analysisData = array();
         $result = array();
 
         do {

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "5.1.0"
+application.version = "5.1.3"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "5.1.0"
+application.version = "5.1.3"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "5.1.0"
+application.version = "5.1.3"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

@@ -50,7 +50,7 @@ application.template.ext = ".phtml"
 application.assets.path = ROOT_PATH "/assets/web"
 
 ; 应用的版本号
-application.version = "5.1.0"
+application.version = "5.1.3"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!BUY 有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"