fe / YOHOBUYWAP · Commits

Go to a project

Authored by hf
Commit 3d18c2a60f6fa3688cdcfb10ba9096e0e5faab5b 1 parent a5905ec8

code review by fei.hong: do merge new sale list and search codes

Inline Side-by-side
Showing 3 changed files with 6 additions and 16 deletions
@@ -461,16 +461,14 @@ @@ -461,16 +461,14 @@
461 </p> 461 </p>
462 </div> 462 </div>
463 </div> 463 </div>
464 -';}).'  
465 - <div class="center-content clearfix"> 464 +';}).' <div class="center-content clearfix">
466 '.''.Plugin\LCRun3::debug('if [pathNav]', 'ifv', $cx, Plugin\LCRun3::debug('[pathNav]', 'v', $cx, $in, array('pathNav')), $in, function($cx, $in) {return ' <p class="path-nav"> 465 '.''.Plugin\LCRun3::debug('if [pathNav]', 'ifv', $cx, Plugin\LCRun3::debug('[pathNav]', 'v', $cx, $in, array('pathNav')), $in, function($cx, $in) {return ' <p class="path-nav">
467 '.Plugin\LCRun3::debug('each [pathNav]', 'sec', $cx, Plugin\LCRun3::debug('[pathNav]', 'v', $cx, $in, array('pathNav')), $in, true, function($cx, $in) {return ''.Plugin\LCRun3::debug('if [href]', 'ifv', $cx, Plugin\LCRun3::debug('[href]', 'v', $cx, $in, array('href')), $in, function($cx, $in) {return ' <a '.Plugin\LCRun3::debug('if @[last]', 'ifv', $cx, Plugin\LCRun3::debug('@[last]', 'v', $cx, $cx['sp_vars'], array('last')), $in, function($cx, $in) {return 'class="last"';}).' href="'.Plugin\LCRun3::debug('[href]', 'encq', $cx, Plugin\LCRun3::debug('[href]', 'v', $cx, $in, array('href'))).'" title="'.Plugin\LCRun3::debug('[pathTitle]', 'encq', $cx, Plugin\LCRun3::debug('[pathTitle]', 'v', $cx, $in, array('pathTitle'))).'">'.Plugin\LCRun3::debug('[name]', 'raw', $cx, Plugin\LCRun3::debug('[name]', 'v', $cx, $in, array('name'))).'</a> 466 '.Plugin\LCRun3::debug('each [pathNav]', 'sec', $cx, Plugin\LCRun3::debug('[pathNav]', 'v', $cx, $in, array('pathNav')), $in, true, function($cx, $in) {return ''.Plugin\LCRun3::debug('if [href]', 'ifv', $cx, Plugin\LCRun3::debug('[href]', 'v', $cx, $in, array('href')), $in, function($cx, $in) {return ' <a '.Plugin\LCRun3::debug('if @[last]', 'ifv', $cx, Plugin\LCRun3::debug('@[last]', 'v', $cx, $cx['sp_vars'], array('last')), $in, function($cx, $in) {return 'class="last"';}).' href="'.Plugin\LCRun3::debug('[href]', 'encq', $cx, Plugin\LCRun3::debug('[href]', 'v', $cx, $in, array('href'))).'" title="'.Plugin\LCRun3::debug('[pathTitle]', 'encq', $cx, Plugin\LCRun3::debug('[pathTitle]', 'v', $cx, $in, array('pathTitle'))).'">'.Plugin\LCRun3::debug('[name]', 'raw', $cx, Plugin\LCRun3::debug('[name]', 'v', $cx, $in, array('name'))).'</a>
468 ';}, function($cx, $in) {return ' <span '.Plugin\LCRun3::debug('if @[last]', 'ifv', $cx, Plugin\LCRun3::debug('@[last]', 'v', $cx, $cx['sp_vars'], array('last')), $in, function($cx, $in) {return 'class="last"';}).' title="'.Plugin\LCRun3::debug('[pathTitle]', 'encq', $cx, Plugin\LCRun3::debug('[pathTitle]', 'v', $cx, $in, array('pathTitle'))).'">'.Plugin\LCRun3::debug('[name]', 'raw', $cx, Plugin\LCRun3::debug('[name]', 'v', $cx, $in, array('name'))).'</span> 467 ';}, function($cx, $in) {return ' <span '.Plugin\LCRun3::debug('if @[last]', 'ifv', $cx, Plugin\LCRun3::debug('@[last]', 'v', $cx, $cx['sp_vars'], array('last')), $in, function($cx, $in) {return 'class="last"';}).' title="'.Plugin\LCRun3::debug('[pathTitle]', 'encq', $cx, Plugin\LCRun3::debug('[pathTitle]', 'v', $cx, $in, array('pathTitle'))).'">'.Plugin\LCRun3::debug('[name]', 'raw', $cx, Plugin\LCRun3::debug('[name]', 'v', $cx, $in, array('name'))).'</span>
469 ';}).' 468 ';}).'
470 '.Plugin\LCRun3::debug('unless @[last]', 'unl', $cx, Plugin\LCRun3::debug('@[last]', 'v', $cx, $cx['sp_vars'], array('last')), $in, function($cx, $in) {return ' <span class="iconfont">&#xe601;</span> 469 '.Plugin\LCRun3::debug('unless @[last]', 'unl', $cx, Plugin\LCRun3::debug('@[last]', 'v', $cx, $cx['sp_vars'], array('last')), $in, function($cx, $in) {return ' <span class="iconfont">&#xe601;</span>
471 ';}).'';}).' </p> 470 ';}).'';}).' </p>
472 -';}).''.'  
473 -'.Plugin\LCRun3::debug('if [brandAbout]', 'ifv', $cx, Plugin\LCRun3::debug('[brandAbout]', 'v', $cx, $in, array('brandAbout')), $in, function($cx, $in) {return ' <div class="brand-about"> 471 +';}).''.''.Plugin\LCRun3::debug('if [brandAbout]', 'ifv', $cx, Plugin\LCRun3::debug('[brandAbout]', 'v', $cx, $in, array('brandAbout')), $in, function($cx, $in) {return ' <div class="brand-about">
474 '.Plugin\LCRun3::debug('[brandAbout]', 'raw', $cx, Plugin\LCRun3::debug('[brandAbout]', 'v', $cx, $in, array('brandAbout'))).' 472 '.Plugin\LCRun3::debug('[brandAbout]', 'raw', $cx, Plugin\LCRun3::debug('[brandAbout]', 'v', $cx, $in, array('brandAbout'))).'
475 </div> 473 </div>
476 ';}, function($cx, $in) {return ' <div class="list-left pull-left"> 474 ';}, function($cx, $in) {return ' <div class="list-left pull-left">
@@ -570,8 +568,7 @@ @@ -570,8 +568,7 @@
570 </div> 568 </div>
571 <img class="pull-right img" src="'.Plugin\LCRun3::debug('[img]', 'encq', $cx, Plugin\LCRun3::debug('[img]', 'v', $cx, $in, array('img'))).'"> 569 <img class="pull-right img" src="'.Plugin\LCRun3::debug('[img]', 'encq', $cx, Plugin\LCRun3::debug('[img]', 'v', $cx, $in, array('img'))).'">
572 </div> 570 </div>
573 -';}).'  
574 -'.''.Plugin\LCRun3::debug('[shopEntry]', 'sec', $cx, Plugin\LCRun3::debug('[shopEntry]', 'v', $cx, $in, array('shopEntry')), $in, false, function($cx, $in) {return ' <div class="shop-entry clearfix"> 571 +';}).''.''.Plugin\LCRun3::debug('[shopEntry]', 'sec', $cx, Plugin\LCRun3::debug('[shopEntry]', 'v', $cx, $in, array('shopEntry')), $in, false, function($cx, $in) {return ' <div class="shop-entry clearfix">
575 <a class="pull-left" href="'.Plugin\LCRun3::debug('[home]', 'encq', $cx, Plugin\LCRun3::debug('[home]', 'v', $cx, $in, array('home'))).'"> 572 <a class="pull-left" href="'.Plugin\LCRun3::debug('[home]', 'encq', $cx, Plugin\LCRun3::debug('[home]', 'v', $cx, $in, array('home'))).'">
576 <img class="logo" src="'.Plugin\LCRun3::debug('[logo]', 'encq', $cx, Plugin\LCRun3::debug('[logo]', 'v', $cx, $in, array('logo'))).'"> 573 <img class="logo" src="'.Plugin\LCRun3::debug('[logo]', 'encq', $cx, Plugin\LCRun3::debug('[logo]', 'v', $cx, $in, array('logo'))).'">
577 </a> 574 </a>
@@ -590,8 +587,7 @@ @@ -590,8 +587,7 @@
590 <span class="iconfont">&#xe601;</span> 587 <span class="iconfont">&#xe601;</span>
591 </a> 588 </a>
592 </div> 589 </div>
593 -';}).''.'  
594 -'.''.Plugin\LCRun3::debug('[filters]', 'sec', $cx, Plugin\LCRun3::debug('[filters]', 'v', $cx, $in, array('filters')), $in, false, function($cx, $in) {return ''.' <div class="filter-box"> 590 +';}).''.''.''.Plugin\LCRun3::debug('[filters]', 'sec', $cx, Plugin\LCRun3::debug('[filters]', 'v', $cx, $in, array('filters')), $in, false, function($cx, $in) {return ''.' <div class="filter-box">
595 '.Plugin\LCRun3::debug('[checkedConditions]', 'sec', $cx, Plugin\LCRun3::debug('[checkedConditions]', 'v', $cx, $in, array('checkedConditions')), $in, false, function($cx, $in) {return ' <div class="checked-conditions section"> 591 '.Plugin\LCRun3::debug('[checkedConditions]', 'sec', $cx, Plugin\LCRun3::debug('[checkedConditions]', 'v', $cx, $in, array('checkedConditions')), $in, false, function($cx, $in) {return ' <div class="checked-conditions section">
596 <span class="title">已选条件：</span> 592 <span class="title">已选条件：</span>
597 593
@@ -905,8 +901,7 @@ @@ -905,8 +901,7 @@
905 </div> 901 </div>
906 <p class="no-tip">建议您：看看输入的文字是否有误 / 减少分类条件限制 / 重新搜索</p> 902 <p class="no-tip">建议您：看看输入的文字是否有误 / 减少分类条件限制 / 重新搜索</p>
907 </div> 903 </div>
908 -'.'';}).''.'  
909 -'.''.Plugin\LCRun3::debug('if [latestWalk]', 'ifv', $cx, Plugin\LCRun3::debug('[latestWalk]', 'v', $cx, $in, array('latestWalk')), $in, function($cx, $in) {return ' <input id="latest-walk-count" type="hidden" value="'.Plugin\LCRun3::debug('[latestWalk]', 'encq', $cx, Plugin\LCRun3::debug('[latestWalk]', 'v', $cx, $in, array('latestWalk'))).'"> 904 +'.'';}).''.''.''.Plugin\LCRun3::debug('if [latestWalk]', 'ifv', $cx, Plugin\LCRun3::debug('[latestWalk]', 'v', $cx, $in, array('latestWalk')), $in, function($cx, $in) {return ' <input id="latest-walk-count" type="hidden" value="'.Plugin\LCRun3::debug('[latestWalk]', 'encq', $cx, Plugin\LCRun3::debug('[latestWalk]', 'v', $cx, $in, array('latestWalk'))).'">
910 <div class="latest-walk"> 905 <div class="latest-walk">
911 <h2>最近浏览的商品</h2> 906 <h2>最近浏览的商品</h2>
912 <div id="latest-walk-goods" class="goods clearfix"></div> 907 <div id="latest-walk-goods" class="goods clearfix"></div>
@@ -21,10 +21,8 @@ @@ -21,10 +21,8 @@
21 </div> 21 </div>
22 </div> 22 </div>
23 {{/ brandBanner}} 23 {{/ brandBanner}}
24 -  
25 <div class="center-content clearfix"> 24 <div class="center-content clearfix">
26 {{> layout/path-nav}} 25 {{> layout/path-nav}}
27 -  
28 {{#if brandAbout}} 26 {{#if brandAbout}}
29 <div class="brand-about"> 27 <div class="brand-about">
30 {{{brandAbout}}} 28 {{{brandAbout}}}
@@ -49,11 +47,8 @@ @@ -49,11 +47,8 @@
49 <img class="pull-right img" src="{{img}}"> 47 <img class="pull-right img" src="{{img}}">
50 </div> 48 </div>
51 {{/ sortIntro}} 49 {{/ sortIntro}}
52 -  
53 {{> product/shop-entry}} 50 {{> product/shop-entry}}
54 -  
55 {{> product/standard-content}} 51 {{> product/standard-content}}
56 -  
57 {{> product/latest-walk}} 52 {{> product/latest-walk}}
58 </div> 53 </div>
59 {{/if}} 54 {{/if}}
@@ -17,7 +17,7 @@ class IndexController extends WebAction @@ -17,7 +17,7 @@ class IndexController extends WebAction
17 public function brandAction() 17 public function brandAction()
18 { 18 {
19 //品牌域名,没有获取到品牌域名的跳转首页 19 //品牌域名,没有获取到品牌域名的跳转首页
20 - $domain = $this->param('named'); 20 + $domain = $this->param('named', 'adidas');
21 if (empty($domain)) { 21 if (empty($domain)) {
22 $this->go(SITE_MAIN); 22 $this->go(SITE_MAIN);
23 } 23 }