Authored by biao

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

@@ -28,12 +28,13 @@ @@ -28,12 +28,13 @@
28 {{{body}}} 28 {{{body}}}
29 {{/if}} 29 {{/if}}
30 {{> footer}} 30 {{> footer}}
31 - {{#if devEnv}}  
32 - <script src="//localhost:5002/libs.js"></script> 31 + {{#if devEnv}}
  32 + <script src="//localhost:5002/libs.js"></script>
33 <script src="//localhost:5002/{{module}}.{{page}}.js"></script> 33 <script src="//localhost:5002/{{module}}.{{page}}.js"></script>
34 - {{^}}  
35 - <script src="//cdn.yoho.cn/yohobuy-node/{{version}}/libs.js"></script> 34 + {{^}}
  35 + <script src="//cdn.yoho.cn/yohobuy-node/{{version}}/libs.js"></script>
36 <script src="//cdn.yoho.cn/yohobuy-node/{{version}}/{{module}}.{{page}}.js"></script> 36 <script src="//cdn.yoho.cn/yohobuy-node/{{version}}/{{module}}.{{page}}.js"></script>
  37 + {{> analysis}}
37 {{/if}} 38 {{/if}}
38 </body> 39 </body>
39 </html> 40 </html>
  1 +<!-- Google Tag Manager -->
  2 +<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
  3 +<script>
  4 +var _hmt = _hmt || [];
  5 +var _gaq = _gaq || [];
  6 +(function() {
  7 + function async_load(){
  8 + (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
  9 + new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
  10 + j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
  11 + '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
  12 + })(window,document,'script','dataLayer','GTM-W958MG');
  13 + (function() {
  14 + _gaq.push(['_setAccount', 'UA-48997038-32']);
  15 + _gaq.push(['_trackPageview']);
  16 + var ga = document.createElement('script');
  17 + ga.type = 'text/javascript'; ga.async = true;
  18 + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
  19 + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
  20 + })();
  21 + }
  22 + if (window.addEventListener) {
  23 + window.addEventListener('load', async_load, false);
  24 + } else if (window.attachEvent) {
  25 + window.attachEvent('onload', async_load);
  26 + }
  27 +})();
  28 +</script>
  29 +<script>
  30 + window._py = window._py||[];
  31 + window._py.push(['a', 'MC..o8vMMWxEXDCiqYckD81lUX']);
  32 + window._py.push(['domain','stats.ipinyou.com']);
  33 + window._py.push(['e','']);
  34 + if(typeof _goodsData!='undefined'){
  35 + window._py.push(['pi',_goodsData]);
  36 + }
  37 + -function(d){
  38 + var f = 'https:' == d.location.protocol;var c = d.createElement('script');c.type='text/javascript';c.async=1;
  39 + c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js';
  40 + var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
  41 + }(document);
  42 +</script>
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 "uuid": "^2.0.2", 56 "uuid": "^2.0.2",
57 "winston": "^2.2.0", 57 "winston": "^2.2.0",
58 "winston-daily-rotate-file": "^1.1.4", 58 "winston-daily-rotate-file": "^1.1.4",
59 - "yoho-node-lib": "0.0.10" 59 + "yoho-node-lib": "0.0.12"
60 }, 60 },
61 "devDependencies": { 61 "devDependencies": {
62 "autoprefixer": "^6.3.6", 62 "autoprefixer": "^6.3.6",