diff --git a/template/m.yohobuy.com/actions/product/index/shop.phtml b/template/m.yohobuy.com/actions/product/index/shop.phtml
index 0a0a8a0..653b627 100644
--- a/template/m.yohobuy.com/actions/product/index/shop.phtml
+++ b/template/m.yohobuy.com/actions/product/index/shop.phtml
@@ -1,224 +1,224 @@
-{{> layout/main_header}}
+{{> layout/main_header_shop}}
{{# shopIndex}}
- <div class="shop-index yoho-page scroll-wrapper" id="wrapper">
-
- <div id="scroller">
- <div id="nav-top">
- {{> layout/page_header}}
- <!-- tar modifield 160826 -->
- <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}}">
- <input type="hidden" name="coverChannel" value="{{coverChannel}}">
-
- {{#unless appVersion}}
- <div class="search-area">
- <div id="search-input" class="search-input">
- <form id="search-form" action={{url}} method="get">
- <i class="search-icon iconfont"></i>
- <input type="text" placeholder="搜索店铺内潮品" name="query" class="buriedpoint">
- <input type="hidden" name="shop_id" value="{{shopId}}">
- <input type="hidden" name="coverChannel" value="{{coverChannel}}">
- <i class="clear-input iconfont hide"></i>
- <button id="search" class="search buriedpoint" type="submit" data-bp-id="shop_search_btn_0">搜索</button>
- </form>
- </div>
- </div>
- {{/unless}}
-
- <!-- /tar modifield 160826 -->
- <div class="branner-top">
- <img class="shop-back-img" src="{{branerImg}}">
- <img class="logo" src="{{logoImg}}">
- <p class="store-name">{{storeName}}</p>
- <div class="collect">
- {{#if collect}}
- <div class="alreadyCollect" id="collect"></div>
- {{else}}
- <div class="notCollect buriedpoint" id="collect" data-bp-id="shop_branner_collect_1"></div>
- {{/if}}
- </div>
- </div>
+<div class="shop-index yoho-page scroll-wrapper" id="wrapper">
+
+<div id="scroller">
+ <div id="nav-top">
+ {{> layout/page_header}}
+ <!-- tar modifield 160826 -->
+ <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}}">
+ <input type="hidden" name="coverChannel" value="{{coverChannel}}">
+
+ {{#unless appVersion}}
+ <div class="search-area">
+ <div id="search-input" class="search-input">
+ <form id="search-form" action={{url}} method="get">
+ <i class="search-icon iconfont"></i>
+ <input type="text" placeholder="搜索店铺内潮品" name="query" class="buriedpoint">
+ <input type="hidden" name="shop_id" value="{{shopId}}">
+ <input type="hidden" name="coverChannel" value="{{coverChannel}}">
+ <i class="clear-input iconfont hide"></i>
+ <button id="search" class="search buriedpoint" type="submit" data-bp-id="shop_search_btn_0">搜索</button>
+ </form>
</div>
+ </div>
+ {{/unless}}
- <ul id="nav" class="nav">
- <li class="active color buriedpoint" tab="home-page" data-bp-id="shop_nav_index_1">首页</li>
- <li tab="new-arrival" data-bp-id="shop_nav_new_1" class="buriedpoint">上新</li>
- <li tab="popularity" data-bp-id="shop_nav_populary_1" class="buriedpoint">人气</li>
- <li data-bp-id="shop_nav_all_1" class="all-goods buriedpoint">
- <a href="{{allGoods}}" target="_blank">全部商品</a>
- </li>
- </ul>
-
- <div id="home-page" class="main">
- <div id="nav-main" class="nav-main">
- <!-- 大导航 -->
- {{#if brandList}}
- <div class="multi-brands first">
- <p>品牌一览</p>
- <div class="multi-browse">
- <ul class="swiper-wrapper">
- {{#each brandList.list}}
- <li class="swiper-slide brand-img buriedpoint" data-bp-id="shop_brand_{{img}}_0">
- <a href="{{url}}">
- <img src="{{img}}">
- </a>
- <p>{{brandName}}</p>
- </li>
- {{/each}}
- </ul>
- </div>
- </div>
- {{/if}}
+ <!-- /tar modifield 160826 -->
+ <div class="branner-top">
+ <img class="shop-back-img" src="{{branerImg}}">
+ <img class="logo" src="{{logoImg}}">
+ <p class="store-name">{{storeName}}</p>
+ <div class="collect">
+ {{#if collect}}
+ <div class="alreadyCollect" id="collect"></div>
+ {{else}}
+ <div class="notCollect buriedpoint" id="collect" data-bp-id="shop_branner_collect_1"></div>
+ {{/if}}
+ </div>
+ </div>
+ </div>
- <div class="banner-area first">
- {{# bannerTop}}
- {{> home/banner_top}}
- {{/ bannerTop}}
- </div>
-
- <ul class="spring first">
- {{#each spring}}
- <li class="buriedpoint" data-bp-id="shop_spring_{{url}}_0">
- {{#if url}}
- <a href="{{url}}">
- <img src="{{springType}}">
- </a>
- {{^}}
- <a href="javascript:;">
- <img src="{{springType}}">
- </a>
- {{/if}}
+ <ul id="nav" class="nav">
+ <li class="active color buriedpoint" tab="home-page" data-bp-id="shop_nav_index_1">首页</li>
+ <li tab="new-arrival" data-bp-id="shop_nav_new_1" class="buriedpoint">上新</li>
+ <li tab="popularity" data-bp-id="shop_nav_populary_1" class="buriedpoint">人气</li>
+ <li data-bp-id="shop_nav_all_1" class="all-goods buriedpoint">
+ <a href="{{allGoods}}" target="_blank">全部商品</a>
+ </li>
+ </ul>
+
+ <div id="home-page" class="main">
+ <div id="nav-main" class="nav-main">
+ <!-- 大导航 -->
+ {{#if brandList}}
+ <div class="multi-brands first">
+ <p>品牌一览</p>
+ <div class="multi-browse">
+ <ul class="swiper-wrapper">
+ {{#each brandList.list}}
+ <li class="swiper-slide brand-img buriedpoint" data-bp-id="shop_brand_{{img}}_0">
+ <a href="{{url}}">
+ <img src="{{img}}">
+ </a>
+ <p>{{brandName}}</p>
</li>
{{/each}}
</ul>
+ </div>
+ </div>
+ {{/if}}
- {{! 热门品类}}
- <div class="first">
- {{# hotCategory}}
- {{> product/hot_category}}
- {{/ hotCategory}}
- </div>
-
- {{#if hotList}}
- <div class="popularity-title first">
- 人气单品
- <a class="more buriedpoint" href="{{more_url}}" data-bp-id="shop_popularity_{{more_url}}"></a>
- </div>
- <div class="product-warp">
- <div class="goods-container clearfix">
- {{# hotList}}
- {{> good}}
- {{/ hotList}}
- </div>
- </div>
+ <div class="banner-area first">
+ {{# bannerTop}}
+ {{> home/banner_top}}
+ {{/ bannerTop}}
+ </div>
+
+ <ul class="spring first">
+ {{#each spring}}
+ <li class="buriedpoint" data-bp-id="shop_spring_{{url}}_0">
+ {{#if url}}
+ <a href="{{url}}">
+ <img src="{{springType}}">
+ </a>
+ {{^}}
+ <a href="javascript:;">
+ <img src="{{springType}}">
+ </a>
{{/if}}
+ </li>
+ {{/each}}
+ </ul>
+
+ {{! 热门品类}}
+ <div class="first">
+ {{# hotCategory}}
+ {{> product/hot_category}}
+ {{/ hotCategory}}
+ </div>
+ {{#if hotList}}
+ <div class="popularity-title first">
+ 人气单品
+ <a class="more buriedpoint" href="{{more_url}}" data-bp-id="shop_popularity_{{more_url}}"></a>
+ </div>
+ <div class="product-warp">
+ <div class="goods-container clearfix">
+ {{# hotList}}
+ {{> good}}
+ {{/ hotList}}
</div>
+ </div>
+ {{/if}}
- <div class="discount-area first" id="navlist2">
- <ul id="list-nav" class="home-sub-nav list-nav clearfix">
- <li data-bp-id="shop_listnav_new_1" class="new active buriedpoint">
- <a href="javascript:void(0);">
- <span class="spanTest">最新</span>
- <span class="iconfont cur"></span>
- </a>
- </li>
- <li class="price buriedpoint" data-bp-id="shop_listnav_price_1">
- <a href="javascript:void(0);">
- <span class="spanTest">价格</span>
+ </div>
+
+ <div class="discount-area first" id="navlist2">
+ <ul id="list-nav" class="home-sub-nav list-nav clearfix">
+ <li data-bp-id="shop_listnav_new_1" class="new active buriedpoint">
+ <a href="javascript:void(0);">
+ <span class="spanTest">最新</span>
+ <span class="iconfont cur"></span>
+ </a>
+ </li>
+ <li class="price buriedpoint" data-bp-id="shop_listnav_price_1">
+ <a href="javascript:void(0);">
+ <span class="spanTest">价格</span>
<span class="icon">
<i class="iconfont up cur"></i>
<i class="iconfont down"></i>
</span>
- </a>
- </li>
- <li class="discount buriedpoint" data-bp-id="shop_listnav_discount_1">
- <a href="javascript:void(0);">
- <span class="spanTest">折扣</span>
+ </a>
+ </li>
+ <li class="discount buriedpoint" data-bp-id="shop_listnav_discount_1">
+ <a href="javascript:void(0);">
+ <span class="spanTest">折扣</span>
<span class="icon">
<i class="iconfont up cur"></i>
<i class="iconfont down"></i>
</span>
- </a>
- </li>
- <li class="filter buriedpoint" data-bp-id="shop_listnav_filter_1">
- <a href="javascript:void(0);">
- <span class="spanTest">筛选</span>
- <span class="iconfont cur"></span>
- </a>
- </li>
- </ul>
- </div>
-
- <div class="discount-area first">
- <div id="goods-container" class="goods-container">
- <div class="new-goods container clearfix">
- {{# goods}}
- {{> good}}
- {{/ goods}}
- </div>
- <div class="price-goods container hide clearfix"></div>
- <div class="discount-goods container hide clearfix"></div>
-
-
- </div>
+ </a>
+ </li>
+ <li class="filter buriedpoint" data-bp-id="shop_listnav_filter_1">
+ <a href="javascript:void(0);">
+ <span class="spanTest">筛选</span>
+ <span class="iconfont cur"></span>
+ </a>
+ </li>
+ </ul>
+ </div>
+
+ <div class="discount-area first">
+ <div id="goods-container" class="goods-container">
+ <div class="new-goods container clearfix">
+ {{# goods}}
+ {{> good}}
+ {{/ goods}}
</div>
+ <div class="price-goods container hide clearfix"></div>
+ <div class="discount-goods container hide clearfix"></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">
- <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 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>
- <span class="iconfont cur"></span>
- <b></b>
- </a>
- </li>
- <li class="price buriedpoint" data-bp-id="shop_poslist_price_1">
- <a href="javascript:void(0);">
- <span class="spanTest">价格</span>
+
+ </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">
+ <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 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>
+ <span class="iconfont cur"></span>
+ <b></b>
+ </a>
+ </li>
+ <li class="price buriedpoint" data-bp-id="shop_poslist_price_1">
+ <a href="javascript:void(0);">
+ <span class="spanTest">价格</span>
<span class="icon">
<i class="iconfont up cur"></i>
<i class="iconfont down"></i>
</span>
- <b></b>
- </a>
- </li>
- <li class="discount buriedpoint" data-bp-id="shop_poslist_discount_1">
- <a href="javascript:void(0);">
- <span class="spanTest">折扣</span>
+ <b></b>
+ </a>
+ </li>
+ <li class="discount buriedpoint" data-bp-id="shop_poslist_discount_1">
+ <a href="javascript:void(0);">
+ <span class="spanTest">折扣</span>
<span class="icon">
<i class="iconfont up cur"></i>
<i class="iconfont down"></i>
</span>
- <b></b>
- </a>
- </li>
- <li class="filter buriedpoint" data-bp-id="shop_poslist_filter_1">
- <a href="javascript:void(0);">
- <span class="spanTest">筛选</span>
- <span class="iconfont cur"></span>
- </a>
- </li>
- </ul>
- </div>
+ <b></b>
+ </a>
+ </li>
+ <li class="filter buriedpoint" data-bp-id="shop_poslist_filter_1">
+ <a href="javascript:void(0);">
+ <span class="spanTest">筛选</span>
+ <span class="iconfont cur"></span>
+ </a>
+ </li>
+</ul>
+</div>
{{> filter}}
{{/ shopIndex}}
{{> product/query-param}}
-{{> layout/footer}}
\ No newline at end of file
+{{> layout/footer_shop}}
\ No newline at end of file
diff --git a/template/m.yohobuy.com/partials/layout/footer_shop.phtml b/template/m.yohobuy.com/partials/layout/footer_shop.phtml
index dac9370..02382be 100644
--- a/template/m.yohobuy.com/partials/layout/footer_shop.phtml
+++ b/template/m.yohobuy.com/partials/layout/footer_shop.phtml
@@ -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>
diff --git a/template/m.yohobuy.com/partials/layout/main_header_shop.phtml b/template/m.yohobuy.com/partials/layout/main_header_shop.phtml
index d93b7e7..bf90631 100644
--- a/template/m.yohobuy.com/partials/layout/main_header_shop.phtml
+++ b/template/m.yohobuy.com/partials/layout/main_header_shop.phtml
@@ -1,51 +1,51 @@
<!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">
- (function(doc, win) {
- var docEl = doc.documentElement;
- (function() {
- var clientWidth = docEl.clientWidth;
- if (!clientWidth) {
- return;
- }
- 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}}
+ <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() {
+ var clientWidth = docEl.clientWidth;
+ if (!clientWidth) {
+ return;
+ }
+ 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.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">
- <a href="index/systemUpdate" class="systemHeader">Yoho!Buy有货关于系统升级的公告</a>
- <span>X</span>
- </div>
+<div class="systemUpdate">
+ <a href="index/systemUpdate" class="systemHeader">Yoho!Buy有货关于系统升级的公告</a>
+ <span>X</span>
+</div>
{{/if}}