From 2b3d05501fc00756722b354fe113a0c75773bbea Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Mon, 15 Jul 2019 23:05:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Goods.php          |  11 +++
 application/api/controller/Index.php          |   2 +-
 application/common.php                        |   8 +-
 public/appmini/old/alipay/app.js              |   2 +-
 public/appmini/old/alipay/app.json            |   4 +-
 .../pages/goods-detail/goods-detail.acss      |  51 ++++++++++--
 .../pages/goods-detail/goods-detail.axml      |  10 ++-
 .../alipay/pages/goods-detail/goods-detail.js |  77 +++++++++++++++++-
 .../appmini/old/alipay/pages/index/index.js   |   6 +-
 .../lib/limitedtimediscount/detail-icon.png   | Bin 0 -> 2647 bytes
 .../lib/limitedtimediscount/goods-detail.axml |  20 +++++
 public/appmini/old/weixin/app.js              |   2 +-
 .../weixin/pages/goods-detail/goods-detail.js |  76 ++++++++++++++++-
 .../pages/goods-detail/goods-detail.wxml      |  19 +----
 .../pages/goods-detail/goods-detail.wxss      |   7 ++
 .../appmini/old/weixin/pages/index/index.js   |   6 +-
 .../lib/limitedtimediscount/detail-icon.png   | Bin 0 -> 2647 bytes
 .../lib/limitedtimediscount/goods-detail.wxml |  20 +++++
 18 files changed, 283 insertions(+), 38 deletions(-)
 create mode 100644 public/appmini/old/alipay/pages/lib/limitedtimediscount/detail-icon.png
 create mode 100644 public/appmini/old/alipay/pages/lib/limitedtimediscount/goods-detail.axml
 create mode 100644 public/appmini/old/weixin/pages/lib/limitedtimediscount/detail-icon.png
 create mode 100644 public/appmini/old/weixin/pages/lib/limitedtimediscount/goods-detail.wxml

diff --git a/application/api/controller/Goods.php b/application/api/controller/Goods.php
index bf2ab954e..2313b09fd 100755
--- a/application/api/controller/Goods.php
+++ b/application/api/controller/Goods.php
@@ -113,7 +113,18 @@ class Goods extends Common
             'common_order_is_booking'           => (int) MyC('common_order_is_booking', 0),
             'common_app_is_use_mobile_detail'   => $is_use_mobile_detail,
             'common_app_is_online_service'      => (int) MyC('common_app_is_online_service', 0),
+            'common_app_is_limitedtimediscount' => (int) MyC('common_app_is_limitedtimediscount'),
         ];
+
+        // 秒杀
+        if($result['common_app_is_limitedtimediscount'] == 1)
+        {
+            $ret = CallPluginsServiceMethod('limitedtimediscount', 'Service', 'GoodsDetailCountdown');
+            if($ret['code'] == 0)
+            {
+                $result['plugins_limitedtimediscount_data'] = $ret['data'];
+            }
+        }
         return DataReturn('success', 0, $result);
     }
 
diff --git a/application/api/controller/Index.php b/application/api/controller/Index.php
index 712b9cd8c..60b3308d8 100755
--- a/application/api/controller/Index.php
+++ b/application/api/controller/Index.php
@@ -64,7 +64,7 @@ class Index extends Common
 		// 秒杀
 		if($common_app_is_limitedtimediscount == 1)
 		{
-			$ret = CallPluginsMethod('app\plugins\limitedtimediscount\service\Service', 'ApiHomeAd');
+			$ret = CallPluginsServiceMethod('limitedtimediscount', 'Service', 'ApiHomeAd');
 			if($ret['code'] == 0)
 			{
 				$result['plugins_limitedtimediscount_data'] = $ret['data'];
diff --git a/application/common.php b/application/common.php
index abc557230..0f451513d 100755
--- a/application/common.php
+++ b/application/common.php
@@ -17,11 +17,13 @@
  * @blog     http://gong.gg/
  * @version  1.0.0
  * @datetime 2019-07-10T22:03:48+0800
- * @param    [string]          $plugins_class   [类命名空间]
- * @param    [string]          $method          [方法名称]
+ * @param    [string]          $plugins   [插件名称]
+ * @param    [string]          $service   [服务层名称]
+ * @param    [string]          $method    [方法名称]
  */
-function CallPluginsMethod($plugins_class, $method)
+function CallPluginsServiceMethod($plugins, $service, $method)
 {
+    $plugins_class = 'app\plugins\\'.$plugins.'\service\\'.$service;
     if(class_exists($plugins_class))
     {
         return $plugins_class::$method();
diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js
index 9e065b6f5..12f766916 100644
--- a/public/appmini/old/alipay/app.js
+++ b/public/appmini/old/alipay/app.js
@@ -62,7 +62,7 @@ App({
     // 请求地址
     request_url: "{{request_url}}",
     request_url: 'http://tp5-dev.com/',
-    request_url: 'http://test.shopxo.net/',
+    //request_url: 'http://test.shopxo.net/',
 
     // 基础信息
     application_title: "{{application_title}}",
diff --git a/public/appmini/old/alipay/app.json b/public/appmini/old/alipay/app.json
index 140b2ec29..c64c1de5d 100644
--- a/public/appmini/old/alipay/app.json
+++ b/public/appmini/old/alipay/app.json
@@ -1,5 +1,5 @@
 {
-  "pages": [
+  "pages": ["pages/goods-detail/goods-detail",
     "pages/index/index",
     "pages/goods-category/goods-category",
     "pages/cart/cart",
@@ -8,7 +8,7 @@
     "pages/login/login",
     "pages/paytips/paytips",
     "pages/goods-search/goods-search",
-    "pages/goods-detail/goods-detail",
+    
     "pages/goods-comment/goods-comment",
     "pages/goods-attribute/goods-attribute",
     "pages/buy/buy",
diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss b/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
index 43c045b0d..c6f3d9fd3 100644
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
@@ -162,7 +162,12 @@
 }
 .goods-buy-nav .collect { border-left: 1px solid #e1e1e1; }
 .goods-buy-nav .fl image { width: 25px; height: 25px; margin: 0 auto; }
-
+.goods-title {
+  font-size: 32rpx;
+  line-height: 44rpx;
+  font-weight: 500;
+  padding: 15rpx 10rpx;
+}
 .goods-base {
     padding: 15rpx 10rpx;
 }
@@ -171,11 +176,6 @@
     top: 0;
     right: 0;
 }
-.goods-base .goods-title {
-    font-size: 32rpx;
-    line-height: 44rpx;
-    font-weight: 500;
-}
 .goods-base .goods-share {
   position: absolute;
   top: 0;
@@ -229,4 +229,43 @@
   padding:2px 5px;
   line-height:20px;
   border-radius:1px;
+}
+
+
+/*
+ * 限时秒杀
+ */
+.limitedtimediscount {
+  background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQIAAAAgAQMAAADDkuSaAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAGUExUReQ5POlVO+6K1q8AAACiSURBVDjLhZK7EYMwEETlISCkBJUCnUEplOISXIJDQgcEHg9o/Vt5ZOZu9eKXvL0LIbOECg3OFSMiVYwRWKVwwouLMtq3gUkY/cfYhIEvi2gls9+aEa3kLlqJndwVBga/lSTRSm6i1U2OByNNfivZRCu5Wnf9Z/BbyS5ajfUb0ygfO9pGkTzaBh6i9bB+6xr5sXvf2EUrWUVrsX6UBkTrL/kJzQQAijmza5AAAAAASUVORK5CYII=) right top no-repeat #f23030;
+  background-size: cover;
+  padding: 10rpx;
+  height: 56rpx;
+  overflow: hidden;
+  margin-top: 10rpx;
+}
+.limitedtimediscount .icon {
+  width: 50rpx;
+  height: 50rpx;
+  vertical-align: top;
+  margin-right: 10rpx;
+}
+.limitedtimediscount .countdown {
+  color: #fff;
+  line-height: 56rpx;
+}
+.limitedtimediscount .countdown .timer-title {
+  margin-right: 10rpx;
+}
+.limitedtimediscount .countdown .timer-hours {
+  padding: 0 6rpx;
+  -moz-border-radius: 8rpx;
+  border-radius: 8rpx;
+  color: #ffe500;
+  min-width: 35rpx;
+  text-align: center;
+  font-weight: bold;
+  font-size: 32rpx;
+}
+.limitedtimediscount .countdown .ds {
+  padding: 0 4rpx;
 }
\ No newline at end of file
diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
index 27fd425e0..35d85016b 100644
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
@@ -15,9 +15,17 @@
     </block>
   </swiper>
 
+  <!-- 标题 -->
+  <view class="goods-title multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
+
+  <!-- 限时秒杀 -->
+  <view a:if="{{common_app_is_limitedtimediscount == 1}}">
+    <import src="/pages/lib/limitedtimediscount/goods-detail.axml" />
+    <template is="limitedtimediscount" data="{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_time_millisecond: plugins_limitedtimediscount_time_millisecond}}"></template>
+  </view>
+
   <!-- 基础信息 -->
   <view class="goods-base bg-white">
-    <view class="goods-title multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
     <view class="goods-price single-text">
       <view class="goods-share tc">
         <button type="default" size="mini" open-type="share" hover-class="none">
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 2cf4681a9..b08337e23 100644
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
@@ -32,10 +32,16 @@ Page({
 
     show_field_price_text: null,
     common_app_is_use_mobile_detail: 1,
+
+    // 限时秒杀插件
+    common_app_is_limitedtimediscount: 0,
+    plugins_limitedtimediscount_data: null,
+    plugins_limitedtimediscount_is_show_time: true,
+    plugins_limitedtimediscount_time_millisecond: 0,
   },
 
   onLoad(params) {
-    //params['goods_id']=12;
+    params['goods_id']=2;
     this.setData({params: params});
     this.init();
   },
@@ -102,8 +108,16 @@ Page({
 
               show_field_price_text: (data.goods.show_field_price_text == '销售价') ? null : (data.goods.show_field_price_text.replace(/<[^>]+>/g, "") || null),
               common_app_is_use_mobile_detail: data.common_app_is_use_mobile_detail || 0,
+
+              common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0,
+              plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
             });
 
+            // 限时秒杀倒计时
+            if (this.data.common_app_is_limitedtimediscount == 1 && this.data.plugins_limitedtimediscount_data != null) {
+              this.plugins_limitedtimediscount_countdown();
+            }
+
             // 标题
             my.setNavigationBar({title: data.goods.title});
 
@@ -661,6 +675,67 @@ Page({
     });
   },
 
+  // 显示秒杀插件-倒计时
+  plugins_limitedtimediscount_countdown() {
+    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) {
+      // 秒
+      var timer = setInterval(function () {
+        if (seconds <= 0) {
+          if (minutes > 0) {
+            minutes--;
+            seconds = 59;
+          } else if (hours > 0) {
+            hours--;
+            minutes = 59;
+            seconds = 59;
+          }
+        } else {
+          seconds--;
+        }
+
+        self.setData({
+          'plugins_limitedtimediscount_data.time.hours': (hours < 10 && hours.length == 1) ? '0' + hours : hours,
+          'plugins_limitedtimediscount_data.time.minutes': (minutes < 10 && minutes.length == 1) ? '0' + minutes : minutes,
+          'plugins_limitedtimediscount_data.time.seconds': (seconds < 10 && seconds.length == 1) ? '0' + seconds : seconds,
+        });
+
+        if (hours <= 0 && minutes <= 0 && seconds <= 0) {
+          // 停止时间
+          clearInterval(timer);
+
+          // 活动已结束
+          self.setData({
+            'plugins_limitedtimediscount_data.desc': '活动已结束',
+            plugins_limitedtimediscount_is_show_time: false,
+          });
+        }
+      }, 1000);
+
+      // 毫秒
+      var count = 0;
+      var timers = setInterval(function () {
+        count++;
+        self.setData({ plugins_limitedtimediscount_time_millisecond: count});
+        if(count > 9) {
+          count = 0;
+        }
+        if(self.data.plugins_limitedtimediscount_data.time.hours <= 0 && self.data.plugins_limitedtimediscount_data.time.minutes <= 0 && self.data.plugins_limitedtimediscount_data.time.seconds <= 0) {
+          clearInterval(timers);
+        }
+      }, 100);
+    } else {
+      // 活动已结束
+      self.setData({
+        'plugins_limitedtimediscount_data.desc': '活动已结束',
+        plugins_limitedtimediscount_is_show_time: false,
+      });
+    }
+  },
+
   // 自定义分享
   onShareAppMessage() {
     return {
diff --git a/public/appmini/old/alipay/pages/index/index.js b/public/appmini/old/alipay/pages/index/index.js
index 5430b04f6..6d9ef54b5 100644
--- a/public/appmini/old/alipay/pages/index/index.js
+++ b/public/appmini/old/alipay/pages/index/index.js
@@ -134,9 +134,9 @@ Page({
         }
 
         self.setData({
-          'plugins_limitedtimediscount_data.time.hours': (hours < 10) ? 0 + hours : hours,
-          'plugins_limitedtimediscount_data.time.minutes': (minutes < 10) ? 0 + minutes : minutes,
-          'plugins_limitedtimediscount_data.time.seconds': (seconds < 10) ? 0 + seconds : seconds,
+          'plugins_limitedtimediscount_data.time.hours': (hours < 10 && hours.length == 1) ? 0 + hours : hours,
+          'plugins_limitedtimediscount_data.time.minutes': (minutes < 10 && minutes.length == 1) ? 0 + minutes : minutes,
+          'plugins_limitedtimediscount_data.time.seconds': (seconds < 10 && seconds.length == 1) ? 0 + seconds : seconds,
         });
 
         if (hours <= 0 && minutes <= 0 && seconds <= 0) {
diff --git a/public/appmini/old/alipay/pages/lib/limitedtimediscount/detail-icon.png b/public/appmini/old/alipay/pages/lib/limitedtimediscount/detail-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..37532cf8085913f669f0dcf81e16274f970b6e89
GIT binary patch
literal 2647
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
FV1lo_$g2PV

literal 0
HcmV?d00001

diff --git a/public/appmini/old/alipay/pages/lib/limitedtimediscount/goods-detail.axml b/public/appmini/old/alipay/pages/lib/limitedtimediscount/goods-detail.axml
new file mode 100644
index 000000000..7a9b63856
--- /dev/null
+++ b/public/appmini/old/alipay/pages/lib/limitedtimediscount/goods-detail.axml
@@ -0,0 +1,20 @@
+<template name="limitedtimediscount">
+  <view class="limitedtimediscount">
+    <view class="countdown">
+      <image class="icon" src="/pages/lib/limitedtimediscount/detail-icon.png" mode="aspectFit"></image>
+      <text class="text-title"> {{plugins_limitedtimediscount_data.title || '限时秒杀'}}</text>
+      <view class="time-right fr">
+        <block a:if="{{plugins_limitedtimediscount_is_show_time}}">
+          <view class="timer-hours millisecond fr">{{plugins_limitedtimediscount_time_millisecond}}</view>
+          <view class="ds fr">秒</view>
+          <view class="timer-hours seconds fr">{{plugins_limitedtimediscount_data.time.seconds}}</view>
+          <view class="ds fr">分</view>
+          <view class="timer-hours minutes fr">{{plugins_limitedtimediscount_data.time.minutes}}</view>
+          <view class="ds fr">时</view>
+          <view class="timer-hours hours fr">{{plugins_limitedtimediscount_data.time.hours}}</view>
+        </block>
+        <view class="timer-title fr">{{plugins_limitedtimediscount_data.desc || '距离结束还有'}}</view>
+      </view>
+    </view>
+  </view>
+</template>
\ No newline at end of file
diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js
index c7025162a..d9d1f1086 100755
--- a/public/appmini/old/weixin/app.js
+++ b/public/appmini/old/weixin/app.js
@@ -62,7 +62,7 @@ App({
     // 请求地址
     // request_url: "{{request_url}}",
     request_url: 'http://tp5-dev.com/',
-    request_url: 'https://test.shopxo.net/',
+    //request_url: 'https://test.shopxo.net/',
 
     // 基础信息
     application_title: "{{application_title}}",
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 99b44fdc5..4ed204e8c 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
@@ -35,8 +35,13 @@ Page({
     common_app_is_use_mobile_detail: 1,
 
     popup_share_status: false,
-
     common_app_is_online_service: 0,
+
+    // 限时秒杀插件
+    common_app_is_limitedtimediscount: 0,
+    plugins_limitedtimediscount_data: null,
+    plugins_limitedtimediscount_is_show_time: true,
+    plugins_limitedtimediscount_time_millisecond: 0,
   },
 
   onLoad(params) {
@@ -108,8 +113,16 @@ Page({
               show_field_price_text: (data.goods.show_field_price_text == '销售价') ? null : (data.goods.show_field_price_text.replace(/<[^>]+>/g, "") || null),
               common_app_is_use_mobile_detail: data.common_app_is_use_mobile_detail || 0,
               common_app_is_online_service: data.common_app_is_online_service || 0,
+
+              common_app_is_limitedtimediscount: data.common_app_is_limitedtimediscount || 0,
+              plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
             });
 
+            // 限时秒杀倒计时
+            if (this.data.common_app_is_limitedtimediscount == 1 && this.data.plugins_limitedtimediscount_data != null) {
+              this.plugins_limitedtimediscount_countdown();
+            }
+
             // 标题
             wx.setNavigationBarTitle({ title: data.goods.title });
 
@@ -625,6 +638,67 @@ Page({
     this.setData({ popup_share_status: false });
   },
 
+  // 显示秒杀插件-倒计时
+  plugins_limitedtimediscount_countdown() {
+    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) {
+      // 秒
+      var timer = setInterval(function () {
+        if (seconds <= 0) {
+          if (minutes > 0) {
+            minutes--;
+            seconds = 59;
+          } else if (hours > 0) {
+            hours--;
+            minutes = 59;
+            seconds = 59;
+          }
+        } else {
+          seconds--;
+        }
+
+        self.setData({
+          'plugins_limitedtimediscount_data.time.hours': (hours < 10 && hours.length == 1) ? '0' + hours : hours,
+          'plugins_limitedtimediscount_data.time.minutes': (minutes < 10 && minutes.length == 1) ? '0' + minutes : minutes,
+          'plugins_limitedtimediscount_data.time.seconds': (seconds < 10 && seconds.length == 1) ? '0' + seconds : seconds,
+        });
+
+        if (hours <= 0 && minutes <= 0 && seconds <= 0) {
+          // 停止时间
+          clearInterval(timer);
+
+          // 活动已结束
+          self.setData({
+            'plugins_limitedtimediscount_data.desc': '活动已结束',
+            plugins_limitedtimediscount_is_show_time: false,
+          });
+        }
+      }, 1000);
+
+      // 毫秒
+      var count = 0;
+      var timers = setInterval(function () {
+        count++;
+        self.setData({ plugins_limitedtimediscount_time_millisecond: count});
+        if(count > 9) {
+          count = 0;
+        }
+        if(self.data.plugins_limitedtimediscount_data.time.hours <= 0 && self.data.plugins_limitedtimediscount_data.time.minutes <= 0 && self.data.plugins_limitedtimediscount_data.time.seconds <= 0) {
+          clearInterval(timers);
+        }
+      }, 100);
+    } else {
+      // 活动已结束
+      self.setData({
+        'plugins_limitedtimediscount_data.desc': '活动已结束',
+        plugins_limitedtimediscount_is_show_time: false,
+      });
+    }
+  },
+
   // 自定义分享
   onShareAppMessage() {
     return {
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
index a5ff5c536..b1ce63dfc 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
@@ -29,21 +29,10 @@
   <!-- 标题 -->
   <view class="goods-title multi-text" style="color:{{goods.title_color}}">{{goods.title}}</view>
 
-  <!-- 秒杀 -->
-  <view class="limitedtimediscount">
-    <view class="countdown">
-      <text class="text-title"> 限时秒杀</text>
-      <view class="time-right fr">
-        <view class="timer-hours minutes fr">14</view>
-        <view class="ds fr">秒</view>
-        <view class="timer-hours millisecond fr">7</view>
-        <view class="ds fr">分</view>
-        <view class="timer-hours seconds fr">08</view>
-        <view class="ds fr">时</view>
-        <view class="timer-hours hours fr">650</view>
-        <view class="timer-title fr">距离结束还有</view>
-      </view>
-    </view>
+  <!-- 限时秒杀 -->
+  <view wx:if="{{common_app_is_limitedtimediscount == 1}}">
+    <import src="/pages/lib/limitedtimediscount/goods-detail.wxml" />
+    <template is="limitedtimediscount" data="{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_time_millisecond: plugins_limitedtimediscount_time_millisecond}}"></template>
   </view>
 
   <!-- 基础信息 -->
diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
index 79013b433..f1c2b5bd1 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
@@ -172,6 +172,7 @@
   font-size: 32rpx;
   line-height: 44rpx;
   font-weight: 500;
+  padding: 15rpx 10rpx;
 }
 .goods-base {
     padding: 15rpx 10rpx;
@@ -266,6 +267,12 @@
   overflow: hidden;
   margin-top: 10rpx;
 }
+.limitedtimediscount .icon {
+  width: 50rpx;
+  height: 50rpx;
+  vertical-align: top;
+  margin-right: 5rpx;
+}
 .limitedtimediscount .countdown {
   color: #fff;
   line-height: 56rpx;
diff --git a/public/appmini/old/weixin/pages/index/index.js b/public/appmini/old/weixin/pages/index/index.js
index 0b90bfeb6..34d242887 100755
--- a/public/appmini/old/weixin/pages/index/index.js
+++ b/public/appmini/old/weixin/pages/index/index.js
@@ -129,9 +129,9 @@ Page({
         }
 
         self.setData({
-          'plugins_limitedtimediscount_data.time.hours': (hours < 10) ? 0 + hours : hours,
-          'plugins_limitedtimediscount_data.time.minutes': (minutes < 10) ? 0 + minutes : minutes,
-          'plugins_limitedtimediscount_data.time.seconds': (seconds < 10) ? 0 + seconds : seconds,
+          'plugins_limitedtimediscount_data.time.hours': (hours < 10 && hours.length == 1) ? 0 + hours : hours,
+          'plugins_limitedtimediscount_data.time.minutes': (minutes < 10 && minutes.length == 1) ? 0 + minutes : minutes,
+          'plugins_limitedtimediscount_data.time.seconds': (seconds < 10 && seconds.length == 1) ? 0 + seconds : seconds,
         });
 
         if (hours <= 0 && minutes <= 0 && seconds <= 0) {
diff --git a/public/appmini/old/weixin/pages/lib/limitedtimediscount/detail-icon.png b/public/appmini/old/weixin/pages/lib/limitedtimediscount/detail-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..37532cf8085913f669f0dcf81e16274f970b6e89
GIT binary patch
literal 2647
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
FV1lo_$g2PV

literal 0
HcmV?d00001

diff --git a/public/appmini/old/weixin/pages/lib/limitedtimediscount/goods-detail.wxml b/public/appmini/old/weixin/pages/lib/limitedtimediscount/goods-detail.wxml
new file mode 100644
index 000000000..768fef86d
--- /dev/null
+++ b/public/appmini/old/weixin/pages/lib/limitedtimediscount/goods-detail.wxml
@@ -0,0 +1,20 @@
+<template name="limitedtimediscount">
+  <view class="limitedtimediscount">
+    <view class="countdown">
+      <image class="icon" src="/pages/lib/limitedtimediscount/detail-icon.png" mode="aspectFit"></image>
+      <text class="text-title"> {{plugins_limitedtimediscount_data.title || '限时秒杀'}}</text>
+      <view class="time-right fr">
+        <block wx:if="{{plugins_limitedtimediscount_is_show_time}}">
+          <view class="timer-hours millisecond fr">{{plugins_limitedtimediscount_time_millisecond}}</view>
+          <view class="ds fr">秒</view>
+          <view class="timer-hours seconds fr">{{plugins_limitedtimediscount_data.time.seconds}}</view>
+          <view class="ds fr">分</view>
+          <view class="timer-hours minutes fr">{{plugins_limitedtimediscount_data.time.minutes}}</view>
+          <view class="ds fr">时</view>
+          <view class="timer-hours hours fr">{{plugins_limitedtimediscount_data.time.hours}}</view>
+        </block>
+        <view class="timer-title fr">{{plugins_limitedtimediscount_data.desc || '距离结束还有'}}</view>
+      </view>
+    </view>
+  </view>
+</template>
\ No newline at end of file