Merge branch 'bugfix' into develop

ccbikai
Commit 63204641d22bf6c3e506f444946fa025bf6e7ab0 2 parents 7f0c268f b0e9938c
Showing 9 changed files with 23 additions and 11 deletions
compile/m.yohobuy.com/README.md
compile/www.yohobuy.com/README.md
framework
static/font/iconfont.eot
static/font/iconfont.svg
static/font/iconfont.ttf
static/font/iconfont.woff
static/js/home/home.js
template/m.yohobuy.com/partials/layout/footer_tab.phtml
--- a/compile/m.yohobuy.com/README.md deleted 100644 → 0
View file @7f0c268
+++ b/compile/m.yohobuy.com/README.md deleted 100644 → 0
View file @7f0c268
-WAP
--- a/compile/www.yohobuy.com/README.md
View file @6320464
+++ b/compile/www.yohobuy.com/README.md
View file @6320464
-PC
+Mobile
--- a/framework @ 119c247f
+++ b/framework @ 119c247f
-Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
+Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
--- a/static/font/iconfont.eot
View file @6320464
+++ b/static/font/iconfont.eot
View file @6320464
--- a/static/font/iconfont.svg
View file @6320464
+++ b/static/font/iconfont.svg
View file @6320464
@@ -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 Fri Oct 23 16:38:57 2015
+Created by FontForge 20120731 at Fri Oct 30 10:27:45 2015
  By Ads
 </metadata>
 <defs>
@@ -19,7 +19,7 @@ Created by FontForge 20120731 at Fri Oct 23 16:38:57 2015
     bbox="-0.75 -224 3943 812.871"
     underline-thickness="50"
     underline-position="-100"
-    unicode-range="U+0078-E628"
+    unicode-range="U+0078-E62D"
   />
 <missing-glyph horiz-adv-x="374" 
 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
@@ -152,5 +152,19 @@ d="M866.5 663.5q-97.5 97.5 -228 132t-261.5 0t-228.5 -132t-132 -228.5t0 -261.5t13
     <glyph glyph-name="uniE628" unicode="&#xe628;" 
 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
 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" />
+    <glyph glyph-name="uniE629" unicode="&#xe629;" 
+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
+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" />
+    <glyph glyph-name="uniE62A" unicode="&#xe62a;" 
+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" />
+    <glyph glyph-name="uniE62B" unicode="&#xe62b;" 
+d="M761 539q0 -104 -73 -177t-177 -73q-51 0 -97 19.5t-79.5 53t-53.5 80t-20 97.5q0 104 73.5 177t177 73t176.5 -73t73 -177zM888 -164q11 22 9 48q-3 43 -15 83.5t-32 76t-46.5 66.5t-59.5 55t-69.5 42t-78.5 27t-85 9q-100 0 -186.5 -47.5t-139.5 -130t-60 -181.5
+q-1 -26 10 -48q5 -12 16 -18.5t24 -6.5h673q12 0 23 6.5t17 18.5z" />
+    <glyph glyph-name="uniE62C" unicode="&#xe62c;" horiz-adv-x="1048" 
+d="M832 -127q0 -23 -11.5 -42.5t-31 -31t-43 -11.5t-43 11.5t-31 31t-11.5 42.5q0 36 25 61t60.5 25t60.5 -25t25 -61zM533 -126.5q0 -35.5 -25 -60.5t-60 -25t-60 25t-25 60.5t25 60.5t60 25t60 -25t25 -60.5zM277 620l-35 159q-3 14 -15 23.5t-27 9.5h-147
+q-22 0 -37.5 -15.5t-15.5 -37.5t15.5 -38t37.5 -16h54l157 -627q3 -12 9.5 -22.5t16 -17.5t21 -11t23.5 -4h527q16 0 30.5 7t25 19.5t14.5 28.5l113 452q9 34 -13 62t-57 28h-697z" />
+    <glyph glyph-name="uniE62D" unicode="&#xe62d;" 
+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
+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" />
   </font>
 </defs></svg>
--- a/static/font/iconfont.ttf
View file @6320464
+++ b/static/font/iconfont.ttf
View file @6320464
--- a/static/font/iconfont.woff
View file @6320464
+++ b/static/font/iconfont.woff
View file @6320464
--- a/static/js/home/home.js
View file @6320464
+++ b/static/js/home/home.js
View file @6320464
@@ -197,5 +197,4 @@ function tsAnimate() {
     }
 }
-tsAnimate();
-
+setTimeout(tsAnimate, 3000);
--- a/template/m.yohobuy.com/partials/layout/footer_tab.phtml
View file @6320464
+++ b/template/m.yohobuy.com/partials/layout/footer_tab.phtml
View file @6320464
 {{# showFooterTab}}
 <div class="footer-tab">
     <div class="tab-item {{#if grilsHomePage}}current{{/if}}{{#if boysHomePage}}current{{/if}}{{#if kidsHomePage}}current{{/if}}{{#if lifestyleHomePage}}current{{/if}}">
-        <p class="iconfont tab-icon">&#xe611;</p>
+        <p class="iconfont tab-icon">&#xe62a;</p>
         <p class="tab-name">首页</p>
     </div>
     <div class="tab-item {{#if categoryPage}}current{{/if}}">
-        <p class="iconfont tab-icon">&#xe611;</p>
+        <p class="iconfont tab-icon">&#xe62d;</p>
         <p class="tab-name">分类</p>
     </div>
     <div class="tab-item {{#if guangHome}}current{{/if}}">
@@ -13,11 +13,11 @@
         <p class="tab-name">逛</p>
     </div>
     <div class="tab-item {{#if shoppingCartPage}}current{{/if}}">
-        <p class="iconfont tab-icon">&#xe611;</p>
+        <p class="iconfont tab-icon">&#xe62c;</p>
         <p class="tab-name">购物车</p>
     </div>
     <div class="tab-item {{#if minePage}}current{{/if}}">
-        <p class="iconfont tab-icon">&#xe611;</p>
+        <p class="iconfont tab-icon">&#xe62b;</p>
         <p class="tab-name">我的</p>
     </div>
 </div>