From f23b985ed33e9ed5ab3eef7a742333d4fdcc497c Mon Sep 17 00:00:00 2001 From: devil_gong Date: Thu, 15 Aug 2019 20:10:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A7=92=E6=9D=80?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appmini/old/alipay/pages/goods-detail/goods-detail.js | 6 ++++-- public/appmini/old/alipay/pages/index/index.js | 6 ++++-- public/appmini/old/baidu/pages/goods-detail/goods-detail.js | 6 ++++-- public/appmini/old/baidu/pages/index/index.js | 6 ++++-- .../appmini/old/weixin/pages/goods-detail/goods-detail.js | 6 ++++-- public/appmini/old/weixin/pages/index/index.js | 6 ++++-- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js index 1ec38aad3..34156ac5e 100644 --- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js @@ -677,11 +677,13 @@ Page({ // 显示秒杀插件-倒计时 plugins_limitedtimediscount_countdown() { + var status = this.data.plugins_limitedtimediscount_data.time.status || 0; + var msg = this.data.plugins_limitedtimediscount_data.time.msg || ''; var hours = this.data.plugins_limitedtimediscount_data.time.hours || 0; var minutes = this.data.plugins_limitedtimediscount_data.time.minutes || 0; var seconds = this.data.plugins_limitedtimediscount_data.time.seconds || 0; var self = this; - if (hours > 0 || minutes > 0 || seconds > 0) { + if (status == 1) { // 秒 var timer = setInterval(function () { if (seconds <= 0) { @@ -730,7 +732,7 @@ Page({ } else { // 活动已结束 self.setData({ - 'plugins_limitedtimediscount_data.desc': '活动已结束', + 'plugins_limitedtimediscount_data.desc': msg, plugins_limitedtimediscount_is_show_time: false, }); } diff --git a/public/appmini/old/alipay/pages/index/index.js b/public/appmini/old/alipay/pages/index/index.js index 6d9ef54b5..a283ce4ae 100644 --- a/public/appmini/old/alipay/pages/index/index.js +++ b/public/appmini/old/alipay/pages/index/index.js @@ -113,11 +113,13 @@ Page({ // 显示秒杀插件-倒计时 plugins_limitedtimediscount_countdown() { + var status = this.data.plugins_limitedtimediscount_data.time.status || 0; + var msg = this.data.plugins_limitedtimediscount_data.time.msg || ''; var hours = this.data.plugins_limitedtimediscount_data.time.hours || 0; var minutes = this.data.plugins_limitedtimediscount_data.time.minutes || 0; var seconds = this.data.plugins_limitedtimediscount_data.time.seconds || 0; var self = this; - if (hours > 0 || minutes > 0 || seconds > 0) { + if (status == 1) { // 秒 var timer = setInterval(function () { if (seconds <= 0) { @@ -153,7 +155,7 @@ Page({ } else { // 活动已结束 self.setData({ - plugins_limitedtimediscount_timer_title: '活动已结束', + plugins_limitedtimediscount_timer_title: msg, plugins_limitedtimediscount_is_show_time: false, }); } diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.js b/public/appmini/old/baidu/pages/goods-detail/goods-detail.js index e961c71d2..fe12b9a73 100755 --- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.js @@ -584,11 +584,13 @@ Page({ // 显示秒杀插件-倒计时 plugins_limitedtimediscount_countdown() { + var status = this.data.plugins_limitedtimediscount_data.time.status || 0; + var msg = this.data.plugins_limitedtimediscount_data.time.msg || ''; var hours = this.data.plugins_limitedtimediscount_data.time.hours || 0; var minutes = this.data.plugins_limitedtimediscount_data.time.minutes || 0; var seconds = this.data.plugins_limitedtimediscount_data.time.seconds || 0; var self = this; - if (hours > 0 || minutes > 0 || seconds > 0) { + if (status == 1) { // 秒 var timer = setInterval(function () { if (seconds <= 0) { @@ -637,7 +639,7 @@ Page({ } else { // 活动已结束 self.setData({ - 'plugins_limitedtimediscount_data.desc': '活动已结束', + 'plugins_limitedtimediscount_data.desc': msg, plugins_limitedtimediscount_is_show_time: false }); } diff --git a/public/appmini/old/baidu/pages/index/index.js b/public/appmini/old/baidu/pages/index/index.js index 4dc3ebe6b..2793de485 100755 --- a/public/appmini/old/baidu/pages/index/index.js +++ b/public/appmini/old/baidu/pages/index/index.js @@ -108,11 +108,13 @@ Page({ // 显示秒杀插件-倒计时 plugins_limitedtimediscount_countdown() { + var status = this.data.plugins_limitedtimediscount_data.time.status || 0; + var msg = this.data.plugins_limitedtimediscount_data.time.msg || ''; var hours = this.data.plugins_limitedtimediscount_data.time.hours || 0; var minutes = this.data.plugins_limitedtimediscount_data.time.minutes || 0; var seconds = this.data.plugins_limitedtimediscount_data.time.seconds || 0; var self = this; - if (hours > 0 || minutes > 0 || seconds > 0) { + if (status == 1) { // 秒 var timer = setInterval(function () { if (seconds <= 0) { @@ -148,7 +150,7 @@ Page({ } else { // 活动已结束 self.setData({ - plugins_limitedtimediscount_timer_title: '活动已结束', + plugins_limitedtimediscount_timer_title: msg, plugins_limitedtimediscount_is_show_time: false }); } diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js index bac965cdf..18b62475a 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js @@ -669,11 +669,13 @@ Page({ // 显示秒杀插件-倒计时 plugins_limitedtimediscount_countdown() { + var status = this.data.plugins_limitedtimediscount_data.time.status || 0; + var msg = this.data.plugins_limitedtimediscount_data.time.msg || ''; var hours = this.data.plugins_limitedtimediscount_data.time.hours || 0; var minutes = this.data.plugins_limitedtimediscount_data.time.minutes || 0; var seconds = this.data.plugins_limitedtimediscount_data.time.seconds || 0; var self = this; - if (hours > 0 || minutes > 0 || seconds > 0) { + if (status == 1) { // 秒 var timer = setInterval(function () { if (seconds <= 0) { @@ -722,7 +724,7 @@ Page({ } else { // 活动已结束 self.setData({ - 'plugins_limitedtimediscount_data.desc': '活动已结束', + 'plugins_limitedtimediscount_data.desc': msg, plugins_limitedtimediscount_is_show_time: false, }); } diff --git a/public/appmini/old/weixin/pages/index/index.js b/public/appmini/old/weixin/pages/index/index.js index 34d242887..fc3ef6da1 100755 --- a/public/appmini/old/weixin/pages/index/index.js +++ b/public/appmini/old/weixin/pages/index/index.js @@ -108,11 +108,13 @@ Page({ // 显示秒杀插件-倒计时 plugins_limitedtimediscount_countdown() { + var status = this.data.plugins_limitedtimediscount_data.time.status || 0; + var msg = this.data.plugins_limitedtimediscount_data.time.msg || ''; var hours = this.data.plugins_limitedtimediscount_data.time.hours || 0; var minutes = this.data.plugins_limitedtimediscount_data.time.minutes || 0; var seconds = this.data.plugins_limitedtimediscount_data.time.seconds || 0; var self = this; - if (hours > 0 || minutes > 0 || seconds > 0) { + if (status == 1) { // 秒 var timer = setInterval(function () { if (seconds <= 0) { @@ -148,7 +150,7 @@ Page({ } else { // 活动已结束 self.setData({ - plugins_limitedtimediscount_timer_title: '活动已结束', + plugins_limitedtimediscount_timer_title: msg, plugins_limitedtimediscount_is_show_time: false, }); } -- GitLab