Merge branch 'master' of http://git.yoho.cn/fe/yohobuy-node

@@ -28,12 +28,13 @@
             {{{body}}}
         {{/if}}
         {{> footer}}
-        {{#if devEnv}}
-            <script src="//localhost:5002/libs.js"></script>
+        {{#if devEnv}}
+            <script src="//localhost:5002/libs.js"></script>
             <script src="//localhost:5002/{{module}}.{{page}}.js"></script>
-        {{^}}
-            <script src="//cdn.yoho.cn/yohobuy-node/{{version}}/libs.js"></script>
+        {{^}}
+            <script src="//cdn.yoho.cn/yohobuy-node/{{version}}/libs.js"></script>
             <script src="//cdn.yoho.cn/yohobuy-node/{{version}}/{{module}}.{{page}}.js"></script>
+            {{> analysis}}
         {{/if}}
     </body>
 </html>

+<!-- Google Tag Manager -->
+<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':
+            new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+            j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+            '//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);
+        })();
+    }
+    if (window.addEventListener) {
+        window.addEventListener('load', async_load, false);
+    } else if (window.attachEvent) {
+       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

@@ -56,7 +56,7 @@
     "uuid": "^2.0.2",
     "winston": "^2.2.0",
     "winston-daily-rotate-file": "^1.1.4",
-    "yoho-node-lib": "0.0.10"
+    "yoho-node-lib": "0.0.12"
   },
   "devDependencies": {
     "autoprefixer": "^6.3.6",