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 @@
+
+ {{goods.title}}
+
+
+
+
+
+
+
- {{goods.title}}