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 1ec38aad3342e07ed521954ed2f24568c7627e43..34156ac5e3e41e05d90d1dfd79ae8f0bcf1de6fd 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 6d9ef54b58e6ef5367c8c51c5095dde789aaa868..a283ce4aef3dfaf4e9da4ad1ffd326aa6d9d9ce1 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 e961c71d2c5dfdf2892e8bafd0776c9b1543a9c0..fe12b9a73b78be01d3ffccd3b0b7e082cf7e1a4e 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 4dc3ebe6b79aaa7309e927af0bd0e8e1a2a88368..2793de485fa583e33269ff56a97fd9987a04ae4b 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 bac965cdf3b3224e9eb920cba7c8f149b197a3af..18b62475aea67117d011d2fb59d1e0fe87dcdd71 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 34d242887da96679600660fe69c592772c7f678a..fc3ef6da1c1ea94bc5bfd4fd3dfeca21150eb5cc 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, }); }