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

梁志锋
Commit 19fe815d23c96435709e74b5e54bc635e1281414 2 parents 289988d4 24ca2feb
Showing 12 changed files with 58 additions and 40 deletions
static/font/iconfont.eot
static/font/iconfont.svg
static/font/iconfont.ttf
static/font/iconfont.woff
static/sass/home/_thumb-row.scss
static/sass/me/_yoho-coin-detail.scss
static/sass/me/_yoho-coin-new.scss
static/sass/product/_comments-consults.scss
template/m.yohobuy.com/actions/product/detail/consults.phtml
web-static/sass/product/_filter-box.scss
web-static/sass/product/_sort-pager.scss
yohobuy/m.yohobuy.com/application/controllers/Home.php
--- a/static/font/iconfont.eot
View file @19fe815
+++ b/static/font/iconfont.eot
View file @19fe815
--- a/static/font/iconfont.svg
View file @19fe815
+++ b/static/font/iconfont.svg
View file @19fe815
@@ -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 Mon Dec 21 17:16:11 2015
+Created by FontForge 20120731 at Wed Jan 13 13:50:02 2016
  By Ads
 </metadata>
 <defs>
@@ -16,10 +16,10 @@ Created by FontForge 20120731 at Mon Dec 21 17:16:11 2015
     ascent="896"
     descent="-128"
     x-height="792"
-    bbox="-0.75 -224 3943 893"
+    bbox="-0.75 -224 3943 896"
     underline-thickness="50"
     underline-position="-100"
-    unicode-range="U+0078-E641"
+    unicode-range="U+0078-E644"
   />
 <missing-glyph horiz-adv-x="374" 
 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
@@ -268,5 +268,15 @@ d="M522 893q-103 0 -197 -40t-162 -108t-108.5 -162t-40.5 -197.5t40.5 -197.5t108.5
 t92.5 138.5t138.5 92.5t169 34.5t168.5 -34.5t138.5 -92.5t93 -138.5t34.5 -169t-34.5 -168.5t-93 -138.5t-138.5 -93t-169 -34.5zM775 268l-105 61q-11 4 -21 6.5t-18 2.5t-15 -0.5t-13 -4t-10 -5.5t-9 -6l-6 -7q-2 -2 -6 -7l-3 -4l-6 -10q-34 -4 -59 21l-51 50
 q-24 25 -20 60l9 4q3 5 16 16t17 18t4 25t-11 43h-1l-60 105q-8 13 -20.5 20t-26 7t-27.5 -7l-62 -36q-3 -1 -6 -4l-6 -6l-6 -6q-3 -3 -5.5 -6t-4.5 -5t-3 -4l-1 -1q-14 -87 24.5 -183.5t121.5 -174.5q72 -68 157 -101.5t165 -29.5q4 1 10.5 2.5t20.5 10t21 20.5l36 62
 q11 20 5.5 41.5t-25.5 32.5z" />
+    <glyph glyph-name="uniE642" unicode="&#xe642;" 
+d="M439 324h110l-54 148zM501 881q-101 0 -192.5 -39.5t-158 -105.5t-105.5 -158t-39 -193q0 -205 145 -350t350 -145q101 0 192.5 39t158 105.5t105.5 158.5t39 192.5t-39 192.5t-105.5 158t-158 105.5t-192.5 39.5zM656 180l-19 -9q-2 -1 -4 -1.5t-3.5 -1t-3.5 -0.5
+q-5 0 -9 2q-5 2 -8.5 5.5t-5.5 8.5l-27 69h-163l-25 -69q-4 -10 -14.5 -14t-19.5 1l-20 9q-9 4 -12.5 13t-0.5 18l151 401q6 16 23 16t23 -16l151 -401q3 -9 -0.5 -18t-12.5 -13z" />
+    <glyph glyph-name="uniE643" unicode="&#xe643;" horiz-adv-x="1124" 
+d="M859 896h-595q-109 0 -186.5 -77.5t-77.5 -186.5v-760l200 135q18 14 49.5 24t63.5 14.5t71.5 6.5t66 2t57 -1t34.5 -1h317q109 0 186.5 77.5t77.5 186.5v316q0 109 -77.5 186.5t-186.5 77.5zM477 367q-42 0 -71.5 29.5t-29.5 70.5t29.5 70t71.5 29t71.5 -29t29.5 -70
+q0 -14 -3.5 -27t-10 -23.5t-16 -20t-20.5 -15.5t-24 -10t-27 -4zM848 367q-42 0 -71.5 29.5t-29.5 70.5t29.5 70t71.5 29t71.5 -29t29.5 -70t-29.5 -70.5t-71.5 -29.5z" />
+    <glyph glyph-name="uniE644" unicode="&#xe644;" 
+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" />
   </font>
 </defs></svg>
--- a/static/font/iconfont.ttf
View file @19fe815
+++ b/static/font/iconfont.ttf
View file @19fe815
--- a/static/font/iconfont.woff
View file @19fe815
+++ b/static/font/iconfont.woff
View file @19fe815
--- a/static/sass/home/_thumb-row.scss
View file @19fe815
+++ b/static/sass/home/_thumb-row.scss
View file @19fe815
 #thumb-row {
-    @include flexbox((
-        display: box,
-        box-pack: justify
-    ), $version: 1);
-    @include flexbox((
-        display: flex,
-        justify-content: space-around
-    ), $version: 3);
+    // @include flexbox((
+    //     display: box,
+    //     box-pack: justify
+    // ), $version: 1);
+    // @include flexbox((
+    //     display: flex,
+    //     justify-content: space-around
+    // ), $version: 3);
     background-color: #f0f0f0;
     text-align: center;
-    padding: 32rem/$pxConvertRem 14rem/$pxConvertRem 0;
-
+    padding: 32rem/$pxConvertRem 0 0;
     .thumb-row-box {
         display: inline-block;
         width: 275rem/$pxConvertRem;
@@ -19,5 +18,6 @@
         background-size: 100%;
         background-repeat: no-repeat;
         background-position: center;
+        margin: 0 14.4rem/$pxConvertRem;
     }
 }
--- a/static/sass/me/_yoho-coin-detail.scss
View file @19fe815
+++ b/static/sass/me/_yoho-coin-detail.scss
View file @19fe815
@@ -47,7 +47,7 @@
             right: 0;
             top: 0;
             margin-right: pxToRem(30px);
-            font-size: pxToRem(28px);
+            font-size: pxToRem(34px);
             font-weight: bold;
             line-height: pxToRem(100px);
         }
--- a/static/sass/me/_yoho-coin-new.scss
View file @19fe815
+++ b/static/sass/me/_yoho-coin-new.scss
View file @19fe815
@@ -12,14 +12,12 @@
     }
     .info {
+        width: auto;
         color: #b0b0b0;
         font-size: pxToRem(24px);
-        line-height: 1;
-
+        line-height: 1rem;
         .dollar {
             display: inline-block;
-            // margin-right: pxToRem(6px);
-            vertical-align: middle;
             width: pxToRem(24px);
             height: pxToRem(24px);
             background: image-url("me/yoho-coin/dollar.png") center center;
@@ -29,15 +27,15 @@
     .more {
         display: inline-block;
-        margin: pxToRem(30px) 0;
+        margin: pxToRem(20px) 0 pxToRem(30px);
         color: #444;
-        font-size: pxToRem(24px);
-        line-height: pxToRem(40px);
-        width: pxToRem(152px);
-        height: pxToRem(36px);
+        font-size: pxToRem(28px);
+        line-height: pxToRem(44px);
+        width: pxToRem(168px);
+        height: pxToRem(42px);
         text-align: center;
         border: 1px solid #444;
-        border-radius: pxToRem(36px);
+        border-radius: pxToRem(22px);
     }
     .coin-tip {
@@ -45,7 +43,7 @@
         padding: pxToRem(20px) pxToRem(30px);
         font-size: pxToRem(24px);
         line-height: pxToRem(32px);
-        color: #dc6870;
+        color: #d0021b;
         border-top: 1px solid #e0e0e0;
         border-bottom: 1px solid #e0e0e0;
@@ -54,7 +52,7 @@
             width: pxToRem(32px);
             height: pxToRem(32px);
             font-weight: bold;
-            border: 2px solid #dc6870;
+            border: 2px solid #d0021b;
             border-radius: 50%;
         }
     }
--- a/static/sass/product/_comments-consults.scss
View file @19fe815
+++ b/static/sass/product/_comments-consults.scss
View file @19fe815
@@ -97,7 +97,7 @@
                 span {
                     display: block;
                     float: left;
-                    font-size: inherit;
+                    // font-size: inherit;
                     padding-right: pxToRem(15px);
                 }
                 p {
@@ -118,7 +118,7 @@
                 span {
                     display: block;
                     float: left;
-                    font-size: inherit;
+                    // font-size: inherit;
                     color: $mainFontC;
                     padding-right: pxToRem(15px);
                 }
--- a/template/m.yohobuy.com/actions/product/detail/consults.phtml
View file @19fe815
+++ b/template/m.yohobuy.com/actions/product/detail/consults.phtml
View file @19fe815
 {{> layout/header}}
 <div class="goods-consults-page yoho-page">
             <div class="goto-consult tap-hightlight" id="goto-consult" data-href="{{link}}">
-                    <i class="iconfont consult-logo">&#xe639;</i>
+                    <i class="iconfont consult-logo">&#xe643;</i>
                     <span>我要咨询</span>
                     <a href="{{link}}" class="iconfont enter-consult-page">&#xe604;</a>
             </div>
@@ -10,7 +10,7 @@
             {{#list}}
             <div class="consult-item" data-id="{{id}}">
                <div class="question">
-                   <span class="iconfont">&#xe639;</span>
+                   <span class="iconfont">&#xe644;</span>
                    <p>
                        {{question}}<br>
                        <span class="time">{{time}}</span>
@@ -18,7 +18,7 @@
                </div>
                <div class="answer">
-                       <span class="iconfont">&#xe63f;</span>
+                       <span class="iconfont">&#xe642;</span>
                        <p>{{answer}}</p>
                </div>
@@ -58,14 +58,14 @@
           {{#commonConsults}}
           <div class="faq-item">
               <div class="question">
-                            <span class="iconfont">&#xe639;</span>
+                            <span class="iconfont">&#xe644;</span>
                             <p>
                                 {{question}}
                             </p>
                     </div>
                     <div class="answer">
-                            <span class="iconfont">&#xe63f;</span>
+                            <span class="iconfont">&#xe642;</span>
                             <p>{{answer}}</p>
                     </div>
           </div>
--- a/web-static/sass/product/_filter-box.scss
View file @19fe815
+++ b/web-static/sass/product/_filter-box.scss
View file @19fe815
@@ -218,10 +218,11 @@
     .price-sure {
         height: 24px;
         width: 44px;
-        border: 1px solid #e0e0e0;
-        background: #fff;
-        color: #666;
+        background: #333;
+        color: #fff;
         margin-left: 10px;
+        outline: none;
+        border: none;
     }
     .color-block {
@@ -265,7 +266,7 @@
         top: 39px;
         background: #fff;
         border: 1px solid #eaeceb;
-        z-index: 1;
+        z-index: 2;
         ul {
             max-width: 950px;
--- a/web-static/sass/product/_sort-pager.scss
View file @19fe815
+++ b/web-static/sass/product/_sort-pager.scss
View file @19fe815
@@ -43,6 +43,7 @@
             color: #222;
             cursor: pointer;
             margin-right: 10px;
+            background: #fff;
         }
         .iconfont {
@@ -54,14 +55,21 @@
         > ul {
             position: absolute;
             display: none;
-            width: 42px;
-            padding: 0 3px;
+            width: 48px;
             border-left: 1px solid #ccc;
             border-right: 1px solid #ccc;
+            background: #fff;
+            z-index: 1;
         }
         li {
+            padding: 0 3px;
             border-bottom: 1px solid #ccc;
+
+            &:hover {
+                background: #376cf7;
+                color: #fff;
+            }
         }
         a {
@@ -84,4 +92,4 @@
             color: #f00;
         }
     }
-}
+}
--- a/yohobuy/m.yohobuy.com/application/controllers/Home.php
View file @19fe815
+++ b/yohobuy/m.yohobuy.com/application/controllers/Home.php
View file @19fe815
@@ -992,6 +992,7 @@ class HomeController extends AbstractAction
         $this->_view->display('currency-detail', array(
             'money' => $data['money'],
             'pageFooter' => true,
+            'currencyPage' => true,
             'currencyDetail' => true,
             'currencyDetailPage' => true
         ));