Merge branch 'release/4.8' of git.yoho.cn:fe/YOHOBUYWAP into release/4.8
Showing
8 changed files
with
48 additions
and
31 deletions
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
| @@ -42,7 +42,6 @@ var winH = $(window).height(), | @@ -42,7 +42,6 @@ var winH = $(window).height(), | ||
| 42 | var defaultOpt = require('./query-param'); | 42 | var defaultOpt = require('./query-param'); |
| 43 | 43 | ||
| 44 | var $listNav = $('#list-nav'), | 44 | var $listNav = $('#list-nav'), |
| 45 | - $posList = $('#pos-list'), | ||
| 46 | 45 | ||
| 47 | //导航数据信息 | 46 | //导航数据信息 |
| 48 | navInfo = { | 47 | navInfo = { |
| @@ -612,10 +611,6 @@ $listNav.bind('contextmenu', function(e) { | @@ -612,10 +611,6 @@ $listNav.bind('contextmenu', function(e) { | ||
| 612 | return false; | 611 | return false; |
| 613 | }); | 612 | }); |
| 614 | 613 | ||
| 615 | -$posList.bind('contextmenu', function(e) { | ||
| 616 | - return false; | ||
| 617 | -}); | ||
| 618 | - | ||
| 619 | $subNav.on('touchend touchcancel', function(e) { | 614 | $subNav.on('touchend touchcancel', function(e) { |
| 620 | var $this = $(e.target).closest('li'), | 615 | var $this = $(e.target).closest('li'), |
| 621 | cname, | 616 | cname, |
| @@ -783,12 +778,11 @@ $listNav.on('touchstart', 'li', function(e) { | @@ -783,12 +778,11 @@ $listNav.on('touchstart', 'li', function(e) { | ||
| 783 | myScroll.refresh(); | 778 | myScroll.refresh(); |
| 784 | }); | 779 | }); |
| 785 | 780 | ||
| 786 | -$posList.on('touchstart', 'li', function(e) { | 781 | +$nav2.on('touchstart', 'li', function(e) { |
| 787 | $(this).addClass('bytouch'); | 782 | $(this).addClass('bytouch'); |
| 788 | }).on('touchend touchcancel', function() { | 783 | }).on('touchend touchcancel', function() { |
| 789 | - $posList.find('li').removeClass('bytouch'); | 784 | + $listNav.find('li').removeClass('bytouch'); |
| 790 | myScroll.refresh(); | 785 | myScroll.refresh(); |
| 791 | - myScroll.scrollTo(0, -(imgH + nav1H + main1oH + 5)); | ||
| 792 | }); | 786 | }); |
| 793 | 787 | ||
| 794 | //底部导航点击 | 788 | //底部导航点击 |
| @@ -84,7 +84,7 @@ | @@ -84,7 +84,7 @@ | ||
| 84 | height: 28px; | 84 | height: 28px; |
| 85 | float: left; | 85 | float: left; |
| 86 | line-height: 28px; | 86 | line-height: 28px; |
| 87 | - width: 24%; | 87 | + width: 24.7%; |
| 88 | text-align: center; | 88 | text-align: center; |
| 89 | border-left: 1px solid #e1e1e1; | 89 | border-left: 1px solid #e1e1e1; |
| 90 | margin-top: 30px; | 90 | margin-top: 30px; |
| @@ -305,23 +305,39 @@ | @@ -305,23 +305,39 @@ | ||
| 305 | width: 24.8%; | 305 | width: 24.8%; |
| 306 | text-align: center; | 306 | text-align: center; |
| 307 | border-sizing: border-box; | 307 | border-sizing: border-box; |
| 308 | + position: relative; | ||
| 308 | 309 | ||
| 309 | span { | 310 | span { |
| 311 | + padding-top: 0; | ||
| 310 | font-size: 28px; | 312 | font-size: 28px; |
| 311 | } | 313 | } |
| 314 | + } | ||
| 312 | 315 | ||
| 313 | - &:first-child { | ||
| 314 | - border-left: none; | 316 | + .new:after { |
| 317 | + height: 28px; | ||
| 318 | + content: ''; | ||
| 319 | + border-left: 1px solid #e1e1e1; | ||
| 320 | + position: absolute; | ||
| 321 | + top: 25px; | ||
| 322 | + left: 163px; | ||
| 315 | } | 323 | } |
| 316 | 324 | ||
| 317 | - b { | ||
| 318 | - border-right: 1px solid #e1e1e1; | ||
| 319 | - display: block; | ||
| 320 | - width: 1px; | 325 | + .price:after { |
| 321 | height: 28px; | 326 | height: 28px; |
| 322 | - float: right; | ||
| 323 | - margin-top: 25px; | 327 | + content: ''; |
| 328 | + border-left: 1px solid #e1e1e1; | ||
| 329 | + position: absolute; | ||
| 330 | + top: 25px; | ||
| 331 | + left: 163px; | ||
| 324 | } | 332 | } |
| 333 | + | ||
| 334 | + .discount:after { | ||
| 335 | + height: 28px; | ||
| 336 | + content: ''; | ||
| 337 | + border-left: 1px solid #e1e1e1; | ||
| 338 | + position: absolute; | ||
| 339 | + top: 25px; | ||
| 340 | + left: 163px; | ||
| 325 | } | 341 | } |
| 326 | 342 | ||
| 327 | .active { | 343 | .active { |
| @@ -330,13 +346,12 @@ | @@ -330,13 +346,12 @@ | ||
| 330 | } | 346 | } |
| 331 | } | 347 | } |
| 332 | 348 | ||
| 333 | - | ||
| 334 | .list-nav .icon .up { | 349 | .list-nav .icon .up { |
| 335 | top: -28px; | 350 | top: -28px; |
| 336 | } | 351 | } |
| 337 | 352 | ||
| 338 | .list-nav .icon .down { | 353 | .list-nav .icon .down { |
| 339 | - top: -16px; | 354 | + top: -14px; |
| 340 | } | 355 | } |
| 341 | 356 | ||
| 342 | .goods-container { | 357 | .goods-container { |
| @@ -446,12 +461,15 @@ | @@ -446,12 +461,15 @@ | ||
| 446 | 461 | ||
| 447 | .pos-list { | 462 | .pos-list { |
| 448 | @extend .discount-page; | 463 | @extend .discount-page; |
| 464 | + background: #fff; | ||
| 465 | + width: 100%; | ||
| 466 | + overflow: hidden; | ||
| 449 | 467 | ||
| 450 | li { | 468 | li { |
| 451 | display: block; | 469 | display: block; |
| 452 | - height: 28px; | 470 | + height: 78px; |
| 453 | float: left; | 471 | float: left; |
| 454 | - line-height: 28px; | 472 | + line-height: 78px; |
| 455 | width: 24.8%; | 473 | width: 24.8%; |
| 456 | text-align: center; | 474 | text-align: center; |
| 457 | border-sizing: border-box; | 475 | border-sizing: border-box; |
| @@ -460,10 +478,6 @@ | @@ -460,10 +478,6 @@ | ||
| 460 | font-size: 28px; | 478 | font-size: 28px; |
| 461 | } | 479 | } |
| 462 | 480 | ||
| 463 | - &:first-child { | ||
| 464 | - border-left: none; | ||
| 465 | - } | ||
| 466 | - | ||
| 467 | a { | 481 | a { |
| 468 | display: block; | 482 | display: block; |
| 469 | box-sizing: border-box; | 483 | box-sizing: border-box; |
| @@ -471,17 +485,15 @@ | @@ -471,17 +485,15 @@ | ||
| 471 | width: 100%; | 485 | width: 100%; |
| 472 | height: 100%; | 486 | height: 100%; |
| 473 | color: #999; | 487 | color: #999; |
| 474 | - } | ||
| 475 | 488 | ||
| 476 | b { | 489 | b { |
| 477 | - border-right: 1px solid #e1e1e1; | ||
| 478 | - display: block; | ||
| 479 | - width: 1px; | ||
| 480 | height: 28px; | 490 | height: 28px; |
| 491 | + border-left: 1px solid #e1e1e1; | ||
| 481 | float: right; | 492 | float: right; |
| 482 | margin-top: 25px; | 493 | margin-top: 25px; |
| 483 | } | 494 | } |
| 484 | } | 495 | } |
| 496 | + } | ||
| 485 | 497 | ||
| 486 | .active .cur { | 498 | .active .cur { |
| 487 | color: #000; | 499 | color: #000; |
| @@ -512,6 +524,14 @@ | @@ -512,6 +524,14 @@ | ||
| 512 | } | 524 | } |
| 513 | } | 525 | } |
| 514 | 526 | ||
| 527 | + .pos-list .icon .up { | ||
| 528 | + top: -28px; | ||
| 529 | + } | ||
| 530 | + | ||
| 531 | + .pos-list .icon .down { | ||
| 532 | + top: -14px; | ||
| 533 | + } | ||
| 534 | + | ||
| 515 | .category-list-top-board { | 535 | .category-list-top-board { |
| 516 | border-top: 1px solid #e0e0e0; | 536 | border-top: 1px solid #e0e0e0; |
| 517 | } | 537 | } |
| @@ -130,11 +130,12 @@ | @@ -130,11 +130,12 @@ | ||
| 130 | </li> | 130 | </li> |
| 131 | </ul> | 131 | </ul> |
| 132 | 132 | ||
| 133 | - <ul id="pos-list" class="home-sub-nav pos-list nav hide"> | 133 | + <ul id="pos-list" class="home-sub-nav pos-list hide"> |
| 134 | <li class="new active buriedpoint" data-bp-id="shop_poslist_new_1"> | 134 | <li class="new active buriedpoint" data-bp-id="shop_poslist_new_1"> |
| 135 | <a href="javascript:void(0);"> | 135 | <a href="javascript:void(0);"> |
| 136 | <span class="spanTest">最新</span> | 136 | <span class="spanTest">最新</span> |
| 137 | <span class="iconfont cur"></span> | 137 | <span class="iconfont cur"></span> |
| 138 | + <b></b> | ||
| 138 | </a> | 139 | </a> |
| 139 | </li> | 140 | </li> |
| 140 | <li class="price buriedpoint" data-bp-id="shop_poslist_price_1"> | 141 | <li class="price buriedpoint" data-bp-id="shop_poslist_price_1"> |
| @@ -144,6 +145,7 @@ | @@ -144,6 +145,7 @@ | ||
| 144 | <i class="iconfont up cur"></i> | 145 | <i class="iconfont up cur"></i> |
| 145 | <i class="iconfont down"></i> | 146 | <i class="iconfont down"></i> |
| 146 | </span> | 147 | </span> |
| 148 | + <b></b> | ||
| 147 | </a> | 149 | </a> |
| 148 | </li> | 150 | </li> |
| 149 | <li class="discount buriedpoint" data-bp-id="shop_poslist_discount_1"> | 151 | <li class="discount buriedpoint" data-bp-id="shop_poslist_discount_1"> |
| @@ -153,6 +155,7 @@ | @@ -153,6 +155,7 @@ | ||
| 153 | <i class="iconfont up cur"></i> | 155 | <i class="iconfont up cur"></i> |
| 154 | <i class="iconfont down"></i> | 156 | <i class="iconfont down"></i> |
| 155 | </span> | 157 | </span> |
| 158 | + <b></b> | ||
| 156 | </a> | 159 | </a> |
| 157 | </li> | 160 | </li> |
| 158 | <li class="filter buriedpoint" data-bp-id="shop_poslist_filter_1"> | 161 | <li class="filter buriedpoint" data-bp-id="shop_poslist_filter_1"> |
| @@ -350,7 +350,7 @@ class SearchController extends AbstractAction | @@ -350,7 +350,7 @@ class SearchController extends AbstractAction | ||
| 350 | // $data = Product\ListModel::getClassData($condition); | 350 | // $data = Product\ListModel::getClassData($condition); |
| 351 | 351 | ||
| 352 | // 产品吴婷要求这么做，目的是保持性别中的所有性别和当前频道性别一致 | 352 | // 产品吴婷要求这么做，目的是保持性别中的所有性别和当前频道性别一致 |
| 353 | - if (isset($condition['gender']) && isset($condition['gender']) && $condition['gender'] === '1,2,3') { | 353 | + if (isset($condition['gender']) && isset($condition['channel']) && $condition['gender'] === '1,2,3') { |
| 354 | switch ($condition['channel']) { | 354 | switch ($condition['channel']) { |
| 355 | case 1: | 355 | case 1: |
| 356 | $condition['gender'] = '1,3'; | 356 | $condition['gender'] = '1,3'; |
-
Please register or login to post a comment