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 欢迎加入
@@ -47,4 +47,5 @@ @@ -47,4 +47,5 @@
47 {{/if}} 47 {{/if}}
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">  
31 - <div class="header-inner clearfix">  
32 - {{# logo}}  
33 - <h1 class="logo">  
34 - <a href="{{url}}">  
35 - <img src="{{img}}" alt="">  
36 - </a>  
37 - </h1>  
38 - {{/ logo}}  
39 - <ul class="header-tool clearfix">  
40 - {{# tool}}  
41 - <li>  
42 - <span>Hi~</span>  
43 - {{# user}}  
44 - <a href="{{userCenter}}">{{.}}</a>  
45 - {{/ user}} 1 +{{# simpleHeader}}
  2 +<div class="simple-header">
  3 + <div class="header-inner clearfix">
  4 + {{# logo}}
  5 + <h1 class="logo">
  6 + <a href="{{url}}">
  7 + <img src="{{img}}" alt="">
  8 + </a>
  9 + </h1>
  10 + {{/ logo}}
  11 + <ul class="header-tool clearfix">
  12 + {{# tool}}
  13 + <li>
  14 + <span>Hi~</span>
  15 + {{# user}}
  16 + <a href="{{userCenter}}">{{.}}</a>
  17 + {{/ user}}
46 18
47 - {{# loginHref}}  
48 - <a href="{{.}}">[请登录]</a>  
49 - {{/ loginHref}} 19 + {{# loginHref}}
  20 + <a href="{{.}}">[请登录]</a>
  21 + {{/ loginHref}}
50 22
51 - {{# logoutHref}}  
52 - <a href="{{.}}">[退出]</a>  
53 - {{/ logoutHref}} 23 + {{# logoutHref}}
  24 + <a href="{{.}}">[退出]</a>
  25 + {{/ logoutHref}}
54 26
55 - {{# registerHref}}  
56 - <a href="{{.}}">[免费注册]</a>  
57 - {{/ registerHref}}  
58 - </li>  
59 - <li class="tool-options">  
60 - <span>MY有货</span>  
61 - <i class="options-icon down iconfont">&#xe604;</i>  
62 - <i class="options-icon up iconfont">&#xe603;</i>  
63 - <div class="tool-select">  
64 - <a href="{{favoriteHref}}">我的收藏</a>  
65 - <a href="{{couponHref}}">优惠券</a>  
66 - </div>  
67 - </li>  
68 - <li>  
69 - <a href="{{orderHref}}">订单中心</a>  
70 - </li>  
71 - <li>  
72 - <a href="{{helpHref}}">帮助中心</a>  
73 - </li>  
74 - <li>  
75 - <i class="tell-icon iconfont">&#xe61c;</i>  
76 - <span>400-9889-9646</span>  
77 - </li>  
78 - {{/ tool}}  
79 - </ul>  
80 - </div>  
81 - </div>  
82 - {{/ simpleHeader}}  
  27 + {{# registerHref}}
  28 + <a href="{{.}}">[免费注册]</a>
  29 + {{/ registerHref}}
  30 + </li>
  31 + <li class="tool-options">
  32 + <span>MY有货</span>
  33 + <i class="options-icon down iconfont">&#xe604;</i>
  34 + <i class="options-icon up iconfont">&#xe603;</i>
  35 + <div class="tool-select">
  36 + <a href="{{favoriteHref}}">我的收藏</a>
  37 + <a href="{{couponHref}}">优惠券</a>
  38 + </div>
  39 + </li>
  40 + <li>
  41 + <a href="{{orderHref}}">订单中心</a>
  42 + </li>
  43 + <li>
  44 + <a href="{{helpHref}}">帮助中心</a>
  45 + </li>
  46 + <li>
  47 + <i class="tell-icon iconfont">&#xe61c;</i>
  48 + <span>400-9889-9646</span>
  49 + </li>
  50 + {{/ tool}}
  51 + </ul>
  52 + </div>
  53 +</div>
  54 +{{/ simpleHeader}}