chenchao / YOHOBUYPC · Commits

Go to a project

Authored by whb
Commit 8a51867e61311f388cf6addccd70161008e44b9f 2 parents 433d819e 8d0dda12

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

Inline Side-by-side
Showing 11 changed files with 50 additions and 15 deletions
No preview for this file type
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > 2 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
3 <svg xmlns="http://www.w3.org/2000/svg"> 3 <svg xmlns="http://www.w3.org/2000/svg">
4 <metadata> 4 <metadata>
5 -Created by FontForge 20120731 at Wed Jan 13 13:50:02 2016 5 +Created by FontForge 20120731 at Wed Jan 20 14:25:44 2016
6 By Ads 6 By Ads
7 </metadata> 7 </metadata>
8 <defs> 8 <defs>
@@ -19,7 +19,7 @@ Created by FontForge 20120731 at Wed Jan 13 13:50:02 2016 @@ -19,7 +19,7 @@ Created by FontForge 20120731 at Wed Jan 13 13:50:02 2016
19 bbox="-0.75 -224 3943 896" 19 bbox="-0.75 -224 3943 896"
20 underline-thickness="50" 20 underline-thickness="50"
21 underline-position="-100" 21 underline-position="-100"
22 - unicode-range="U+0078-E644" 22 + unicode-range="U+0078-E645"
23 /> 23 />
24 <missing-glyph horiz-adv-x="374" 24 <missing-glyph horiz-adv-x="374"
25 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" /> 25 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. @@ -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.
278 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 278 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
279 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 279 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
280 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" /> 280 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" />
  281 + <glyph glyph-name="uniE645" unicode="&#xe645;"
  282 +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
  283 +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
  284 +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
  285 +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" />
281 </font> 286 </font>
282 </defs></svg> 287 </defs></svg>
No preview for this file type
No preview for this file type
@@ -144,6 +144,7 @@ @@ -144,6 +144,7 @@
144 padding: 20rem / $pxConvertRem 0; 144 padding: 20rem / $pxConvertRem 0;
145 font-size: 24rem / $pxConvertRem; 145 font-size: 24rem / $pxConvertRem;
146 border-top: 1px solid #e0e0e0; 146 border-top: 1px solid #e0e0e0;
  147 + border-bottom: 1px solid #e0e0e0;
147 margin-bottom: 30rem / $pxConvertRem; 148 margin-bottom: 30rem / $pxConvertRem;
148 149
149 > li { 150 > li {
@@ -180,7 +181,7 @@ @@ -180,7 +181,7 @@
180 } 181 }
181 182
182 .count { 183 .count {
183 - color: #f00; 184 + color: #7b7b7b;
184 float: right; 185 float: right;
185 } 186 }
186 187
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 {{#if advanceBuy}} 28 {{#if advanceBuy}}
29 <li class="advance-buy"> 29 <li class="advance-buy">
30 <a href="/cart/index/advanceBuy?cartType={{cartType}}"> 30 <a href="/cart/index/advanceBuy?cartType={{cartType}}">
31 - <span class="iconfont">&#xe61b;</span> 31 + <span class="iconfont">&#xe645;</span>
32 加价购 32 加价购
33 <span class="iconfont icon-right-arrow">&#xe614;</span> 33 <span class="iconfont icon-right-arrow">&#xe614;</span>
34 <span class="count">{{advanceBuyCount}}</span> 34 <span class="count">{{advanceBuyCount}}</span>
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="new-sale-page product-page yoho-page"> 2 <div class="new-sale-page product-page yoho-page">
3 {{# saleList}} 3 {{# saleList}}
4 - {{# saleBanner}}  
5 - <div class="sale-list-banner" style="height: {{bannerHeight}}px;">  
6 - <ul style="height: {{bannerHeight}}px;">  
7 - {{# list}}  
8 - <li class="banner-img" style="background:url({{img}}) no-repeat top center;"></li>  
9 - {{/ list}}  
10 - </ul>  
11 - </div>  
12 - {{/ saleBanner}} 4 +
  5 + {{> sale/sale-banner}}
  6 +
13 <div class="center-content clearfix"> 7 <div class="center-content clearfix">
14 {{# saleTitle}} 8 {{# saleTitle}}
15 <div class="header-title"> 9 <div class="header-title">
@@ -106,7 +106,7 @@ @@ -106,7 +106,7 @@
106 </div> 106 </div>
107 <div class="showdetail" data-code="{{content_code}}"> 107 <div class="showdetail" data-code="{{content_code}}">
108 <a href="http://list.yohobuy.com/?gender=1,3&amp;msort=8"> 108 <a href="http://list.yohobuy.com/?gender=1,3&amp;msort=8">
109 - <img src="http://img12.static.yhbimg.com/yhb-img01/2015/10/30/06/02af834d146e3f00b1f5fcc8388f641922.jpg?imageView/1/w/337/h/250" alt="" style=""></a> 109 + <img src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt="" style=""></a>
110 <a class="title" href="http://list.yohobuy.com/?gender=1,3&amp;msort=8">热门小物优选</a> 110 <a class="title" href="http://list.yohobuy.com/?gender=1,3&amp;msort=8">热门小物优选</a>
111 </div> 111 </div>
112 </div> 112 </div>
  1 +{{# saleBanner}}
  2 +<div class="sale-list-banner" style="height: {{bannerHeight}}px;">
  3 + <ul style="height: {{bannerHeight}}px;">
  4 + {{# list}}
  5 + <li class="banner-img" style="background:url({{img}}) no-repeat top center;"></li>
  6 + {{/ list}}
  7 + </ul>
  8 +</div>
  9 +{{/ saleBanner}}
@@ -8,7 +8,7 @@ var handlebars = require('yoho.handlebars'); @@ -8,7 +8,7 @@ var handlebars = require('yoho.handlebars');
8 var json2 = require('json2'); 8 var json2 = require('json2');
9 var vipInfoCombine = null; //用户信息编译模板 9 var vipInfoCombine = null; //用户信息编译模板
10 var loginInfoCombine = null; //登录信息编译模板 10 var loginInfoCombine = null; //登录信息编译模板
11 -var apiDomain = 'http://api.open.yohobuy.com'; //获取数据的地址 11 +var apiDomain = 'http://test.open.yohobuy.com/'; //获取数据的地址http://api.open.yohobuy.com
12 var cartTpl = ''; //购物车模板 12 var cartTpl = ''; //购物车模板
13 /** 13 /**
14 * 搜寻的时候过滤非法字符（+-/:等非法字符单独出现） 14 * 搜寻的时候过滤非法字符（+-/:等非法字符单独出现）
@@ -413,8 +413,33 @@ class Sale1Controller extends WebAction @@ -413,8 +413,33 @@ class Sale1Controller extends WebAction
413 'saleList' => array( 413 'saleList' => array(
414 'saleBanner' => array( 414 'saleBanner' => array(
415 'bannerHeight' => 350, 415 'bannerHeight' => 350,
  416 + 'list' => array(
  417 + array(
  418 + 'bannerHeight' => 350,
  419 + 'img' => 'http://img12.static.yhbimg.com/couponImg/2015/12/10/08/02d4c26f19ca2e44359d69d5cff86167fb.jpg'
  420 + ),
  421 + array(
  422 + 'bannerHeight' => 350,
  423 + 'img' => 'http://img12.static.yhbimg.com/yhb-img01/2016/01/06/05/02062366574a01418596caa38a773f6beb.jpg'
  424 + ),
  425 + array(
  426 + 'bannerHeight' => 350,
  427 + 'img' => 'http://img11.static.yhbimg.com/yhb-img01/2016/01/06/05/013341a0632177cc3425c3c6082845be57.jpg'
  428 + ),
  429 + array(
  430 + 'bannerHeight' => 350,
416 'img' => 'http://img12.static.yhbimg.com/couponImg/2015/12/10/08/02d4c26f19ca2e44359d69d5cff86167fb.jpg' 431 'img' => 'http://img12.static.yhbimg.com/couponImg/2015/12/10/08/02d4c26f19ca2e44359d69d5cff86167fb.jpg'
417 ), 432 ),
  433 + array(
  434 + 'bannerHeight' => 350,
  435 + 'img' => 'http://img12.static.yhbimg.com/yhb-img01/2016/01/06/05/02062366574a01418596caa38a773f6beb.jpg'
  436 + ),
  437 + array(
  438 + 'bannerHeight' => 350,
  439 + 'img' => 'http://img11.static.yhbimg.com/yhb-img01/2016/01/06/05/013341a0632177cc3425c3c6082845be57.jpg'
  440 + )
  441 + )
  442 + ),
418 'saleTitle' => array( 443 'saleTitle' => array(
419 'name' => '全部商品', 444 'name' => '全部商品',
420 'count' => 540 445 'count' => 540
@@ -911,6 +936,7 @@ class Sale1Controller extends WebAction @@ -911,6 +936,7 @@ class Sale1Controller extends WebAction
911 'pager' => '<a href="" class="cur"><span>1</span></a><a href=""><span>2</span></a><a href="" title="下一页">下一页<span class="iconfont">&gt;</span></a>' 936 'pager' => '<a href="" class="cur"><span>1</span></a><a href=""><span>2</span></a><a href="" title="下一页">下一页<span class="iconfont">&gt;</span></a>'
912 ) 937 )
913 ); 938 );
  939 + $this->setWebNavHeader();
914 $this->_view->display('sale-list', $data); 940 $this->_view->display('sale-list', $data);
915 } 941 }
916 } 942 }