fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by Rock Zhang
Commit d50b0a8ce148e21ad17231dd8bae513528388573 1 parent ffdce62c

去掉会员信息，订单列表，地址管理，优惠券，商品详情的评价和咨询，浏览记录，意见反馈页面的右上角导航 

Code Review By Rock Zhang
Inline Side-by-side
Showing 4 changed files with 20 additions and 18 deletions
@@ -429,10 +429,10 @@ class AbstractAction extends Controller_Abstract @@ -429,10 +429,10 @@ class AbstractAction extends Controller_Abstract
429 * 429 *
430 * @param string $title 头部标题 430 * @param string $title 头部标题
431 * @param mixed $backUrl 返回的链接 431 * @param mixed $backUrl 返回的链接
432 - * @param string $homeUrl 返回首页的链接 432 + * @param boolean $navBtn 是否显示右上角导航
433 * @return void 433 * @return void
434 */ 434 */
435 - protected function setNavHeader($title = '', $backUrl = true, $homeUrl = '/', $navBtn = false) 435 + protected function setNavHeader($title = '', $backUrl = true, $navBtn = true)
436 { 436 {
437 $header = array(); 437 $header = array();
438 438
@@ -450,9 +450,9 @@ class AbstractAction extends Controller_Abstract @@ -450,9 +450,9 @@ class AbstractAction extends Controller_Abstract
450 if (!empty($title)) { 450 if (!empty($title)) {
451 $header['navTitle'] = $title; 451 $header['navTitle'] = $title;
452 } 452 }
453 - if (!empty($homeUrl)) { 453 + /*if (!empty($homeUrl)) {
454 $header['navHome'] = $homeUrl . '?go=1&t=' . time(); 454 $header['navHome'] = $homeUrl . '?go=1&t=' . time();
455 - } 455 + }*/
456 if ($navBtn) { 456 if ($navBtn) {
457 $header['navBtn'] = $navBtn; 457 $header['navBtn'] = $navBtn;
458 } 458 }
@@ -3,9 +3,9 @@ @@ -3,9 +3,9 @@
3 {{#navBack}} 3 {{#navBack}}
4 <a href="{{#if backUrl}}{{backUrl}}{{^}}javascript:history.go(-1);{{/if}}" class="iconfont nav-back">&#xe610;</a> 4 <a href="{{#if backUrl}}{{backUrl}}{{^}}javascript:history.go(-1);{{/if}}" class="iconfont nav-back">&#xe610;</a>
5 {{/navBack}} 5 {{/navBack}}
6 - {{#navHome}} 6 + {{#navBtn}}
7 <span class="iconfont nav-home">&#xe62d;</span> 7 <span class="iconfont nav-home">&#xe62d;</span>
8 - {{/navHome}} 8 + {{/navBtn}}
9 {{#currencyPage}} 9 {{#currencyPage}}
10 <a href="/home/helpDetail?code=20151230-102233&caption=YOHO币介绍" class="iconfont nav-home">&#xe639;</a> 10 <a href="/home/helpDetail?code=20151230-102233&caption=YOHO币介绍" class="iconfont nav-home">&#xe639;</a>
11 {{/currencyPage}} 11 {{/currencyPage}}
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
19 <p class="nav-title">{{.}}</p> 19 <p class="nav-title">{{.}}</p>
20 {{/navTitle}} 20 {{/navTitle}}
21 </header> 21 </header>
  22 +{{#navBtn}}
22 <div class="homebuttom none"> 23 <div class="homebuttom none">
23 <ul> 24 <ul>
24 <li> 25 <li>
@@ -47,5 +48,6 @@ @@ -47,5 +48,6 @@
47 </li> 48 </li>
48 </ul> 49 </ul>
49 </div> 50 </div>
  51 +{{/navBtn}}
50 52
51 {{/pageHeader}} 53 {{/pageHeader}}
@@ -186,7 +186,7 @@ class HomeController extends AbstractAction @@ -186,7 +186,7 @@ class HomeController extends AbstractAction
186 186
187 // 设置网站标题 187 // 设置网站标题
188 $this->setTitle('浏览记录'); 188 $this->setTitle('浏览记录');
189 - $this->setNavHeader('浏览记录', true, SITE_MAIN); 189 + $this->setNavHeader('浏览记录', true, false);
190 190
191 $this->_view->display('browse-record', array( 191 $this->_view->display('browse-record', array(
192 'browseRecordPage' => true, 192 'browseRecordPage' => true,
@@ -240,7 +240,7 @@ class HomeController extends AbstractAction @@ -240,7 +240,7 @@ class HomeController extends AbstractAction
240 $this->auditJumpLogin(); 240 $this->auditJumpLogin();
241 241
242 $this->setTitle('个人信息'); 242 $this->setTitle('个人信息');
243 - $this->setNavHeader('个人信息'); 243 + $this->setNavHeader('个人信息', true, false);
244 244
245 $data = UserModel::getUserProfileData($this->_uid); 245 $data = UserModel::getUserProfileData($this->_uid);
246 $data['personalDetailsPage'] = true; 246 $data['personalDetailsPage'] = true;
@@ -278,7 +278,7 @@ class HomeController extends AbstractAction @@ -278,7 +278,7 @@ class HomeController extends AbstractAction
278 $this->auditJumpLogin(); 278 $this->auditJumpLogin();
279 279
280 $this->setTitle('优惠券'); 280 $this->setTitle('优惠券');
281 - $this->setNavHeader('优惠券', true, SITE_MAIN); 281 + $this->setNavHeader('优惠券', true, false);
282 282
283 $coupons = array( 283 $coupons = array(
284 'couponsPage' => true, 284 'couponsPage' => true,
@@ -337,7 +337,7 @@ class HomeController extends AbstractAction @@ -337,7 +337,7 @@ class HomeController extends AbstractAction
337 337
338 // 设置网站标题 338 // 设置网站标题
339 $this->setTitle('地址管理'); 339 $this->setTitle('地址管理');
340 - $this->setNavHeader('地址管理', Helpers::url('/home')); 340 + $this->setNavHeader('地址管理', Helpers::url('/home'), false);
341 341
342 $uid = $this->_uid; 342 $uid = $this->_uid;
343 $address = UserModel::getAddressData($uid); 343 $address = UserModel::getAddressData($uid);
@@ -530,7 +530,7 @@ class HomeController extends AbstractAction @@ -530,7 +530,7 @@ class HomeController extends AbstractAction
530 { 530 {
531 // 设置网站标题 531 // 设置网站标题
532 $this->setTitle('意见反馈'); 532 $this->setTitle('意见反馈');
533 - $this->setNavHeader('意见反馈'); 533 + $this->setNavHeader('意见反馈', true, false);
534 534
535 $udid = $this->getUdid(); 535 $udid = $this->getUdid();
536 $page = $this->get('page', 1); 536 $page = $this->get('page', 1);
@@ -617,7 +617,7 @@ class HomeController extends AbstractAction @@ -617,7 +617,7 @@ class HomeController extends AbstractAction
617 //设置网站seo信息 617 //设置网站seo信息
618 $this->setTitle('会员等级'); 618 $this->setTitle('会员等级');
619 //显示网站导航头部信息 619 //显示网站导航头部信息
620 - $this->setNavHeader('会员等级'); 620 + $this->setNavHeader('会员等级', true, false);
621 621
622 $channel = Helpers::getChannelByCookie(); 622 $channel = Helpers::getChannelByCookie();
623 $data = GradeModel::getGrade($channel, $this->_uid); 623 $data = GradeModel::getGrade($channel, $this->_uid);
@@ -638,7 +638,7 @@ class HomeController extends AbstractAction @@ -638,7 +638,7 @@ class HomeController extends AbstractAction
638 //设置网站seo信息 638 //设置网站seo信息
639 $this->setTitle('会员等级'); 639 $this->setTitle('会员等级');
640 //显示网站导航头部信息 640 //显示网站导航头部信息
641 - $this->setNavHeader('会员特权详情'); 641 + $this->setNavHeader('会员特权详情', true, false);
642 642
643 $channel = Helpers::getChannelByCookie(); 643 $channel = Helpers::getChannelByCookie();
644 $data = GradeModel::getPreferential($channel, $this->_uid); 644 $data = GradeModel::getPreferential($channel, $this->_uid);
@@ -658,7 +658,7 @@ class HomeController extends AbstractAction @@ -658,7 +658,7 @@ class HomeController extends AbstractAction
658 $this->auditJumpLogin(); 658 $this->auditJumpLogin();
659 659
660 $this->setTitle('我的订单'); 660 $this->setTitle('我的订单');
661 - $this->setNavHeader('我的订单', Helpers::url('/home')); 661 + $this->setNavHeader('我的订单', Helpers::url('/home'), false);
662 662
663 $order = array(); 663 $order = array();
664 //获得type值,type:1=>全部,2=>待付款,3=>待发货,4=>待收货,5=>待评论 664 //获得type值,type:1=>全部,2=>待付款,3=>待发货,4=>待收货,5=>待评论
@@ -116,9 +116,9 @@ class DetailController extends AbstractAction @@ -116,9 +116,9 @@ class DetailController extends AbstractAction
116 $total = 0; 116 $total = 0;
117 } 117 }
118 if ($total) { 118 if ($total) {
119 - $this->setNavHeader('购买评价（' . $total . '）'); 119 + $this->setNavHeader('购买评价（' . $total . '）', true, false);
120 } else { 120 } else {
121 - $this->setNavHeader('购买评价'); 121 + $this->setNavHeader('购买评价', true, false);
122 } 122 }
123 $this->setTitle('购买评价'); 123 $this->setTitle('购买评价');
124 124
@@ -148,9 +148,9 @@ class DetailController extends AbstractAction @@ -148,9 +148,9 @@ class DetailController extends AbstractAction
148 $total = 0; 148 $total = 0;
149 } 149 }
150 if ($total) { 150 if ($total) {
151 - $this->setNavHeader('购买咨询（' . $total . '）'); 151 + $this->setNavHeader('购买咨询（' . $total . '）', true, false);
152 } else { 152 } else {
153 - $this->setNavHeader('购买咨询'); 153 + $this->setNavHeader('购买咨询', true, false);
154 } 154 }
155 $this->setTitle('购买咨询'); 155 $this->setTitle('购买咨询');
156 156