Merge branch 'hotfix/shopliangzhifeng' into master2

@@ -6,7 +6,7 @@
  */
 
 var $ = require('jquery'),
-    IScroll = require('iscroll/iscroll-probe')
+    IScroll = require('iscroll/iscroll-probe'),
     Hammer = require('yoho.hammer');
 
 var $filter;

@@ -193,7 +193,7 @@ function newData(callback) {
     req.callBack = function(data) {
         $('#new-arrival').append(data);
         navInfo.new.page++;
-        myScroll.refresh();
+        myScroll && myScroll.refresh();
         lazyLoad($('#new-arrival .lazy'));
         scH = $('#scroller').outerHeight();
         searching = false;
@@ -218,7 +218,7 @@ function hotData(callback) {
     req.callBack = function(data) {
         $('#popularity').append(data);
         navInfo.hot.page++;
-        myScroll.refresh();
+        myScroll && myScroll.refresh();
         lazyLoad($('#popularity .lazy'));
         scH = $('#scroller').outerHeight();
         searching = false;
@@ -425,6 +425,8 @@ function scrollHandler() {
             });
         }
     }
+
+    $('#scroller').trigger('scroll');
 }
 
 document.addEventListener('touchmove', function(e) {
@@ -441,7 +443,7 @@ document.addEventListener('touchmove', function(e) {
 
 //window ready 后重新refresh iscroll
 $(window).ready(function() {
-    myScroll && myScroll.refresh();
+    //myScroll && myScroll.refresh();
     imgH = $('#nav-top').outerHeight();
     nav1H = $('#nav').outerHeight();
     main1H = $('#nav-main').height();
@@ -478,7 +480,7 @@ $(window).ready(function() {
 
         multiSwiper && multiSwiper.startAutoplay();
 
-        $('#scroller').trigger('scroll');
+        //$('#scroller').trigger('scroll');
         scrollHandler.bind(this)();
     });
     lazyLoad($('img.lazy'));
@@ -913,7 +915,7 @@ function postCollect(info) {
             }
 
             setTimeout(function() {
-                myScroll.refresh();
+                myScroll && myScroll.refresh();
                 scH = $('#scroller').outerHeight();
             }, 500);
             searching = false;

-{{> layout/main_header}}
+{{> layout/main_header_shop}}
 {{# shopIndex}}
-    <div class="shop-index yoho-page scroll-wrapper" id="wrapper">
+<div class="shop-index yoho-page scroll-wrapper" id="wrapper">
 
-        <div id="scroller">
+<div id="scroller">
     <div id="nav-top">
         {{> layout/page_header}}
         <!-- tar modifield 160826  -->
-                <input type="hidden" name="app_version" value="{{appVersion}}">
+        <input type="hidden" id="app_version" name="app_version" value="{{app_version}}">
         <input type="hidden" name="shop_id" value="{{shopId}}">
         <input type="hidden" name="brand" value="{{brand}}">
         <input type="hidden" name="favId" value="{{favId}}">
@@ -114,6 +114,7 @@
                 </div>
             </div>
             {{/if}}
+
         </div>
 
         <div class="discount-area first" id="navlist2">
@@ -164,23 +165,24 @@
 
             </div>
         </div>
+
     </div>
     <div id="new-arrival" class="new-arrival main hide"></div>
     <div id="popularity" class="popularity main hide"></div>
-        </div>
-        {{#unless appVersion}}
-            {{> product/shop-footer}}
-        {{/unless}}
-        <ul id="pos-nav" class="nav hide">
+</div>
+{{#unless appVersion}}
+{{> product/shop-footer}}
+{{/unless}}
+<ul id="pos-nav" class="nav hide">
     <li class="active color buriedpoint" tab="home-page" data-bp-id="shop_posnav_index_1">首页</li>
     <li tab="new-arrival" class="buriedpoint" data-bp-id="shop_posnav_new_1">上新</li>
     <li tab="popularity" class="buriedpoint" data-bp-id="shop_posnav_populary_1">人气</li>
     <li class="all-goods buriedpoint" data-bp-id="shop_posnav_all_1">
         <a href="{{allGoods}}" target="_blank">全部商品</a>
     </li>
-        </ul>
+</ul>
 
-        <ul id="pos-list" class="home-sub-nav pos-list hide">
+<ul id="pos-list" class="home-sub-nav pos-list hide">
     <li class="new active buriedpoint" data-bp-id="shop_poslist_new_1">
         <a href="javascript:void(0);">
             <span class="spanTest">最新</span>
@@ -214,9 +216,9 @@
             <span class="iconfont cur">&#xe613;</span>
         </a>
     </li>
-        </ul>
-    </div>
+</ul>
+</div>
 {{> filter}}
 {{/ shopIndex}}
 {{> product/query-param}}
-{{> layout/footer}}
\ No newline at end of file
+{{> layout/footer_shop}}
\ No newline at end of file

 <!-- 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 appVersionDom = document.getElementById("app_version");
+if (!appVersionDom || !appVersionDom.value) {
     var _hmt = _hmt || [];
     function async_load(){
         (function() {
@@ -16,4 +18,5 @@
         })(window,document,'script','dataLayer','GTM-W958MG');
     }
     window.addEventListener('load', async_load, false);
+}
 </script>

@@ -4,16 +4,16 @@
 <script type="text/javascript" charset="utf-8" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 {{/if}}
 {{#if rlsEnv}}
-<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop3/lib.js"></script>
-<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop3/index.js"></script>
+<script src="//cdn.yoho.cn/myohobuy/4.9.27.shop/lib.js"></script>
+<script src="//cdn.yoho.cn/myohobuy/4.9.27.shop/index.js"></script>
 {{/if}}
 {{#if preEnv}}
-<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop3/lib.js?v={{version}}"></script>
-<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop3/index.js?v={{version}}"></script>
+<script src="//cdn.yoho.cn/myohobuy/4.9.27.shop/lib.js?v={{version}}"></script>
+<script src="//cdn.yoho.cn/myohobuy/4.9.27.shop/index.js?v={{version}}"></script>
 {{/if}}
 {{#if testEnv}}
-<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop3/lib.js?v={{version}}"></script>
-<script src="//cdn.yoho.cn/myohobuy/4.9.11.shop3/index-debug.js?v={{version}}"></script>
+<script src="//cdn.yoho.cn/myohobuy/4.9.27.shop/lib.js?v={{version}}"></script>
+<script src="//cdn.yoho.cn/myohobuy/4.9.27.shop/index-debug.js?v={{version}}"></script>
 {{/if}}
 {{#if devEnv}}
 <script src="//127.0.0.1:8000/static/js/sea.js?nowrap"></script>

 <!DOCTYPE html>
 <html>
 <head>
-<meta charset="utf-8">
-<title>{{title}}</title>
-<meta name="keywords" content="{{keywords}}">
-<meta name="description" content="{{description}}">
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
-<meta http-equiv="cleartype" content="on">
-<meta name="apple-mobile-web-app-status-bar-style" content="black" />
-<meta content="telephone=no" name="format-detection" />
-<meta content="email=no" name="format-detection" />
-<script type="text/javascript">
+    <meta charset="utf-8">
+    <title>{{title}}</title>
+    <meta name="keywords" content="{{keywords}}">
+    <meta name="description" content="{{description}}">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
+    <meta http-equiv="cleartype" content="on">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta content="telephone=no" name="format-detection" />
+    <meta content="email=no" name="format-detection" />
+    <script type="text/javascript">
         (function(doc, win) {
             var docEl = doc.documentElement;
             (function() {
@@ -21,31 +21,31 @@
                 docEl.style.fontSize = 20 * (clientWidth / 320) + 'px';
             }());
         })(document, window);
-</script>
-<link rel="dns-prefetch" href="//cdn.yoho.cn">
-<link rel="dns-prefetch" href="//static.yohobuy.com">
-<link rel="dns-prefetch" href="//img12.static.yhbimg.com">
-<link rel="dns-prefetch" href="//img13.static.yhbimg.com">
-{{#if rlsEnv}}
-<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/4.9.11.shop3/index.css">
-{{/if}}
-{{#if preEnv}}
-<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/4.9.11.shop3/index.css">
-{{/if}}
-{{#if testEnv}}
-<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/4.9.11.shop3/index.css">
-{{/if}}
-{{#if devEnv}}
+    </script>
+    <link rel="dns-prefetch" href="//cdn.yoho.cn">
+    <link rel="dns-prefetch" href="//static.yohobuy.com">
+    <link rel="dns-prefetch" href="//img12.static.yhbimg.com">
+    <link rel="dns-prefetch" href="//img13.static.yhbimg.com">
+    {{#if rlsEnv}}
+    <link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/4.9.27.shop/index.css">
+    {{/if}}
+    {{#if preEnv}}
+    <link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/4.9.27.shop/index.css">
+    {{/if}}
+    {{#if testEnv}}
+    <link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/4.9.27.shop/index.css">
+    {{/if}}
+    {{#if devEnv}}
     <link rel="stylesheet" href="//static.dev.yohobuy.com/css/index.css">
-{{/if}}
-<link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
-<link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
-<link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
+    {{/if}}
+    <link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
+    <link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
+    <link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
 </head>
 <body class="{{#if isPassportPage}}passport-body{{/if}} {{#if isWechat}}wechat-body{{/if}}">
 {{#if systemUpdate}}
-    <div class="systemUpdate">
+<div class="systemUpdate">
     <a href="index/systemUpdate" class="systemHeader">Yoho!Buy有货关于系统升级的公告</a>
     <span>X</span>
-    </div>
+</div>
 {{/if}}