Authored by xuqi

clear useless if expression

@@ -523,11 +523,9 @@ @@ -523,11 +523,9 @@
523 ### 通用头部(包含在每个页面中) 523 ### 通用头部(包含在每个页面中)
524 524
525 { 525 {
526 - showGoBack: true/false, //是否显示GO-BACK链接  
527 - backUrl: '', 526 + backUrl: '', //GO-BACK链接, 不显示则不传
528 showHeaderImg: true/false, //显示头部图片 527 showHeaderImg: true/false, //显示头部图片
529 - showHeaderText: true/false, //显示头部文字  
530 - headerText: '' 528 + headerText: '' //头部标题文字
531 } 529 }
532 530
533 ### 区域列表 531 ### 区域列表
1 <div class="header"> 1 <div class="header">
2 - {{#if showGoBack}}  
3 - <a class="go-back" href={{../backUrl}}> 2 + {{#backUrl}}
  3 + <a class="go-back" href={{.}}>
4 <img src="http://static.dev.yohobuy.com/img/passport/go-back.png"> 4 <img src="http://static.dev.yohobuy.com/img/passport/go-back.png">
5 </a> 5 </a>
6 - {{/if}}  
7 - {{#if showHeaderImg}} 6 + {{/backUrl}}
  7 + {{#showHeaderImg}}
8 <img class="img-header" src="http://static.dev.yohobuy.com/img/passport/yoho-family.png"> 8 <img class="img-header" src="http://static.dev.yohobuy.com/img/passport/yoho-family.png">
9 - {{/if}}  
10 - {{#if showHeaderText}}  
11 - <p class="title">{{../headerText}}</p>  
12 - {{/if}} 9 + {{/showHeaderImg}}
  10 + {{#headerText}}
  11 + <p class="title">{{.}}</p>
  12 + {{/headerText}}
13 </div> 13 </div>
@@ -13,9 +13,7 @@ class BackController extends AbstractAction @@ -13,9 +13,7 @@ class BackController extends AbstractAction
13 public function emailAction() 13 public function emailAction()
14 { 14 {
15 $data = array( 15 $data = array(
16 - 'showGoBack' => true,  
17 - 'backUrl' => '',  
18 - 'showHeaderText' => true, 16 + 'backUrl' => 'm.yohobuy.com',
19 'headerText' => '找回密码', 17 'headerText' => '找回密码',
20 'isPassportPage' => true, 18 'isPassportPage' => true,
21 'modulePath' => 'passport/back/email' 19 'modulePath' => 'passport/back/email'
@@ -28,9 +26,7 @@ class BackController extends AbstractAction @@ -28,9 +26,7 @@ class BackController extends AbstractAction
28 public function successAction() 26 public function successAction()
29 { 27 {
30 $data = array( 28 $data = array(
31 - 'showGoBack' => true,  
32 - 'backUrl' => '',  
33 - 'showHeaderText' => true, 29 + 'backUrl' => 'm.yohobuy.com',
34 'headerText' => '找回密码', 30 'headerText' => '找回密码',
35 'isPassportPage' => true, 31 'isPassportPage' => true,
36 'modulePath' => 'passport/back/email-success', 32 'modulePath' => 'passport/back/email-success',
@@ -45,9 +41,7 @@ class BackController extends AbstractAction @@ -45,9 +41,7 @@ class BackController extends AbstractAction
45 public function mobileAction() 41 public function mobileAction()
46 { 42 {
47 $data = array( 43 $data = array(
48 - 'showGoBack' => true,  
49 - 'backUrl' => '',  
50 - 'showHeaderText' => true, 44 + 'backUrl' => 'm.yohobuy.com',
51 'headerText' => '找回密码', 45 'headerText' => '找回密码',
52 'isPassportPage' => true, 46 'isPassportPage' => true,
53 'modulePath' => 'passport/back/mobile', 47 'modulePath' => 'passport/back/mobile',
@@ -72,9 +66,7 @@ class BackController extends AbstractAction @@ -72,9 +66,7 @@ class BackController extends AbstractAction
72 public function codeAction() 66 public function codeAction()
73 { 67 {
74 $data = array( 68 $data = array(
75 - 'showGoBack' => true,  
76 - 'backUrl' => '',  
77 - 'showHeaderText' => true, 69 + 'backUrl' => 'm.yohobuy.com',
78 'headerText' => '找回密码', 70 'headerText' => '找回密码',
79 'isPassportPage' => true, 71 'isPassportPage' => true,
80 'modulePath' => 'passport/back/code', 72 'modulePath' => 'passport/back/code',
@@ -89,9 +81,7 @@ class BackController extends AbstractAction @@ -89,9 +81,7 @@ class BackController extends AbstractAction
89 public function passwordAction() 81 public function passwordAction()
90 { 82 {
91 $data = array( 83 $data = array(
92 - 'showGoBack' => true,  
93 - 'backUrl' => '',  
94 - 'showHeaderText' => true, 84 + 'backUrl' => 'm.yohobuy.com',
95 'headerText' => '找回密码', 85 'headerText' => '找回密码',
96 'isPassportPage' => true, 86 'isPassportPage' => true,
97 'modulePath' => 'passport/back/new-password', 87 'modulePath' => 'passport/back/new-password',
@@ -6,8 +6,7 @@ class LoginController extends AbstractAction @@ -6,8 +6,7 @@ class LoginController extends AbstractAction
6 public function indexAction() 6 public function indexAction()
7 { 7 {
8 $data = array( 8 $data = array(
9 - 'showGoBack' => true,  
10 - 'backUrl' => '', 9 + 'backUrl' => 'm.yohobuy.com',
11 'showHeaderImg' => true, 10 'showHeaderImg' => true,
12 'isPassportPage' => true, 11 'isPassportPage' => true,
13 'modulePath' => 'passport/login/login' 12 'modulePath' => 'passport/login/login'
@@ -20,9 +19,7 @@ class LoginController extends AbstractAction @@ -20,9 +19,7 @@ class LoginController extends AbstractAction
20 public function interationalAction() 19 public function interationalAction()
21 { 20 {
22 $data = array( 21 $data = array(
23 - 'showGoBack' => true,  
24 - 'backUrl' => '',  
25 - 'showHeaderText' => true, 22 + 'backUrl' => 'm.yohobuy.com',
26 'headerText' => '登录', 23 'headerText' => '登录',
27 'isPassportPage' => true, 24 'isPassportPage' => true,
28 'modulePath' => 'passport/login/interational', 25 'modulePath' => 'passport/login/interational',
@@ -6,9 +6,7 @@ class RegController extends AbstractAction @@ -6,9 +6,7 @@ class RegController extends AbstractAction
6 public function indexAction() 6 public function indexAction()
7 { 7 {
8 $data = array( 8 $data = array(
9 - 'showGoBack' => true,  
10 - 'backUrl' => '',  
11 - 'showHeaderText' => true, 9 + 'backUrl' => 'm.yohobuy.com',
12 'headerText' => '注册', 10 'headerText' => '注册',
13 'isPassportPage' => true, 11 'isPassportPage' => true,
14 'modulePath' => 'passport/register/register', 12 'modulePath' => 'passport/register/register',
@@ -33,9 +31,7 @@ class RegController extends AbstractAction @@ -33,9 +31,7 @@ class RegController extends AbstractAction
33 public function codeAction() 31 public function codeAction()
34 { 32 {
35 $data = array( 33 $data = array(
36 - 'showGoBack' => true,  
37 - 'backUrl' => '',  
38 - 'showHeaderText' => true, 34 + 'backUrl' => 'm.yohobuy.com',
39 'headerText' => '注册', 35 'headerText' => '注册',
40 'isPassportPage' => true, 36 'isPassportPage' => true,
41 'modulePath' => 'passport/register/code', 37 'modulePath' => 'passport/register/code',
@@ -50,9 +46,7 @@ class RegController extends AbstractAction @@ -50,9 +46,7 @@ class RegController extends AbstractAction
50 public function passwordAction() 46 public function passwordAction()
51 { 47 {
52 $data = array( 48 $data = array(
53 - 'showGoBack' => true,  
54 - 'backUrl' => '',  
55 - 'showHeaderText' => true, 49 + 'backUrl' => 'm.yohobuy.com',
56 'headerText' => '注册', 50 'headerText' => '注册',
57 'isPassportPage' => true, 51 'isPassportPage' => true,
58 'modulePath' => 'passport/register/password' 52 'modulePath' => 'passport/register/password'