chenchao / YOHOBUYPC · Commits

Go to a project

Authored by xuqi
Commit 0d10d59d334e005d540d2bd6f7f616914703598f 2 parents 292afcd5 6a5d0d57

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

Inline Side-by-side
Showing 9 changed files with 10 additions and 9 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 Fri Oct 30 10:27:45 2015 5 +Created by FontForge 20120731 at Sun Nov 1 15:22:48 2015
6 By Ads 6 By Ads
7 </metadata> 7 </metadata>
8 <defs> 8 <defs>
@@ -149,12 +149,13 @@ d="M459 754h22h23h20h22h22v-191v-191h191h191v-109h-191h-191v-191v-190h-109v190v1 @@ -149,12 +149,13 @@ d="M459 754h22h23h20h22h22v-191v-191h191h191v-109h-191h-191v-191v-190h-109v190v1
149 d="M77 372h873v-109h-873v109z" /> 149 d="M77 372h873v-109h-873v109z" />
150 <glyph glyph-name="uniE626" unicode="&#xe626;" 150 <glyph glyph-name="uniE626" unicode="&#xe626;"
151 d="M866.5 663.5q-97.5 97.5 -228 132t-261.5 0t-228.5 -132t-132 -228.5t0 -261.5t132 -228t228.5 -132t261.5 0t228 132t132 228t0 261.5t-132 228.5zM798 115l-101 -101l-187 186l-186 -186l-101 101l186 186l-186 187l101 101l186 -186l187 186l101 -101l-186 -187z" /> 151 d="M866.5 663.5q-97.5 97.5 -228 132t-261.5 0t-228.5 -132t-132 -228.5t0 -261.5t132 -228t228.5 -132t261.5 0t228 132t132 228t0 261.5t-132 228.5zM798 115l-101 -101l-187 186l-186 -186l-101 101l186 186l-186 187l101 101l186 -186l187 186l101 -101l-186 -187z" />
  152 + <glyph glyph-name="uniE627" unicode="&#xe627;"
  153 +d="M741 258q-23 9 -22 34q6 114 -8 186q-13 68 -37.5 125.5t-48 89.5t-50.5 57t-38 32t-18 10l-7 3l-7 -3q-7 -3 -18 -10t-38 -32t-50.5 -57t-48 -89.5t-37.5 -125.5q-14 -72 -8 -186q1 -25 -22 -34q-19 -9 -37 -19.5t-39 -29.5t-36 -41.5t-25.5 -56t-10.5 -72.5v-16h198
  154 +q2 -22 17.5 -36.5t37.5 -14.5h248q22 0 37.5 14.5t17.5 36.5h198v16q0 48 -14.5 87.5t-39 65t-47 40.5t-47.5 26zM512 442q-31 0 -53 22t-22 53t22 53t53 22q20 0 37.5 -10t27.5 -27t10 -38q0 -31 -22 -53t-53 -22zM453 -61q-14 0 -23.5 -10t-9.5 -24v-83q0 -10 4.5 -17.5
  155 +t12 -12t16.5 -4.5t17 4.5t12.5 12t4.5 17.5v83q0 9 -4.5 17t-12.5 12.5t-17 4.5zM571 -61q-7 0 -13.5 -2.5t-11 -7t-7 -11t-2.5 -13.5v-83q0 -14 10 -24t24 -10q6 0 12.5 2.5t11 7t7 11t2.5 13.5v83q0 9 -4.5 17t-12 12.5t-16.5 4.5z" />
152 <glyph glyph-name="uniE628" unicode="&#xe628;" 156 <glyph glyph-name="uniE628" unicode="&#xe628;"
153 d="M505 776q77 0 148.5 -23.5t129 -67t101 -101.5t67.5 -129.5t24 -147.5q0 -64 -17 -125t-47.5 -112t-74 -94.5t-94.5 -74t-112 -47.5t-125 -17q-95 0 -182 37.5t-150 100.5t-100 150t-37 182t37 182t100 150t150 100t182 37zM505 -104q112 0 206.5 55t149.5 149.5 157 d="M505 776q77 0 148.5 -23.5t129 -67t101 -101.5t67.5 -129.5t24 -147.5q0 -64 -17 -125t-47.5 -112t-74 -94.5t-94.5 -74t-112 -47.5t-125 -17q-95 0 -182 37.5t-150 100.5t-100 150t-37 182t37 182t100 150t150 100t182 37zM505 -104q112 0 206.5 55t149.5 149.5
154 t55 206.5q0 37 -6.5 73.5t-19.5 69.5t-30.5 64t-40.5 57.5t-49.5 49.5t-57.5 40.5t-64 30t-69.5 19t-73.5 6.5q-111 0 -205.5 -55t-149.5 -149.5t-55 -206t55 -206t149.5 -149.5t205.5 -55zM528 138v-59h-58v59h58zM470 564h58v-349h-58v349z" /> 158 t55 206.5q0 37 -6.5 73.5t-19.5 69.5t-30.5 64t-40.5 57.5t-49.5 49.5t-57.5 40.5t-64 30t-69.5 19t-73.5 6.5q-111 0 -205.5 -55t-149.5 -149.5t-55 -206t55 -206t149.5 -149.5t205.5 -55zM528 138v-59h-58v59h58zM470 564h58v-349h-58v349z" />
155 - <glyph glyph-name="uniE629" unicode="&#xe629;"  
156 -d="M442 274h-84v-76h-230v76h-81q-20 0 -33.5 -12.5t-13.5 -31.5v-395q0 -20 13.5 -33.5t33.5 -13.5h395q19 0 31.5 13.5t12.5 33.5v395q0 13 -5.5 23t-15.5 15.5t-23 5.5zM977 812h-81v-77h-230v77h-84q-10 0 -18 -3.5t-14 -10t-9 -15t-3 -18.5v-395q0 -13 5.5 -23  
157 -t15.5 -15.5t23 -5.5h395q20 0 33.5 12.5t13.5 31.5v395q0 20 -13.5 33.5t-33.5 13.5zM977 274h-81v-76h-230v76h-84q-13 0 -23 -5.5t-15.5 -15.5t-5.5 -23v-395q0 -13 5.5 -23.5t15.5 -17t23 -6.5h395q20 0 33.5 13.5t13.5 33.5v395q0 19 -13.5 31.5t-33.5 12.5z" />  
158 <glyph glyph-name="uniE62A" unicode="&#xe62a;" 159 <glyph glyph-name="uniE62A" unicode="&#xe62a;"
159 d="M497 806l-451 -386q-6 -6 -11 -13t-7 -15t-2 -17v-500q0 -32 22.5 -54.5t53.5 -22.5h256v333h308v-333h256q31 0 53.5 22.5t22.5 54.5v500q0 27 -20 45l-451 386q-15 13 -30 0z" /> 160 d="M497 806l-451 -386q-6 -6 -11 -13t-7 -15t-2 -17v-500q0 -32 22.5 -54.5t53.5 -22.5h256v333h308v-333h256q31 0 53.5 22.5t22.5 54.5v500q0 27 -20 45l-451 386q-15 13 -30 0z" />
160 <glyph glyph-name="uniE62B" unicode="&#xe62b;" 161 <glyph glyph-name="uniE62B" unicode="&#xe62b;"
No preview for this file type
No preview for this file type
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <p class="tab-name">分类</p> 9 <p class="tab-name">分类</p>
10 </div> 10 </div>
11 <div class="tab-item {{#if guangHome}}current{{/if}}"> 11 <div class="tab-item {{#if guangHome}}current{{/if}}">
12 - <p class="iconfont tab-icon">&#xe611;</p> 12 + <p class="iconfont tab-icon">&#xe627;</p>
13 <p class="tab-name">逛</p> 13 <p class="tab-name">逛</p>
14 </div> 14 </div>
15 <div class="tab-item {{#if shoppingCartPage}}current{{/if}}"> 15 <div class="tab-item {{#if shoppingCartPage}}current{{/if}}">
@@ -31,7 +31,7 @@ class BoysController extends AbstractAction @@ -31,7 +31,7 @@ class BoysController extends AbstractAction
31 $this->_view->display('index', array( 31 $this->_view->display('index', array(
32 'boysHomePage' => true, 32 'boysHomePage' => true,
33 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')), 33 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
34 - 'showFooterTab' => false, 34 + 'showFooterTab' => true,
35 'maybeLike' => true, 35 'maybeLike' => true,
36 'content' => Index\HomeModel::getBoysFloor(), 36 'content' => Index\HomeModel::getBoysFloor(),
37 'pageFooter' => true, 37 'pageFooter' => true,
@@ -26,7 +26,7 @@ class GirlsController extends AbstractAction @@ -26,7 +26,7 @@ class GirlsController extends AbstractAction
26 $this->_view->display('index', array( 26 $this->_view->display('index', array(
27 'grilsHomePage' => true, 27 'grilsHomePage' => true,
28 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')), 28 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
29 - 'showFooterTab' => false, 29 + 'showFooterTab' => true,
30 'maybeLike' => true, 30 'maybeLike' => true,
31 'content' => Index\HomeModel::getGirlsFloor(), 31 'content' => Index\HomeModel::getGirlsFloor(),
32 'pageFooter' => true, 32 'pageFooter' => true,
@@ -26,7 +26,7 @@ class KidsController extends AbstractAction @@ -26,7 +26,7 @@ class KidsController extends AbstractAction
26 $this->_view->display('index', array( 26 $this->_view->display('index', array(
27 'kidsHomePage' => true, 27 'kidsHomePage' => true,
28 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')), 28 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
29 - 'showFooterTab' => false, 29 + 'showFooterTab' => true,
30 'maybeLike' => true, 30 'maybeLike' => true,
31 'content' => Index\HomeModel::getKidsFloor(), 31 'content' => Index\HomeModel::getKidsFloor(),
32 'pageFooter' => true, 32 'pageFooter' => true,
@@ -26,7 +26,7 @@ class LifestyleController extends AbstractAction @@ -26,7 +26,7 @@ class LifestyleController extends AbstractAction
26 $this->_view->display('index', array( 26 $this->_view->display('index', array(
27 'lifestyleHomePage' => true, 27 'lifestyleHomePage' => true,
28 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')), 28 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
29 - 'showFooterTab' => false, 29 + 'showFooterTab' => true,
30 'maybeLike' => true, 30 'maybeLike' => true,
31 'content' => Index\HomeModel::getLifestyleFloor(), 31 'content' => Index\HomeModel::getLifestyleFloor(),
32 'pageFooter' => true, 32 'pageFooter' => true,