Authored by 郭成尧

Merge branch 'feature/guangV3' into 'release/6.3'

删除限定,lazyload,修改地址



See merge request !1166
@@ -42,7 +42,7 @@ router.get(/^\/(.*?)-plusstar/, rewrite.resolve, plusstar.index); // 潮流优 @@ -42,7 +42,7 @@ router.get(/^\/(.*?)-plusstar/, rewrite.resolve, plusstar.index); // 潮流优
42 router.post('/plusstar/userSkn', plusstar.userSkn); // 用户推荐skn 42 router.post('/plusstar/userSkn', plusstar.userSkn); // 用户推荐skn
43 router.get('/plusstar/resources-template', plusstar.resourcesTemplate); // 潮流优选首页-资源位 43 router.get('/plusstar/resources-template', plusstar.resourcesTemplate); // 潮流优选首页-资源位
44 router.post('/plusstar/resources-goodsList', plusstar.resourcesGoodsList); // 潮流优选首页-资源位-商品列表 44 router.post('/plusstar/resources-goodsList', plusstar.resourcesGoodsList); // 潮流优选首页-资源位-商品列表
45 -router.get('/type', index.index); // 逛首页 45 +router.get('/type', index.index); // 旧版逛首页
46 router.get('/tags/index', index.tag); // 逛标签页 46 router.get('/tags/index', index.tag); // 逛标签页
47 47
48 router.get('/author/index', rewrite.channel, index.editorRedirect); // 编辑简介 48 router.get('/author/index', rewrite.channel, index.editorRedirect); // 编辑简介
@@ -6,7 +6,11 @@ @@ -6,7 +6,11 @@
6 {{# floorRes.focus}} 6 {{# floorRes.focus}}
7 <div class="swiper-slide"> 7 <div class="swiper-slide">
8 <a href="{{url}}"> 8 <a href="{{url}}">
9 - <img src="{{image2 src w=750 h=480 q=60}}" alt="{{title}}" /> 9 + {{#if @index}}
  10 + <img class="swiper-lazy" data-src="{{image2 src w=750 h=480 q=60}}" />
  11 + {{else}}
  12 + <img src="{{image2 src w=750 h=480 q=60}}" />
  13 + {{/if}}
10 </a> 14 </a>
11 </div> 15 </div>
12 {{/ floorRes.focus}} 16 {{/ floorRes.focus}}
@@ -38,16 +42,20 @@ @@ -38,16 +42,20 @@
38 {{#if floorRes.renQi}} 42 {{#if floorRes.renQi}}
39 <div class="big-title"> 43 <div class="big-title">
40 人气 44 人气
41 - <a class="iconfont" href="//guang.m.yohobuy.com/?gender={{gender}}&type=1001">MORE&nbsp;&#xe604;</a> 45 + <a class="iconfont" href="//m.yohobuy.com/guang/type?gender={{gender}}&type=1001">MORE&nbsp;&#xe604;</a>
42 </div> 46 </div>
43 <div class="swiper-page"> 47 <div class="swiper-page">
44 <div class="swiper-container"> 48 <div class="swiper-container">
45 <div class="swiper-wrapper"> 49 <div class="swiper-wrapper">
46 {{# floorRes.renQi}} 50 {{# floorRes.renQi}}
47 <div class="swiper-slide"> 51 <div class="swiper-slide">
48 - <a href="//guang.m.yohobuy.com/info/index?id={{id}}"> 52 + <a href="//m.yohobuy.com/guang/{{id}}.html">
49 <div class="page-c"> 53 <div class="page-c">
  54 + {{#if @index}}
  55 + <img class="swiper-lazy" data-src="{{image2 src w=690 h=430 q=60}}" />
  56 + {{else}}
50 <img src="{{image2 src w=690 h=430 q=60}}" /> 57 <img src="{{image2 src w=690 h=430 q=60}}" />
  58 + {{/if}}
51 <div class="info"> 59 <div class="info">
52 <p class="name eps">{{title}}</p> 60 <p class="name eps">{{title}}</p>
53 <p class="type eps">{{intro}}</p> 61 <p class="type eps">{{intro}}</p>
@@ -63,14 +71,14 @@ @@ -63,14 +71,14 @@
63 {{#if floorRes.daPei}} 71 {{#if floorRes.daPei}}
64 <div class="big-title"> 72 <div class="big-title">
65 搭配 73 搭配
66 - <a class="iconfont" href="//guang.m.yohobuy.com/?gender={{gender}}&type=2">MORE&nbsp;&#xe604;</a> 74 + <a class="iconfont" href="//m.yohobuy.com/guang/type?gender={{gender}}&type=2">MORE&nbsp;&#xe604;</a>
67 </div> 75 </div>
68 <div class="swiper-collocation"> 76 <div class="swiper-collocation">
69 <div class="swiper-container"> 77 <div class="swiper-container">
70 <div class="swiper-wrapper"> 78 <div class="swiper-wrapper">
71 {{# floorRes.daPei}} 79 {{# floorRes.daPei}}
72 <div class="swiper-slide"> 80 <div class="swiper-slide">
73 - <a href="//guang.m.yohobuy.com/info/index?id={{id}}"> 81 + <a href="//m.yohobuy.com/guang/{{id}}.html">
74 <img class="swiper-lazy" data-src="{{image2 src w=590 h=370 q=60}}" /> 82 <img class="swiper-lazy" data-src="{{image2 src w=590 h=370 q=60}}" />
75 <p class="eps-2">{{title}}</p> 83 <p class="eps-2">{{title}}</p>
76 </a> 84 </a>
@@ -80,6 +88,7 @@ @@ -80,6 +88,7 @@
80 </div> 88 </div>
81 </div> 89 </div>
82 {{/if}} 90 {{/if}}
  91 + {{!
83 <div class="big-title hide"> 92 <div class="big-title hide">
84 限定 93 限定
85 <span class="iconfont">MORE&nbsp;&#xe604;</span> 94 <span class="iconfont">MORE&nbsp;&#xe604;</span>
@@ -101,15 +110,16 @@ @@ -101,15 +110,16 @@
101 <div class="swiper-pagination"></div> 110 <div class="swiper-pagination"></div>
102 </div> 111 </div>
103 </div> 112 </div>
  113 + }}
104 {{#if floorRes.haoHuo}} 114 {{#if floorRes.haoHuo}}
105 <div class="big-title"> 115 <div class="big-title">
106 好货 116 好货
107 - <a class="iconfont" href="//guang.m.yohobuy.com/?gender={{gender}}&type=4">MORE&nbsp;&#xe604;</a> 117 + <a class="iconfont" href="//m.yohobuy.com/guang/type?gender={{gender}}&type=4">MORE&nbsp;&#xe604;</a>
108 </div> 118 </div>
109 <div class="goods-list clearfix"> 119 <div class="goods-list clearfix">
110 {{# floorRes.haoHuo}} 120 {{# floorRes.haoHuo}}
111 <div class="goods-item"> 121 <div class="goods-item">
112 - <a href="//guang.m.yohobuy.com/info/index?id={{id}}"> 122 + <a href="//m.yohobuy.com/guang/{{id}}.html">
113 <img class="lazy" data-original="{{image2 src w=360 h=224 q=60}}" /> 123 <img class="lazy" data-original="{{image2 src w=360 h=224 q=60}}" />
114 <div class="info"> 124 <div class="info">
115 <p class="name eps-2 eps-3">{{title}}</p> 125 <p class="name eps-2 eps-3">{{title}}</p>
@@ -120,6 +130,7 @@ @@ -120,6 +130,7 @@
120 {{/ floorRes.haoHuo}} 130 {{/ floorRes.haoHuo}}
121 </div> 131 </div>
122 {{/if}} 132 {{/if}}
  133 + {{!
123 <div class="big-title hide"> 134 <div class="big-title hide">
124 人物 135 人物
125 <span class="iconfont">MORE&nbsp;&#xe604;</span> 136 <span class="iconfont">MORE&nbsp;&#xe604;</span>
@@ -148,11 +159,13 @@ @@ -148,11 +159,13 @@
148 </div> 159 </div>
149 </div> 160 </div>
150 </div> 161 </div>
  162 + }}
151 <div class="big-title"> 163 <div class="big-title">
152 164
153 - <a class="iconfont" href="//guang.m.yohobuy.com/?gender={{gender}}&type=0">MORE&nbsp;&#xe604;</a> 165 + <a class="iconfont" href="//m.yohobuy.com/guang/type?gender={{gender}}&type=0">MORE&nbsp;&#xe604;</a>
154 </div> 166 </div>
155 <div class="guang-list"></div> 167 <div class="guang-list"></div>
  168 + {{!
156 <div class="trend-list hide"> 169 <div class="trend-list hide">
157 <div class="trend-item"> 170 <div class="trend-item">
158 <img src="http://img11.static.yhbimg.com/yhb-img01/2017/10/27/11/01ea9512175a0c5795bfd01048271b654e.jpg" /> 171 <img src="http://img11.static.yhbimg.com/yhb-img01/2017/10/27/11/01ea9512175a0c5795bfd01048271b654e.jpg" />
@@ -163,6 +176,7 @@ @@ -163,6 +176,7 @@
163 </div> 176 </div>
164 </div> 177 </div>
165 </div> 178 </div>
166 - <a href="//guang.m.yohobuy.com/?gender={{gender}}&type=0" class="guang-fixed fixed"></a> 179 + }}
  180 + <a href="//m.yohobuy.com/guang/type?gender={{gender}}&type=0" class="guang-fixed fixed"></a>
167 <div class="float-top fixed"></div> 181 <div class="float-top fixed"></div>
168 </div> 182 </div>
1 {{# list}} 1 {{# list}}
2 <div class="guang-item"> 2 <div class="guang-item">
3 - <a href="//guang.m.yohobuy.com/info/index?id={{id}}"> 3 + <a href="//m.yohobuy.com/guang/{{id}}.html">
4 <div class="page-c"> 4 <div class="page-c">
5 <img class="lazy" data-original="{{image2 src w=690 h=430 q=30}}" /> 5 <img class="lazy" data-original="{{image2 src w=690 h=430 q=30}}" />
6 <div class="info"> 6 <div class="info">
@@ -32,7 +32,6 @@ class GuangNew extends Page { @@ -32,7 +32,6 @@ class GuangNew extends Page {
32 this.swiperTab(); 32 this.swiperTab();
33 this.swiperPage(); 33 this.swiperPage();
34 this.swiperCollocation(); 34 this.swiperCollocation();
35 - this.swiperLimit();  
36 this.swiperShow(); 35 this.swiperShow();
37 this.fixed(); 36 this.fixed();
38 this.fixedRetop(); 37 this.fixedRetop();
@@ -105,7 +104,10 @@ class GuangNew extends Page { @@ -105,7 +104,10 @@ class GuangNew extends Page {
105 if ($('.swiper-top').length > 0) { 104 if ($('.swiper-top').length > 0) {
106 new Swiper('.swiper-top .swiper-container', { 105 new Swiper('.swiper-top .swiper-container', {
107 pagination: '.swiper-pagination .wiper-pagination-bullets', 106 pagination: '.swiper-pagination .wiper-pagination-bullets',
108 - paginationClickable: true 107 + paginationClickable: true,
  108 + lazyLoading: true,
  109 + lazyLoadingInPrevNext: true,
  110 + lazyLoadingInPrevNextAmount: 1
109 }); 111 });
110 } 112 }
111 } 113 }
@@ -169,7 +171,10 @@ class GuangNew extends Page { @@ -169,7 +171,10 @@ class GuangNew extends Page {
169 depth: 0, 171 depth: 0,
170 modifier: 1, 172 modifier: 1,
171 slideShadows: false 173 slideShadows: false
172 - } 174 + },
  175 + lazyLoading: true,
  176 + lazyLoadingInPrevNext: true,
  177 + lazyLoadingInPrevNextAmount: 1
173 }); 178 });
174 } 179 }
175 } 180 }
@@ -181,20 +186,22 @@ class GuangNew extends Page { @@ -181,20 +186,22 @@ class GuangNew extends Page {
181 centeredSlides: true, 186 centeredSlides: true,
182 slidesPerView: 'auto', 187 slidesPerView: 'auto',
183 loop: true, 188 loop: true,
184 - lazyLoading: true 189 + lazyLoading: true,
  190 + lazyLoadingInPrevNext: true,
  191 + lazyLoadingInPrevNextAmount: 1
185 }); 192 });
186 } 193 }
187 } 194 }
188 195
189 - // 限定swiper  
190 - swiperLimit() {  
191 - if ($('.swiper-limit').length > 0) {  
192 - new Swiper('.swiper-limit .swiper-container', {  
193 - pagination: '.swiper-pagination',  
194 - paginationClickable: true  
195 - });  
196 - }  
197 - } 196 + // // 限定swiper
  197 + // swiperLimit() {
  198 + // if ($('.swiper-limit').length > 0) {
  199 + // new Swiper('.swiper-limit .swiper-container', {
  200 + // pagination: '.swiper-pagination',
  201 + // paginationClickable: true
  202 + // });
  203 + // }
  204 + // }
198 205
199 // showswiper 206 // showswiper
200 swiperShow() { 207 swiperShow() {