From 7a3e9868be8fed65b4754a13580cd2fba83efac9 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Tue, 13 Aug 2019 21:02:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=A1=AE=E8=AE=A4=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=92=A9=E5=AD=90=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/controller/Buy.php    | 20 ++++++++++++++++----
 application/tags.php                    |  4 ++++
 public/static/index/default/css/buy.css |  4 ++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/application/index/controller/Buy.php b/application/index/controller/Buy.php
index 88d2aeb3e..6952fe339 100755
--- a/application/index/controller/Buy.php
+++ b/application/index/controller/Buy.php
@@ -69,15 +69,16 @@ class Buy extends Common
 
                 // 支付方式
                 $this->assign('payment_list', PaymentService::BuyPaymentList(['is_enable'=>1, 'is_open_user'=>1]));
-
-                // 钩子
-                $this->PluginsHook($ret['data']);
                 
                 // 页面数据
                 $this->assign('base', $ret['data']['base']);
                 $this->assign('goods_list', $ret['data']['goods']);
                 $this->assign('extension_data', $ret['data']['extension_data']);
                 $this->assign('params', $params);
+
+                // 钩子
+                $this->PluginsHook($ret['data'], $params);
+
                 return $this->fetch();
             } else {
                 $this->assign('msg', isset($ret['msg']) ? $ret['msg'] : '参数错误');
@@ -93,9 +94,10 @@ class Buy extends Common
      * @version 1.0.0
      * @date    2019-08-13
      * @desc    description
+     * @param   [array]           $data     [确认数据]
      * @param   [array]           $params   [输入参数]
      */
-    private function PluginsHook($params = [])
+    private function PluginsHook($data = [], $params = [])
     {
         // 订单确认页面顶部钩子
         $hook_name = 'plugins_view_buy_top';
@@ -103,6 +105,7 @@ class Buy extends Common
             [
                 'hook_name'     => $hook_name,
                 'is_backend'    => false,
+                'data'          => $data,
                 'params'        => $params,
             ]));
 
@@ -112,6 +115,7 @@ class Buy extends Common
             [
                 'hook_name'     => $hook_name,
                 'is_backend'    => false,
+                'data'          => $data,
                 'params'        => $params,
             ]));
 
@@ -121,6 +125,7 @@ class Buy extends Common
             [
                 'hook_name'     => $hook_name,
                 'is_backend'    => false,
+                'data'          => $data,
                 'params'        => $params,
             ]));
 
@@ -130,6 +135,7 @@ class Buy extends Common
             [
                 'hook_name'     => $hook_name,
                 'is_backend'    => false,
+                'data'          => $data,
                 'params'        => $params,
             ]));
 
@@ -139,6 +145,7 @@ class Buy extends Common
             [
                 'hook_name'     => $hook_name,
                 'is_backend'    => false,
+                'data'          => $data,
                 'params'        => $params,
             ]));
 
@@ -148,6 +155,7 @@ class Buy extends Common
             [
                 'hook_name'     => $hook_name,
                 'is_backend'    => false,
+                'data'          => $data,
                 'params'        => $params,
             ]));
 
@@ -157,6 +165,7 @@ class Buy extends Common
             [
                 'hook_name'     => $hook_name,
                 'is_backend'    => false,
+                'data'          => $data,
                 'params'        => $params,
             ]));
 
@@ -166,6 +175,7 @@ class Buy extends Common
             [
                 'hook_name'     => $hook_name,
                 'is_backend'    => false,
+                'data'          => $data,
                 'params'        => $params,
             ]));
 
@@ -175,6 +185,7 @@ class Buy extends Common
             [
                 'hook_name'     => $hook_name,
                 'is_backend'    => false,
+                'data'          => $data,
                 'params'        => $params,
             ]));
 
@@ -184,6 +195,7 @@ class Buy extends Common
             [
                 'hook_name'     => $hook_name,
                 'is_backend'    => false,
+                'data'          => $data,
                 'params'        => $params,
             ]));
     }
diff --git a/application/tags.php b/application/tags.php
index 75ee49987..5efab3726 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -57,5 +57,9 @@ return array (
   array (
     0 => 'app\\plugins\\coupon\\Hook',
   ),
+  'plugins_view_buy_goods_bottom' => 
+  array (
+    0 => 'app\\plugins\\coupon\\Hook',
+  ),
 );
 ?>
\ No newline at end of file
diff --git a/public/static/index/default/css/buy.css b/public/static/index/default/css/buy.css
index 9d8ac8683..5d8f9e4ec 100755
--- a/public/static/index/default/css/buy.css
+++ b/public/static/index/default/css/buy.css
@@ -16,8 +16,8 @@ ul.address-list li .user-base {font-size: 14px; font-weight: 700; margin-bottom:
 
 /* 物流/支付 */
 .business-item ul li { border:1px solid transparent ;overflow: hidden; float: left; cursor: pointer; padding: 5px; border: 1px solid #e5e5e5; margin: 0 10px 10px 0; }
-ul.logistics-list li.selected, ul.payment-list li.selected {border-color:#d2364c ;position:relative;box-shadow: 0px 0 0px 1px #d2364c;}
-ul.logistics-list li.selected i.icon-active, ul.payment-list li.selected i.icon-active {
+ul.logistics-list li.selected, ul.payment-list li.selected, .confirm-selected {border-color:#d2364c ;position:relative;box-shadow: 0px 0 0px 1px #d2364c;}
+ul.logistics-list li.selected i.icon-active, ul.payment-list li.selected i.icon-active, .confirm-selected i.icon-active {
     position: absolute;
     width: 10px;
     height: 10px;
-- 
GitLab