fe / YOHOBUYPC · Commits

Go to a project

Authored by hf
Commit 3f2aba05d9b395e7889b558de09ee9e0b1f1dd1c 2 parents 3a6072d1 62fa7b79

Merge remote-tracking branch 'origin/develop' into test

Inline Side-by-side
Showing 13 changed files with 205 additions and 336 deletions
framework @ 119c247f
1 -Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2 1 +Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
@@ -40,8 +40,8 @@ var $listNav = $('#list-nav'), @@ -40,8 +40,8 @@ var $listNav = $('#list-nav'),
40 navInfo = { 40 navInfo = {
41 newest: { 41 newest: {
42 order: 1, 42 order: 1,
43 - reload: true,  
44 - page: 0, 43 + reload: false,
  44 + page: 1,
45 end: false 45 end: false
46 }, 46 },
47 price: { 47 price: {
@@ -59,6 +59,7 @@ var $listNav = $('#list-nav'), @@ -59,6 +59,7 @@ var $listNav = $('#list-nav'),
59 if ($('.swiper-container .swiper-slide').length > 1) { 59 if ($('.swiper-container .swiper-slide').length > 1) {
60 swiper = new Swiper('.swiper-container', { 60 swiper = new Swiper('.swiper-container', {
61 lazyLoading: true, 61 lazyLoading: true,
  62 + lazyLoadingInPrevNext: true,
62 loop: true, 63 loop: true,
63 autoplay: 3000, 64 autoplay: 3000,
64 autoplayDisableOnInteraction: false, 65 autoplayDisableOnInteraction: false,
@@ -57,7 +57,7 @@ var $listNav = $('#list-nav'), @@ -57,7 +57,7 @@ var $listNav = $('#list-nav'),
57 end: false 57 end: false
58 } 58 }
59 }, 59 },
60 - $pre, //纪录进入筛选前的active项 60 + $pre = $listNav.find('.active'), //纪录进入筛选前的active项，初始为选中项
61 searching; 61 searching;
62 62
63 $pgc.addClass('hide'); 63 $pgc.addClass('hide');
@@ -68,6 +68,7 @@ $('#today a').text(month + '月' + date + '号'); @@ -68,6 +68,7 @@ $('#today a').text(month + '月' + date + '号');
68 if ($('.swiper-container .swiper-slide').length > 1) { 68 if ($('.swiper-container .swiper-slide').length > 1) {
69 swiper = new Swiper('.swiper-container', { 69 swiper = new Swiper('.swiper-container', {
70 lazyLoading: true, 70 lazyLoading: true,
  71 + lazyLoadingInPrevNext: true,
71 loop: true, 72 loop: true,
72 autoplay: 3000, 73 autoplay: 3000,
73 autoplayDisableOnInteraction: false, 74 autoplayDisableOnInteraction: false,
1 -.header {  
2 - height: 87rem / $pxConvertRem;  
3 - line-height: 87rem / $pxConvertRem;  
4 - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #323232), color-stop(1, #414141));  
5 - background-image: -moz-gradient(linear, left top, left bottom, color-stop(0, #323232), color-stop(1, #414141));  
6 - background-image: gradient(linear, left top, left bottom, color-stop(0, #323232), color-stop(1, #414141));  
7 - position: relative;  
8 - .iconfont {  
9 - color: #fff;  
10 - }  
11 - .nav-btn {  
12 - position: absolute;  
13 - left: 32rem / $pxConvertRem;  
14 - top: 0;  
15 - bottom: 0;  
16 - z-index: 2;  
17 - }  
18 - .logo {  
19 - position: absolute;  
20 - top: 0;  
21 - left: 0;  
22 - right: 0;  
23 - bottom: 0;  
24 - text-align: center;  
25 - font-size: 56rem / $pxConvertRem;  
26 - }  
27 - .search-btn {  
28 - position: absolute;  
29 - right: 32rem / $pxConvertRem;  
30 - top: 0;  
31 - bottom: 0;  
32 - }  
33 -}  
34 -  
35 -.girls-wrap .header {  
36 - background: #fd307f;  
37 -}  
38 -  
39 -.kids-wrap .logo{  
40 - font-style: italic;  
41 - font-family: "helvetica","Arial","黑体";  
42 - font-weight: bold;  
43 - color: #fff;  
44 -}  
@@ -75,6 +75,14 @@ @@ -75,6 +75,14 @@
75 background: #FF88AE; 75 background: #FF88AE;
76 } 76 }
77 77
  78 +.kids-wrap .home-header {
  79 + background: #7ad9f9;
  80 +}
  81 +
  82 +.lifestyle-wrap .home-header {
  83 + background: #4f4138;
  84 +}
  85 +
78 .kids-wrap .logo { 86 .kids-wrap .logo {
79 font-style: italic; 87 font-style: italic;
80 font-family: "helvetica","Arial","榛戜綋"; 88 font-family: "helvetica","Arial","榛戜綋";
@@ -20,29 +20,17 @@ @@ -20,29 +20,17 @@
20 background: #fff; 20 background: #fff;
21 } 21 }
22 } 22 }
23 -  
24 - .discount-nav {  
25 - width: 100%;  
26 - height: 60rem / $pxConvertRem;  
27 - padding: 10rem / $pxConvertRem 0;  
28 - background-color: #fff;  
29 - }  
30 -  
31 - .discount-nav-item {  
32 - box-sizing: border-box;  
33 - float: left;  
34 - width: 25%;  
35 - height: 60rem / $pxConvertRem;  
36 - line-height: 60rem / $pxConvertRem;  
37 - text-align: center;  
38 - color: #ccc;  
39 - border-right: 1px solid #ccc;  
40 23
41 - &.focus {  
42 - color: #000; 24 + .banner-top-single{
  25 + width: 100%;
  26 + height: 240rem / $pxConvertRem;
  27 + img {
  28 + display: block;
  29 + height: 100%;
  30 + width: 100%;
43 } 31 }
44 } 32 }
45 - 33 +
46 .list-nav { 34 .list-nav {
47 > li { 35 > li {
48 float: left; 36 float: left;
@@ -112,7 +100,7 @@ @@ -112,7 +100,7 @@
112 vertical-align: middle; 100 vertical-align: middle;
113 color: #ccc; 101 color: #ccc;
114 font-size: 1.2em; 102 font-size: 1.2em;
115 - margin-top: 220px; 103 + margin-top: 160px;
116 } 104 }
117 105
118 .goods-container { 106 .goods-container {
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 3
4 .swiper-container { 4 .swiper-container {
5 width: 100%; 5 width: 100%;
6 - height: 310rem / $pxConvertRem; 6 + height: 240rem / $pxConvertRem;
7 7
8 img { 8 img {
9 height: 100%; 9 height: 100%;
@@ -20,12 +20,26 @@ @@ -20,12 +20,26 @@
20 background: #fff; 20 background: #fff;
21 } 21 }
22 } 22 }
23 -  
24 - .newarrival-nav { 23 +
  24 + .banner-top-single{
25 width: 100%; 25 width: 100%;
26 - height: 60rem / $pxConvertRem;  
27 - padding: 10rem / $pxConvertRem 0;  
28 - background-color: #fff; 26 + height: 240rem / $pxConvertRem;
  27 + img {
  28 + display: block;
  29 + height: 100%;
  30 + width: 100%;
  31 + }
  32 + }
  33 +
  34 + .list-nav {
  35 + > li {
  36 + float: left;
  37 + width: 25%;
  38 + height: 33px;
  39 + line-height: 33px;
  40 + text-align: center;
  41 + font-size: 14px;
  42 + }
29 43
30 a { 44 a {
31 display: block; 45 display: block;
@@ -34,21 +48,41 @@ @@ -34,21 +48,41 @@
34 height: 100%; 48 height: 100%;
35 color: #999; 49 color: #999;
36 } 50 }
  51 +
  52 + .active > a {
  53 + border-bottom: 2px solid #000;
  54 + color: #000;
  55 +
  56 + .iconfont {
  57 + color: #999;
  58 +
  59 + &.cur {
  60 + color: #000;
  61 + }
  62 + }
  63 + }
  64 +
  65 + .filter .iconfont {
  66 + font-size: 12px;
  67 + @include transition(transform 0.1 ease-in);
  68 + }
  69 +
  70 + .filter.active .iconfont {
  71 + @include rotate(-180deg);
  72 + }
37 } 73 }
38 74
39 - .newarrival-nav-item {  
40 - box-sizing: border-box;  
41 - float: left;  
42 - width: 25%;  
43 - height: 60rem / $pxConvertRem;  
44 - line-height: 60rem / $pxConvertRem; 75 + .no-result {
45 text-align: center; 76 text-align: center;
  77 + vertical-align: middle;
46 color: #ccc; 78 color: #ccc;
47 - border-right: 1px solid #ccc; 79 + font-size: 1.2em;
  80 + margin-top: 160px;
  81 + }
48 82
49 - &.focus {  
50 - color: #000;  
51 - } 83 + .goods-container {
  84 + position: relative;
  85 + min-height: 440px;
52 } 86 }
53 87
54 } 88 }
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="good-list-page yoho-page"> 2 <div class="good-list-page yoho-page">
3 - {{# goodList}}  
4 - {{# search}}  
5 - <div id="search-input" class="search-input">  
6 - <form action={{url}} method="get">  
7 - <i class="search-icon iconfont">&#xe60f;</i>  
8 - <input type="text" value={{default}} name="query">  
9 - <i class="clear-input iconfont hide">&#xe61a;</i>  
10 - <button id="search" class="search" type="submit">搜索</button>  
11 - </form>  
12 - </div>  
13 - {{/ search}}  
14 -  
15 - {{# brandWay}}  
16 - <div class="brand-way">  
17 - <a href={{url}}>  
18 - <img class="brand-thumb" src={{thumb}}>  
19 - <span>{{name}}</span>  
20 - <span class="entry">  
21 - 进入品牌  
22 - <i class="iconfont">&#xe614;</i>  
23 - </span>  
24 - </a>  
25 - </div>  
26 - {{/ brandWay}}  
27 -  
28 - {{# brandHome}}  
29 - <div id="brand-header" class="brand-header" data-id={{id}}>  
30 - <img class="lazy" data-original={{banner}}>  
31 - <a class="btn-intro" href="javascript:void(0);">  
32 - 品牌介绍  
33 - </a>  
34 - <a class="btn-col" href="javascript:void(0);">  
35 - <span class="iconfont">&#xe622;</span>  
36 - 收藏  
37 - </a>  
38 - </div>  
39 - <div id="intro-box" class="brand-intro-box hide">  
40 - <div id="brand-intro" class="brand-intro">  
41 - <h2>品牌介绍</h2>  
42 - <div class="con">  
43 - {{{intro}}}  
44 - </div>  
45 - <p class="fo">  
46 - <span></span>  
47 - 100%品牌授权正品  
48 - </p>  
49 - <span class="iconfont close-intro">&#xe623;</span>  
50 - </div>  
51 - </div>  
52 - {{/ brandHome}}  
53 -  
54 - <ul id="list-nav" class="list-nav clearfix">  
55 - <li class="new active">  
56 - <a href="javascript:void(0);">  
57 - 最新  
58 - <span class="iconfont cur">&#xe616;</span>  
59 - </a>  
60 - </li>  
61 - <li class="price">  
62 - <a href="javascript:void(0);">  
63 - 价格  
64 - <span class="icon">  
65 - <i class="iconfont up">&#xe615;</i>  
66 - <i class="iconfont down cur">&#xe616;</i>  
67 - </span>  
68 - </a>  
69 - </li>  
70 - <li class="discount">  
71 - <a href="javascript:void(0);">  
72 - 折扣  
73 - <span class="icon">  
74 - <i class="iconfont up">&#xe615;</i>  
75 - <i class="iconfont down cur">&#xe616;</i>  
76 - </span>  
77 - </a>  
78 - </li>  
79 - <li class="filter">  
80 - <a href="javascript:void(0);">  
81 - 筛选  
82 - <span class="iconfont">&#xe613;</span>  
83 - </a>  
84 - </li>  
85 - </ul>  
86 - <div id="goods-container" class="goods-container">  
87 - <div class="new-goods container">  
88 - {{# new}}  
89 - {{> good}}  
90 - {{/ new}}  
91 - </div>  
92 - <div class="price-goods container hide"></div>  
93 - <div class="discount-goods container hide"></div>  
94 -  
95 - {{> filter}}  
96 - </div>  
97 -  
98 - {{#if brand}}  
99 - <input id="brand" type="hidden" value={{brand}}>  
100 - {{/if}}  
101 -  
102 - {{#if gender}}  
103 - <input id="gender" type="hidden" value={{gender}}>  
104 - {{/if}}  
105 -  
106 - {{#if msort}}  
107 - <input id="msort" type="hidden" value={{msort}}>  
108 - {{/if}}  
109 -  
110 - {{#if color}}  
111 - <input id="color" type="hidden" value={{color}}>  
112 - {{/if}}  
113 -  
114 - {{#if size}}  
115 - <input id="size" type="hidden" value={{size}}>  
116 - {{/if}}  
117 -  
118 - {{#if price}}  
119 - <input id="price" type="hidden" value={{price}}>  
120 - {{/if}}  
121 -  
122 - {{#if discount}}  
123 - <input id="discount" type="hidden" value={{discount}}>  
124 - {{/if}}  
125 - {{/ goodList}} 3 + {{> product/list}}
126 </div> 4 </div>
127 {{> layout/footer}} 5 {{> layout/footer}}
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="good-list-page yoho-page"> 2 <div class="good-list-page yoho-page">
3 - {{# goodList}}  
4 - {{# search}}  
5 - <div id="search-input" class="search-input">  
6 - <form action={{url}} method="get">  
7 - <i class="search-icon iconfont">&#xe60f;</i>  
8 - <input type="text" value={{default}} name="query">  
9 - <i class="clear-input iconfont hide">&#xe61a;</i>  
10 - <button id="search" class="search" type="submit">搜索</button>  
11 - </form>  
12 - </div>  
13 - {{/ search}}  
14 -  
15 - {{# brandWay}}  
16 - <div class="brand-way">  
17 - <a href={{url}}>  
18 - <img class="brand-thumb" src={{thumb}}>  
19 - <span>{{name}}</span>  
20 - <span class="entry">  
21 - 进入品牌  
22 - <i class="iconfont">&#xe614;</i>  
23 - </span>  
24 - </a>  
25 - </div>  
26 - {{/ brandWay}}  
27 -  
28 - {{# brandHome}}  
29 - <div id="brand-header" class="brand-header" data-id={{id}}>  
30 - <img class="lazy" data-original={{banner}}>  
31 - <a class="btn-intro" href="javascript:void(0);">  
32 - 品牌介绍  
33 - </a>  
34 - <a class="btn-col" href="javascript:void(0);">  
35 - <span class="iconfont">&#xe622;</span>  
36 - 收藏  
37 - </a>  
38 - </div>  
39 - <div id="intro-box" class="brand-intro-box hide">  
40 - <div id="brand-intro" class="brand-intro">  
41 - <h2>品牌介绍</h2>  
42 - <div class="con">  
43 - {{{intro}}}  
44 - </div>  
45 - <p class="fo">  
46 - <span></span>  
47 - 100%品牌授权正品  
48 - </p>  
49 - <span class="iconfont close-intro">&#xe623;</span>  
50 - </div>  
51 - </div>  
52 - {{/ brandHome}}  
53 -  
54 - <ul id="list-nav" class="list-nav clearfix">  
55 - <li class="new active">  
56 - <a href="javascript:void(0);">  
57 - 最新  
58 - <span class="iconfont cur">&#xe616;</span>  
59 - </a>  
60 - </li>  
61 - <li class="price">  
62 - <a href="javascript:void(0);">  
63 - 价格  
64 - <span class="icon">  
65 - <i class="iconfont up">&#xe615;</i>  
66 - <i class="iconfont down cur">&#xe616;</i>  
67 - </span>  
68 - </a>  
69 - </li>  
70 - <li class="discount">  
71 - <a href="javascript:void(0);">  
72 - 折扣  
73 - <span class="icon">  
74 - <i class="iconfont up">&#xe615;</i>  
75 - <i class="iconfont down cur">&#xe616;</i>  
76 - </span>  
77 - </a>  
78 - </li>  
79 - <li class="filter">  
80 - <a href="javascript:void(0);">  
81 - 筛选  
82 - <span class="iconfont">&#xe613;</span>  
83 - </a>  
84 - </li>  
85 - </ul>  
86 - <div id="goods-container" class="goods-container">  
87 - <div class="new-goods container clearfix">  
88 - {{# new}}  
89 - {{> good}}  
90 - {{/ new}}  
91 - </div>  
92 - <div class="price-goods container clearfix hide"></div>  
93 - <div class="discount-goods container clearfix hide"></div>  
94 -  
95 - {{> filter}}  
96 - </div>  
97 -  
98 - {{#if brand}}  
99 - <input id="brand" type="hidden" value={{brand}}>  
100 - {{/if}}  
101 -  
102 - {{#if gender}}  
103 - <input id="gender" type="hidden" value={{gender}}>  
104 - {{/if}}  
105 -  
106 - {{#if msort}}  
107 - <input id="msort" type="hidden" value={{msort}}>  
108 - {{/if}}  
109 -  
110 - {{#if color}}  
111 - <input id="color" type="hidden" value={{color}}>  
112 - {{/if}}  
113 -  
114 - {{#if size}}  
115 - <input id="size" type="hidden" value={{size}}>  
116 - {{/if}}  
117 -  
118 - {{#if price}}  
119 - <input id="price" type="hidden" value={{price}}>  
120 - {{/if}}  
121 -  
122 - {{#if discount}}  
123 - <input id="discount" type="hidden" value={{discount}}>  
124 - {{/if}}  
125 -  
126 - {{#if query}}  
127 - <input id="query" type="hidden" value={{query}}>  
128 - {{/if}}  
129 - {{/ goodList}} 3 + {{> product/list}}
130 </div> 4 </div>
131 {{> layout/footer}} 5 {{> layout/footer}}
1 {{> layout/header}} 1 {{> layout/header}}
2 -<div class="good-list-page yoho-page"> 2 +<div class="newarrival-page yoho-page">
3 {{# headerBanner}} 3 {{# headerBanner}}
4 {{> product/banner_swipe_and_single}} 4 {{> product/banner_swipe_and_single}}
5 {{/ headerBanner}} 5 {{/ headerBanner}}
@@ -18,8 +18,10 @@ @@ -18,8 +18,10 @@
18 </div> 18 </div>
19 </div> 19 </div>
20 {{^}} 20 {{^}}
  21 +<div class="banner-top-single">
21 <a href={{url}}> 22 <a href={{url}}>
22 <img class="img" src={{img}}> 23 <img class="img" src={{img}}>
23 </a> 24 </a>
  25 +</div>
24 {{/if}} 26 {{/if}}
25 27
  1 +{{# goodList}}
  2 + {{# search}}
  3 + <div id="search-input" class="search-input">
  4 + <form action={{url}} method="get">
  5 + <i class="search-icon iconfont">&#xe60f;</i>
  6 + <input type="text" value={{default}} name="query">
  7 + <i class="clear-input iconfont hide">&#xe61a;</i>
  8 + <button id="search" class="search" type="submit">搜索</button>
  9 + </form>
  10 + </div>
  11 + {{/ search}}
  12 +
  13 + {{# brandWay}}
  14 + <div class="brand-way">
  15 + <a href={{url}}>
  16 + <img class="brand-thumb" src={{thumb}}>
  17 + <span>{{name}}</span>
  18 + <span class="entry">
  19 + 进入品牌
  20 + <i class="iconfont">&#xe614;</i>
  21 + </span>
  22 + </a>
  23 + </div>
  24 + {{/ brandWay}}
  25 +
  26 + {{# brandHome}}
  27 + <div id="brand-header" class="brand-header" data-id={{id}}>
  28 + <img class="lazy" data-original={{banner}}>
  29 + <a class="btn-intro" href="javascript:void(0);">
  30 + 品牌介绍
  31 + </a>
  32 + <a class="btn-col" href="javascript:void(0);">
  33 + <span class="iconfont">&#xe622;</span>
  34 + 收藏
  35 + </a>
  36 + </div>
  37 + <div id="intro-box" class="brand-intro-box hide">
  38 + <div id="brand-intro" class="brand-intro">
  39 + <h2>品牌介绍</h2>
  40 + <div class="con">
  41 + {{{intro}}}
  42 + </div>
  43 + <p class="fo">
  44 + <span></span>
  45 + 100%品牌授权正品
  46 + </p>
  47 + <span class="iconfont close-intro">&#xe623;</span>
  48 + </div>
  49 + </div>
  50 + {{/ brandHome}}
  51 +
  52 + <ul id="list-nav" class="list-nav clearfix">
  53 + <li class="new active">
  54 + <a href="javascript:void(0);">
  55 + 最新
  56 + <span class="iconfont cur">&#xe616;</span>
  57 + </a>
  58 + </li>
  59 + <li class="price">
  60 + <a href="javascript:void(0);">
  61 + 价格
  62 + <span class="icon">
  63 + <i class="iconfont up">&#xe615;</i>
  64 + <i class="iconfont down cur">&#xe616;</i>
  65 + </span>
  66 + </a>
  67 + </li>
  68 + <li class="discount">
  69 + <a href="javascript:void(0);">
  70 + 折扣
  71 + <span class="icon">
  72 + <i class="iconfont up">&#xe615;</i>
  73 + <i class="iconfont down cur">&#xe616;</i>
  74 + </span>
  75 + </a>
  76 + </li>
  77 + <li class="filter">
  78 + <a href="javascript:void(0);">
  79 + 筛选
  80 + <span class="iconfont">&#xe613;</span>
  81 + </a>
  82 + </li>
  83 + </ul>
  84 + <div id="goods-container" class="goods-container">
  85 + <div class="new-goods container clearfix">
  86 + {{# new}}
  87 + {{> good}}
  88 + {{/ new}}
  89 + </div>
  90 + <div class="price-goods container clearfix hide"></div>
  91 + <div class="discount-goods container clearfix hide"></div>
  92 +
  93 + {{> filter}}
  94 + </div>
  95 +
  96 + {{#if brand}}
  97 + <input id="brand" type="hidden" value={{brand}}>
  98 + {{/if}}
  99 +
  100 + {{#if gender}}
  101 + <input id="gender" type="hidden" value={{gender}}>
  102 + {{/if}}
  103 +
  104 + {{#if msort}}
  105 + <input id="msort" type="hidden" value={{msort}}>
  106 + {{/if}}
  107 +
  108 + {{#if color}}
  109 + <input id="color" type="hidden" value={{color}}>
  110 + {{/if}}
  111 +
  112 + {{#if size}}
  113 + <input id="size" type="hidden" value={{size}}>
  114 + {{/if}}
  115 +
  116 + {{#if price}}
  117 + <input id="price" type="hidden" value={{price}}>
  118 + {{/if}}
  119 +
  120 + {{#if discount}}
  121 + <input id="discount" type="hidden" value={{discount}}>
  122 + {{/if}}
  123 +
  124 + {{#if query}}
  125 + <input id="query" type="hidden" value={{query}}>
  126 + {{/if}}
  127 +{{/ goodList}}