From 48c21cfafc2e9cd851f1b765f6aa08304d593823 Mon Sep 17 00:00:00 2001
From: zzs <zzs0@zzs0.com>
Date: Fri, 11 Nov 2016 17:34:59 +0800
Subject: [PATCH] banner可以滚动
---
doraemon/views/partial/resources/hot-single.hbs | 6 +-----
doraemon/views/partial/resources/new-first.hbs | 2 +-
doraemon/views/partial/resources/new-floor-banner.hbs | 25 +++++++++++++++++++++++++
doraemon/views/partial/resources/new-user-floor.hbs | 6 +-----
doraemon/views/partial/resources/sale-floor.hbs | 16 +++++-----------
doraemon/views/partial/resources/vip-only.hbs | 8 +++-----
public/js/channel/home.page.js | 5 ++++-
public/scss/channel/_sale-floor.css | 5 +++++
utils/resources-process.js | 5 +++++
9 files changed, 50 insertions(+), 28 deletions(-)
create mode 100644 doraemon/views/partial/resources/new-floor-banner.hbs
diff --git a/doraemon/views/partial/resources/hot-single.hbs b/doraemon/views/partial/resources/hot-single.hbs
index d1b1a77..f375176 100644
--- a/doraemon/views/partial/resources/hot-single.hbs
+++ b/doraemon/views/partial/resources/hot-single.hbs
@@ -1,11 +1,7 @@
{{#data}}
<div class="hot-single">
{{> common/floor-header-more}}
- {{#banner_image}}
- <a href="{{url}}">
- <img src="{{image src 640 200}}" alt="hot-single-banner" class="hot-single-banner" />
- </a>
- {{/banner_image}}
+ {{> resources/new-floor-banner}}
<div class="hot-single-goods-list" {{#background}}style="background: url({{src}})"{{/background}}>
<ul>
{{#list}}
diff --git a/doraemon/views/partial/resources/new-first.hbs b/doraemon/views/partial/resources/new-first.hbs
index 094c7c6..94a5e89 100644
--- a/doraemon/views/partial/resources/new-first.hbs
+++ b/doraemon/views/partial/resources/new-first.hbs
@@ -15,7 +15,7 @@
<a href="{{url}}" class="float-container">
<img src="{{image src 186 180}}" alt="right2" class="right" />
</a>
- {{/liet.[2]}}
+ {{/list.[2]}}
{{#list.[3]}}
<a href="{{url}}" class="float-container">
<img src="{{image src 186 180}}" alt="right3" class="right" />
diff --git a/doraemon/views/partial/resources/new-floor-banner.hbs b/doraemon/views/partial/resources/new-floor-banner.hbs
new file mode 100644
index 0000000..a4d0127
--- /dev/null
+++ b/doraemon/views/partial/resources/new-floor-banner.hbs
@@ -0,0 +1,25 @@
+<div class="banner-center banner-center-swiper" style="margin: 0">
+ {{#if banner_image.[1]}}
+ <ul class="banner-list swiper-wrapper clearfix">
+ {{#banner_image}}
+ <li class="swiper-slide">
+ <a href="{{url}}">
+ <img src="{{image src 640 200}}" alt="">
+ </a>
+ </li>
+ {{/banner_image}}
+ </ul>
+ {{else}}
+ {{#banner_image}}
+ <div class="banner-list">
+ <a href="{{url}}">
+ <img src="{{image src 640 200}}" alt="">
+ </a>
+ </div>
+ {{/banner_image}}
+ {{/if}}
+ <div class="swiper-pagination">
+ <div class="pagination-inner">
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/doraemon/views/partial/resources/new-user-floor.hbs b/doraemon/views/partial/resources/new-user-floor.hbs
index 613c587..bea8d96 100644
--- a/doraemon/views/partial/resources/new-user-floor.hbs
+++ b/doraemon/views/partial/resources/new-user-floor.hbs
@@ -2,11 +2,7 @@
<div class="new-user-floor">
{{> common/floor-header-more}}
<div class="new-user-icon">新人专享</div>
- {{#banner_image}}
- <a href="{{url}}">
- <img src="{{image src 640 200}}" alt="new-user-banner" class="new-user-banner" />
- </a>
- {{/banner_image}}
+ {{> resources/new-floor-banner}}
<div class="new-user-goods-container" {{#background}} style="background-image: url({{src}})" {{/background}}>
<ul>
{{#list}}
diff --git a/doraemon/views/partial/resources/sale-floor.hbs b/doraemon/views/partial/resources/sale-floor.hbs
index 72253eb..76cd4b2 100644
--- a/doraemon/views/partial/resources/sale-floor.hbs
+++ b/doraemon/views/partial/resources/sale-floor.hbs
@@ -1,16 +1,12 @@
{{#data}}
<div class="sale-floor clearfix">
{{> common/floor-header-more}}
- {{#big_image}}
- <a href="{{url}}">
- <img src="{{image src 640 200}}" alt="sale-banner" class="sale-floor-banner" />
- </a>
- {{/big_image}}
+ {{> resources/new-floor-banner }}
{{#list.[0]}}
<a href="{{url}}" class="float-container time-floor">
<img src="{{image src 269 360}}" alt="sale-limit" class="sale-floor-limit">
- <div class="sale-floor-time" data-time={{end_seconds}}>
+ <div class="sale-floor-time" data-time={{end_time}}>
<p class="limit-title"><i class="icon"></i>限时特卖</p>
<span class="hour">00</span>:
<span class="minute">00</span>:
@@ -26,8 +22,7 @@
{{/list.[1]}}
{{#list.[2]}}
<a href="{{url}}" class="sale-floor-entry">
- <h3 class="title">断码区</h3>
- <p class="entry">点击进入</p>
+ <img src="{{image src 87 180}}" alt="sale-break" >
</a>
{{/list.[2]}}
{{#list.[3]}}
@@ -36,9 +31,8 @@
</a>
{{/list.[3]}}
{{#list.[4]}}
- <a href="" class="sale-floor-entry">
- <h3 class="title">折扣专区</h3>
- <p class="entry">点击进入</p>
+ <a href="{{url}}" class="sale-floor-entry">
+ <img src="{{image src 87 180}}" alt="sale-break" >
</a>
{{/list.[4]}}
</div>
diff --git a/doraemon/views/partial/resources/vip-only.hbs b/doraemon/views/partial/resources/vip-only.hbs
index ab37796..0411640 100644
--- a/doraemon/views/partial/resources/vip-only.hbs
+++ b/doraemon/views/partial/resources/vip-only.hbs
@@ -1,11 +1,9 @@
{{#data}}
<div class="vip-only">
{{> common/floor-header-more}}
- {{#banner_image}}
- <a href="{{url}}">
- <img src="{{image src 640 200}}" alt="vip-only-banner" class="vip-only-banner" />
- </a>
- {{/banner_image}}
+
+ {{> resources/new-floor-banner}}
+
<div class="vip-only-goods-list" {{#background}} style="background: url({{src}})" {{/background}}>
<ul>
{{#list}}
diff --git a/public/js/channel/home.page.js b/public/js/channel/home.page.js
index d4062c8..cd33a18 100644
--- a/public/js/channel/home.page.js
+++ b/public/js/channel/home.page.js
@@ -348,6 +348,9 @@ var saleTime = function(elem, offsetTime) {
}
}
-saleTime('.sale-floor-time', 10);
+let endTime = $('.sale-floor-time').attr('data-time'),
+ // ~~两次取反位运算就是取整
+ limit = ~~((endTime*1000 - Date.now()) / 1000);
+saleTime('.sale-floor-time', limit);
require('./maybe-like')();
\ No newline at end of file
diff --git a/public/scss/channel/_sale-floor.css b/public/scss/channel/_sale-floor.css
index bae8d42..c761b64 100644
--- a/public/scss/channel/_sale-floor.css
+++ b/public/scss/channel/_sale-floor.css
@@ -75,6 +75,11 @@
background: #fff;
border-bottom: 1px solid #b0b0b0;
+ img {
+ height: 100%;
+ width: 100%;
+ }
+
.title {
height: 140px;
width: 100%;
diff --git a/utils/resources-process.js b/utils/resources-process.js
index 7560ce2..06dc41b 100644
--- a/utils/resources-process.js
+++ b/utils/resources-process.js
@@ -88,6 +88,11 @@ module.exports = (list) => {
a = a.substr(0, a.indexOf('?'));
floor.back_image = a;
}
+
+ // sale banner名字
+ if (floor.sale1T1L4R && floor.data && floor.data.big_image) {
+ floor.data.banner_image = floor.data.big_image;
+ }
formatData.push(floor);
});
--
libgit2 0.24.0