Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
-Created by FontForge 20120731 at Wed Jan 13 13:50:02 2016
+Created by FontForge 20120731 at Wed Jan 20 14:25:44 2016
  By Ads
 </metadata>
 <defs>
@@ -19,7 +19,7 @@ Created by FontForge 20120731 at Wed Jan 13 13:50:02 2016
     bbox="-0.75 -224 3943 896"
     underline-thickness="50"
     underline-position="-100"
-    unicode-range="U+0078-E644"
+    unicode-range="U+0078-E645"
   />
 <missing-glyph horiz-adv-x="374" 
 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
@@ -278,5 +278,10 @@ q0 -14 -3.5 -27t-10 -23.5t-16 -20t-20.5 -15.5t-24 -10t-27 -4zM848 367q-42 0 -71.
 d="M523 881q-101 0 -192.5 -39.5t-158 -105.5t-105.5 -158t-39 -193q0 -205 145 -350t350 -145q67 0 131.5 18t119 49.5t100 77.5t77.5 100.5t49.5 118.5t17.5 131q0 101 -39 193t-105.5 158t-158 105.5t-192.5 39.5zM739 224q8 -8 7 -19q0 -2 -0.5 -4.5t-1.5 -5t-2.5 -4.5
 t-3.5 -3q-11 -10 -15 -14q-7 -7 -17 -7t-18 7l-34 34q-59 -42 -131 -42q-94 0 -160.5 66.5t-66.5 160.5q0 46 18 88t48.5 72.5t72.5 48.5t88 18t88 -18t72.5 -48.5t48.5 -72.5t18 -88q0 -75 -45 -135zM592 337q8 7 18 6.5t17 -7.5l27 -27q25 39 25 84q0 64 -45.5 109.5
 t-110 45.5t-110 -45.5t-45.5 -109.5t45.5 -109.5t109.5 -45.5q44 0 80 21l-27 28q-8 7 -7.5 18t7.5 18z" />
+    <glyph glyph-name="uniE645" unicode="&#xe645;" 
+d="M512 798q-104 0 -198 -40.5t-162.5 -109t-109 -162.5t-40.5 -198t40.5 -198t109 -162.5t162.5 -109t198 -40.5t198 40.5t162.5 109t109 162.5t40.5 198t-40.5 198t-109 162.5t-162.5 109t-198 40.5zM512 -149q-89 0 -170 34.5t-139.5 93t-93 139.5t-34.5 170
+q0 71 22 137.5t62.5 120.5t94.5 94.5t120.5 62.5t137.5 22t137.5 -22t120.5 -62.5t94.5 -94.5t62.5 -120.5t22 -137.5q0 -89 -34.5 -170t-93 -139.5t-139.5 -93t-170 -34.5zM659 288q15 0 25.5 10.5t10.5 25.5t-10.5 26t-25.5 11h-111v17l135 141q5 5 8 12t2.5 14t-3 13.5
+t-8.5 11.5q-10 11 -25 10.5t-26 -11.5l-115 -121l-123 122q-11 11 -26 10.5t-25 -10.5q-7 -7 -10 -16.5t-0.5 -19t9.5 -16.5l135 -135v-22h-108q-8 0 -14.5 -3t-11.5 -8t-8 -11.5t-3 -14.5q0 -9 5 -17.5t13.5 -13.5t18.5 -5h108v-73h-108q-8 0 -14.5 -3t-11.5 -7.5t-8 -11.5
+t-3 -14.5t3 -14t8 -11.5t11.5 -8t14.5 -3h108v-108q0 -15 10.5 -25.5t25.5 -10.5q10 0 18.5 4.5t13 13t4.5 18.5v108h111q10 0 18.5 5t13 13.5t4.5 18.5q0 7 -2.5 14t-7.5 11.5t-12 7.5t-14 3h-111v73h111z" />
   </font>
 </defs></svg>

@@ -144,6 +144,7 @@
         padding: 20rem / $pxConvertRem 0;
         font-size: 24rem / $pxConvertRem;
         border-top: 1px solid #e0e0e0;
+        border-bottom: 1px solid #e0e0e0;
         margin-bottom: 30rem / $pxConvertRem;
 
         > li {
@@ -180,7 +181,7 @@
         }
 
         .count {
-            color: #f00;
+            color: #7b7b7b;
             float: right;
         }
 

@@ -28,7 +28,7 @@
         {{#if advanceBuy}}
             <li class="advance-buy">
                 <a href="/cart/index/advanceBuy?cartType={{cartType}}">
-                <span class="iconfont">&#xe61b;</span>
+                <span class="iconfont">&#xe645;</span>
                 加价购
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
                     <span class="count">{{advanceBuyCount}}</span>

 {{> layout/header}}
 <div class="new-sale-page product-page yoho-page">
     {{# saleList}}
-        {{# saleBanner}}
-        <div class="sale-list-banner" style="height: {{bannerHeight}}px;">
-            <ul style="height: {{bannerHeight}}px;">
-                {{# list}}
-                <li class="banner-img" style="background:url({{img}}) no-repeat top center;"></li>
-                {{/ list}}
-            </ul>
-        </div>
-        {{/ saleBanner}}
+
+        {{> sale/sale-banner}}
+
         <div class="center-content clearfix">
             {{# saleTitle}}
                 <div class="header-title">
@@ -31,4 +25,4 @@
         </div>
     {{/ saleList}}
 </div>
-{{> layout/footer}}
\ No newline at end of file
+{{> layout/footer}}

@@ -106,7 +106,7 @@
                                         </div>
                                         <div class="showdetail" data-code="{{content_code}}">
                                             <a href="http://list.yohobuy.com/?gender=1,3&amp;msort=8">
-                                                <img src="http://img12.static.yhbimg.com/yhb-img01/2015/10/30/06/02af834d146e3f00b1f5fcc8388f641922.jpg?imageView/1/w/337/h/250" alt="" style=""></a>
+                                                <img src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt="" style=""></a>
                                             <a class="title" href="http://list.yohobuy.com/?gender=1,3&amp;msort=8">热门小物优选</a>
                                         </div>
                                     </div>

+{{# saleBanner}}
+<div class="sale-list-banner" style="height: {{bannerHeight}}px;">
+    <ul style="height: {{bannerHeight}}px;">
+        {{# list}}
+        <li class="banner-img" style="background:url({{img}}) no-repeat top center;"></li>
+        {{/ list}}
+    </ul>
+</div>
+{{/ saleBanner}}

@@ -8,7 +8,7 @@ var handlebars = require('yoho.handlebars');
 var json2 = require('json2');
 var vipInfoCombine = null; //用户信息编译模板
 var loginInfoCombine = null; //登录信息编译模板
-var apiDomain = 'http://api.open.yohobuy.com'; //获取数据的地址
+var apiDomain = 'http://test.open.yohobuy.com/'; //获取数据的地址http://api.open.yohobuy.com
 var cartTpl = ''; //购物车模板
 /**
  * 搜寻的时候过滤非法字符（+-/:等非法字符单独出现）

@@ -413,7 +413,32 @@ class Sale1Controller extends WebAction
             'saleList' => array(
                 'saleBanner' => array(
                     'bannerHeight' => 350,
-                    'img' => 'http://img12.static.yhbimg.com/couponImg/2015/12/10/08/02d4c26f19ca2e44359d69d5cff86167fb.jpg'
+                    'list' => array(
+                        array(
+                            'bannerHeight' => 350,
+                            'img' => 'http://img12.static.yhbimg.com/couponImg/2015/12/10/08/02d4c26f19ca2e44359d69d5cff86167fb.jpg'
+                        ),
+                        array(
+                            'bannerHeight' => 350,
+                            'img' => 'http://img12.static.yhbimg.com/yhb-img01/2016/01/06/05/02062366574a01418596caa38a773f6beb.jpg'
+                        ),
+                        array(
+                            'bannerHeight' => 350,
+                            'img' => 'http://img11.static.yhbimg.com/yhb-img01/2016/01/06/05/013341a0632177cc3425c3c6082845be57.jpg'
+                        ),
+                        array(
+                            'bannerHeight' => 350,
+                            'img' => 'http://img12.static.yhbimg.com/couponImg/2015/12/10/08/02d4c26f19ca2e44359d69d5cff86167fb.jpg'
+                        ),
+                        array(
+                            'bannerHeight' => 350,
+                            'img' => 'http://img12.static.yhbimg.com/yhb-img01/2016/01/06/05/02062366574a01418596caa38a773f6beb.jpg'
+                        ),
+                        array(
+                            'bannerHeight' => 350,
+                            'img' => 'http://img11.static.yhbimg.com/yhb-img01/2016/01/06/05/013341a0632177cc3425c3c6082845be57.jpg'
+                        )
+                    )
                 ),
                 'saleTitle' => array(
                     'name' => '全部商品',
@@ -911,6 +936,7 @@ class Sale1Controller extends WebAction
                 'pager' => '<a href="" class="cur"><span>1</span></a><a href=""><span>2</span></a><a href="" title="下一页">下一页<span class="iconfont">&gt;</span></a>'
             )
         );
+        $this->setWebNavHeader();
         $this->_view->display('sale-list', $data);
     }
 }