Authored by lijing

新增预售标签

@@ -276,7 +276,7 @@ const searchKeyActivity = (params) => { @@ -276,7 +276,7 @@ const searchKeyActivity = (params) => {
276 cache: true, 276 cache: true,
277 code: 200 277 code: 200
278 }).then(result => { 278 }).then(result => {
279 - if (result.data) { 279 + if (result && result.data) {
280 return result.data; 280 return result.data;
281 } else { 281 } else {
282 return {}; 282 return {};
@@ -21,6 +21,9 @@ @@ -21,6 +21,9 @@
21 {{# is_soon_sold_out}} 21 {{# is_soon_sold_out}}
22 <p class="good-tag soon-sold-out-tag">即将售罄</p> 22 <p class="good-tag soon-sold-out-tag">即将售罄</p>
23 {{/ is_soon_sold_out}} 23 {{/ is_soon_sold_out}}
  24 + {{# is_presell}}
  25 + <p class="good-tag is_presell">预售</p>
  26 + {{/ is_presell}}
24 {{/ tags}} 27 {{/ tags}}
25 </div> 28 </div>
26 {{# bannerTop}} 29 {{# bannerTop}}
@@ -207,6 +207,9 @@ $( @@ -207,6 +207,9 @@ $(
207 newDay = newDate.getDate(); 207 newDay = newDate.getDate();
208 newHour = newDate.getHours(); 208 newHour = newDate.getHours();
209 newMinus = newDate.getMinutes(); 209 newMinus = newDate.getMinutes();
  210 + if (newMinus === 0) {
  211 + newMinus = '00';
  212 + }
210 $('.notStart').find('.seckill-time-c').text(newMonth + '月' + newDay + '日' + newHour + ':' + newMinus); 213 $('.notStart').find('.seckill-time-c').text(newMonth + '月' + newDay + '日' + newHour + ':' + newMinus);
211 seckillObj.startTick(timeObj, offsetTime); 214 seckillObj.startTick(timeObj, offsetTime);
212 } 215 }
@@ -185,6 +185,11 @@ $basicBtnC: #eb0313; @@ -185,6 +185,11 @@ $basicBtnC: #eb0313;
185 background-color: #ffac5b; 185 background-color: #ffac5b;
186 color: #fff; 186 color: #fff;
187 } 187 }
  188 +
  189 + .is_presell {
  190 + background-color: #000;
  191 + color: #fff;
  192 + }
188 } 193 }
189 194
190 .banner-container { 195 .banner-container {