Authored by whb

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

1 -{{> layout/simple-header}} 1 +{{> layout/header}}
2 <div class="order-save-page yoho-page clearfix"> 2 <div class="order-save-page yoho-page clearfix">
3 {{# orderSave}} 3 {{# orderSave}}
4 <div class="order-edit"> 4 <div class="order-edit">
1 -{{> layout/simple-header}} 1 +{{> layout/header}}
2 <div class="passport-page yoho-page clearfix"> 2 <div class="passport-page yoho-page clearfix">
3 {{# passport}} 3 {{# passport}}
4 {{> passport/cover}} 4 {{> passport/cover}}
1 -{{> layout/simple-header}} 1 +{{> layout/header}}
2 <div class="welcome-page passport-page yoho-page clearfix"> 2 <div class="welcome-page passport-page yoho-page clearfix">
3 {{# passport}} 3 {{# passport}}
4 {{> passport/cover}} 4 {{> passport/cover}}
1 -{{> layout/simple-header}} 1 +{{> layout/header}}
2 <div class="back-page passport-page yoho-page clearfix"> 2 <div class="back-page passport-page yoho-page clearfix">
3 {{# back}} 3 {{# back}}
4 {{> passport/cover}} 4 {{> passport/cover}}
1 -{{> layout/simple-header}} 1 +{{> layout/header}}
2 <div class="reset-pwd-page back-page passport-page yoho-page clearfix"> 2 <div class="reset-pwd-page back-page passport-page yoho-page clearfix">
3 {{# resetPwd}} 3 {{# resetPwd}}
4 {{> passport/cover}} 4 {{> passport/cover}}
1 -{{> layout/simple-header}} 1 +{{> layout/header}}
2 <div class="reset-success-page back-page passport-page yoho-page clearfix"> 2 <div class="reset-success-page back-page passport-page yoho-page clearfix">
3 {{# resetSuccess}} 3 {{# resetSuccess}}
4 {{> passport/cover}} 4 {{> passport/cover}}
1 -{{> layout/simple-header}} 1 +{{> layout/header}}
2 <div class="send-email-page passport-page yoho-page clearfix"> 2 <div class="send-email-page passport-page yoho-page clearfix">
3 {{# sendEmail}} 3 {{# sendEmail}}
4 {{> passport/cover}} 4 {{> passport/cover}}
1 -{{> layout/simple-header}} 1 +{{> layout/header}}
2 <div class="verification-page back-page passport-page yoho-page clearfix"> 2 <div class="verification-page back-page passport-page yoho-page clearfix">
3 {{# verification}} 3 {{# verification}}
4 {{> passport/cover}} 4 {{> passport/cover}}
1 -{{> layout/simple-header}} 1 +{{> layout/header}}
2 <div class="login-page passport-page yoho-page clearfix"> 2 <div class="login-page passport-page yoho-page clearfix">
3 {{# passport}} 3 {{# passport}}
4 {{> passport/cover}} 4 {{> passport/cover}}
1 -{{> layout/simple-header}} 1 +{{> layout/header}}
2 <div class="passport-page yoho-page clearfix"> 2 <div class="passport-page yoho-page clearfix">
3 {{# passport}} 3 {{# passport}}
4 {{> passport/cover}} 4 {{> passport/cover}}
1 -{{> layout/simple-header}} 1 +{{> layout/header}}
2 <div class="passport-page yoho-page clearfix"> 2 <div class="passport-page yoho-page clearfix">
3 {{# passport}} 3 {{# passport}}
4 {{> passport/cover}} 4 {{> passport/cover}}
1 -{{> layout/simple-header}} 1 +{{> layout/header}}
2 <div class="bindwrapper"> 2 <div class="bindwrapper">
3 <h3 class="welcomeword"> 3 <h3 class="welcomeword">
4 欢迎加入 4 欢迎加入
@@ -48,3 +48,4 @@ @@ -48,3 +48,4 @@
48 </head> 48 </head>
49 <body> 49 <body>
50 {{> layout/page-header}} 50 {{> layout/page-header}}
  51 + {{> layout/simple-header}}
1 -<!DOCTYPE html>  
2 -<html>  
3 - <head>  
4 - <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />  
5 - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />  
6 - <meta http-equiv="Cache-Control" content="no-siteapp" />  
7 - <meta name="renderer" content="webkit">  
8 - <link rel="shortcut icon" href="http://www.yohobuy.com/favicon.ico" type="image/x-icon" />  
9 - <meta name="keywords" content="{{keywords}}">  
10 - <meta name="description" content="{{description}}">  
11 - <title>{{title}}</title>  
12 - <!-- [if (gte IE 6)&(lte IE 8)>  
13 - <script src="http://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>  
14 - <![endif]-->  
15 - {{#if rlsEnv}}  
16 - <link rel="stylesheet" href="http://cdn.yoho.cn/yohobuy/{{version}}/index.css">  
17 - {{/if}}  
18 - {{#if preEnv}}  
19 - <link rel="stylesheet" href="http://cdn.yoho.cn/yohobuy/{{version}}/index.css">  
20 - {{/if}}  
21 - {{#if testEnv}}  
22 - <link rel="stylesheet" href="http://static.buy.test.yoho.cn/dist/yohobuy/{{version}}/index.css">  
23 - {{/if}}  
24 - {{#if devEnv}}  
25 - <link rel="stylesheet" href="http://webstatic.dev.yohobuy.com/css/index.css">  
26 - {{/if}}  
27 - </head>  
28 - <body>  
29 - {{# simpleHeader}}  
30 - <div class="simple-header"> 1 +{{# simpleHeader}}
  2 +<div class="simple-header">
31 <div class="header-inner clearfix"> 3 <div class="header-inner clearfix">
32 {{# logo}} 4 {{# logo}}
33 <h1 class="logo"> 5 <h1 class="logo">
@@ -78,5 +50,5 @@ @@ -78,5 +50,5 @@
78 {{/ tool}} 50 {{/ tool}}
79 </ul> 51 </ul>
80 </div> 52 </div>
81 - </div>  
82 - {{/ simpleHeader}}  
  53 +</div>
  54 +{{/ simpleHeader}}