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

@@ -51,6 +51,12 @@
         right: 10rem / $pxConvertRem;
     }
 
+    .nav-btn {
+        @extend %nav;
+        right: 10rem / $pxConvertRem;
+        font-size: 14px;
+    }
+
     .nav-title {
         position: absolute;
         margin-left: 100rem / $pxConvertRem;
@@ -68,16 +74,6 @@
         text-align: center;
     }
 
-    .nav-btn {
-        display: block;
-        height: 100%;
-        position: absolute;
-        top: 0;
-        right: 0;
-        font-size: pxToRem(26px);
-        color: #b0b0b0;
-        padding-right: pxToRem(32px);
-    }
 }
 .systemUpdate{
     width: 100%;
@@ -117,7 +113,7 @@
     top: 0;
     left: 0;
     p{
-        font-size: 52em / $pxConvertRem; 
+        font-size: 52em / $pxConvertRem;
         line-height: 60rem / $pxConvertRem;
         &:first-of-type{
             padding-top: 90rem / $pxConvertRem;
@@ -166,4 +162,4 @@
 }
 .none{
     display: none;
-}
\ No newline at end of file
+}

@@ -187,6 +187,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
             background: #fff;
             border: none;
             outline: none;
+            resize: none;
         }
 
         .img-form {
@@ -320,4 +321,4 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
             }
         }
     }
-}
\ No newline at end of file
+}

@@ -13,9 +13,10 @@
     <p class="nav-title">{{.}}</p>
     {{/navTitle}}
     {{# navBtn}}
-    <!-- <span class="nav-btn">{{.}}</span> -->
-    <!-- <i class="iconfont nav-home">&#xe638;</i> -->
-    <!--     <div class="homebuttom none">
+    <span class="nav-btn">{{.}}</span>
+    {{!--
+    <i class="iconfont nav-home">&#xe638;</i>
+    <div class="homebuttom none">
         <ul>
             <li>
                 <i class="iconfont">&#xe62a;</i>
@@ -34,7 +35,8 @@
                 <span>我的</span>
             </li>
         </ul>
-    </div> -->
+    </div>
+    --}}
     {{/ navBtn}}
 </header>
 

-{{> layout/header}}
+{{> layout/simple-header}}
 <div class="passport-page yoho-page clearfix">
     {{# passport}}
         {{> passport/cover}}

-{{> layout/header}}
+{{> layout/simple-header}}
 <div class="passport-page yoho-page clearfix">
     {{# passport}}
     {{> passport/cover}}