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

@@ -56,19 +56,17 @@
                 right: -74rem / $pxConvertRem;
                 right: -74rem / $pxConvertRem;
                 font-size: 32rem / $pxConvertRem;
                 font-size: 32rem / $pxConvertRem;
                 line-height: 60rem / $pxConvertRem;
                 line-height: 60rem / $pxConvertRem;
-                color: #bdbdbd;
+                color: #666;
             }
             }
 
 
             .cancel-btn {
             .cancel-btn {
                 display: inline;
                 display: inline;
-                color: #bdbdbd;
                 font-size: 32rem / $pxConvertRem;
                 font-size: 32rem / $pxConvertRem;
                 vertical-align: middle;
                 vertical-align: middle;
             }
             }
 
 
             .clear-text {
             .clear-text {
                 margin-right: 20rem / $pxConvertRem;
                 margin-right: 20rem / $pxConvertRem;
-                color: #666;
             }
             }
         }
         }
     }
     }

@@ -10,13 +10,23 @@
         line-height: 96rem / $pxConvertRem;
         line-height: 96rem / $pxConvertRem;
 
 
         .index-logo {
         .index-logo {
+            display: table-cell;
             float: left;
             float: left;
             font-size: 50rem / $pxConvertRem;
             font-size: 50rem / $pxConvertRem;
             width: 216rem / $pxConvertRem;
             width: 216rem / $pxConvertRem;
+            height: 96rem / $pxConvertRem;
             color: #343434;
             color: #343434;
+            vertical-align: middle;
             opacity: 1;
             opacity: 1;
             transition: all 400ms;
             transition: all 400ms;
 
 
+            img {
+                display: inline;
+                vertical-align: middle;
+                width: 207rem / $pxConvertRem;
+                height: 49rem / $pxConvertRem;
+            }
+
             &.action {
             &.action {
                 opacity: 0;
                 opacity: 0;
                 width: 0;
                 width: 0;
@@ -82,7 +92,7 @@
             }
             }
             .search-icon {
             .search-icon {
                 right: 10rem / $pxConvertRem;
                 right: 10rem / $pxConvertRem;
-                color: #000;
+                color: #666;
 
 
                 &.empty {
                 &.empty {
                     color: #e6e6e6;
                     color: #e6e6e6;

@@ -2,7 +2,9 @@
 <div class="index-page yoho-page">
 <div class="index-page yoho-page">
     <div class="index-container">
     <div class="index-container">
         <div class="index-header clearfix">
         <div class="index-header clearfix">
-            <div class="iconfont index-logo">&#xe60e;</div>
+            <div class="index-logo">
+                <img src="http://static.dev.yohobuy.com/img/yohologo.png">
+            </div>
             <div class="box">
             <div class="box">
                 <a href="javascript:void(0);" class="no-search">取消</a>
                 <a href="javascript:void(0);" class="no-search">取消</a>
                 <form action="{{searchUrl}}" class="index-search">
                 <form action="{{searchUrl}}" class="index-search">