From 1634ab26e4493de7fb8cf15f775ca0c583da5f9b Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Mon, 15 Jul 2019 23:19:41 +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 | 2 +-
application/common.php | 5 +++--
public/appmini/old/alipay/app.js | 2 +-
public/appmini/old/alipay/app.json | 4 ++--
.../appmini/old/alipay/pages/goods-detail/goods-detail.acss | 2 --
.../appmini/old/alipay/pages/goods-detail/goods-detail.axml | 2 +-
public/appmini/old/alipay/pages/goods-detail/goods-detail.js | 2 +-
public/appmini/old/weixin/app.json | 4 ++--
public/appmini/old/weixin/pages/goods-detail/goods-detail.js | 2 +-
.../appmini/old/weixin/pages/goods-detail/goods-detail.wxml | 2 +-
.../appmini/old/weixin/pages/goods-detail/goods-detail.wxss | 2 --
11 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/application/api/controller/Goods.php b/application/api/controller/Goods.php
index 2313b09fd..0ae91d84c 100755
--- a/application/api/controller/Goods.php
+++ b/application/api/controller/Goods.php
@@ -119,7 +119,7 @@ class Goods extends Common
// 秒杀
if($result['common_app_is_limitedtimediscount'] == 1)
{
- $ret = CallPluginsServiceMethod('limitedtimediscount', 'Service', 'GoodsDetailCountdown');
+ $ret = CallPluginsServiceMethod('limitedtimediscount', 'Service', 'GoodsDetailCountdown', $goods_id);
if($ret['code'] == 0)
{
$result['plugins_limitedtimediscount_data'] = $ret['data'];
diff --git a/application/common.php b/application/common.php
index 0f451513d..0f393bfa8 100755
--- a/application/common.php
+++ b/application/common.php
@@ -20,13 +20,14 @@
* @param [string] $plugins [插件名称]
* @param [string] $service [服务层名称]
* @param [string] $method [方法名称]
+ * @param [mixed] $params [参数]
*/
-function CallPluginsServiceMethod($plugins, $service, $method)
+function CallPluginsServiceMethod($plugins, $service, $method, $params = null)
{
$plugins_class = 'app\plugins\\'.$plugins.'\service\\'.$service;
if(class_exists($plugins_class))
{
- return $plugins_class::$method();
+ return $plugins_class::$method($params);
}
return DataReturn('类未定义', -1);
}
diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js
index 12f766916..9e065b6f5 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 c64c1de5d..140b2ec29 100644
--- a/public/appmini/old/alipay/app.json
+++ b/public/appmini/old/alipay/app.json
@@ -1,5 +1,5 @@
{
- "pages": ["pages/goods-detail/goods-detail",
+ "pages": [
"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 c6f3d9fd3..fe43948ed 100644
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
@@ -196,7 +196,6 @@
line-height: 40rpx;
}
.goods-base .goods-price {
- margin-top: 10rpx;
padding-right: 100rpx;
position: relative;
min-height: 80rpx;
@@ -241,7 +240,6 @@
padding: 10rpx;
height: 56rpx;
overflow: hidden;
- margin-top: 10rpx;
}
.limitedtimediscount .icon {
width: 50rpx;
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 35d85016b..5b113d60f 100644
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
@@ -19,7 +19,7 @@
{{goods.title}}
-
+
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 b08337e23..44c27ac75 100644
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js
@@ -41,7 +41,7 @@ Page({
},
onLoad(params) {
- params['goods_id']=2;
+ //params['goods_id']=2;
this.setData({params: params});
this.init();
},
diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json
index a9afed06a..f325a2101 100755
--- a/public/appmini/old/weixin/app.json
+++ b/public/appmini/old/weixin/app.json
@@ -1,5 +1,5 @@
{
- "pages": ["pages/goods-detail/goods-detail",
+ "pages": [
"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/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
index 4ed204e8c..b10c1f84a 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js
@@ -45,7 +45,7 @@ Page({
},
onLoad(params) {
- params['goods_id']=2;
+ //params['goods_id']=2;
this.setData({params: params});
this.init();
},
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 b1ce63dfc..766cb9469 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
@@ -30,7 +30,7 @@
{{goods.title}}
-
+
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 f1c2b5bd1..34f702591 100755
--- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
+++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss
@@ -194,7 +194,6 @@
line-height: 40rpx;
}
.goods-base .goods-price {
- margin-top: 10rpx;
padding-right: 100rpx;
position: relative;
min-height: 80rpx;
@@ -265,7 +264,6 @@
padding: 10rpx;
height: 56rpx;
overflow: hidden;
- margin-top: 10rpx;
}
.limitedtimediscount .icon {
width: 50rpx;
--
GitLab