From 69340a0548d848bdc68d23edaeee8466d757d06c Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Thu, 1 Aug 2019 10:02:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=92=A9=E5=AD=90=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Admin.php             | 10 +++++++++-
 application/admin/controller/Article.php           |  2 +-
 application/admin/controller/Power.php             |  2 +-
 .../admin/view/default/admin/login_info.html       | 14 ++++++++++++++
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/application/admin/controller/Admin.php b/application/admin/controller/Admin.php
index 172614c1d..dbd81e5b4 100755
--- a/application/admin/controller/Admin.php
+++ b/application/admin/controller/Admin.php
@@ -150,7 +150,7 @@ class Admin extends Common
         [
             'hook_name'     => $hook_name,
             'is_backend'    => false,
-            'goods_id'      => isset($params['id']) ? $params['id'] : 0,
+            'admin_id'      => isset($params['id']) ? $params['id'] : 0,
             'data'          => &$data,
             'params'        => &$params,
         ]));
@@ -236,6 +236,14 @@ class Admin extends Common
 			return redirect(MyUrl('admin/index/index'));
 		}
 
+		// 管理员登录页面钩子
+        $hook_name = 'plugins_view_admin_login_info';
+        $this->assign($hook_name.'_data', Hook::listen($hook_name,
+        [
+            'hook_name'     => $hook_name,
+            'is_backend'    => false,
+        ]));
+
 		return $this->fetch();
 	}
 
diff --git a/application/admin/controller/Article.php b/application/admin/controller/Article.php
index 78e98765b..294bbaff1 100755
--- a/application/admin/controller/Article.php
+++ b/application/admin/controller/Article.php
@@ -138,7 +138,7 @@ class Article extends Common
         [
             'hook_name'     => $hook_name,
             'is_backend'    => false,
-            'goods_id'      => isset($params['id']) ? $params['id'] : 0,
+            'article_id'    => isset($params['id']) ? $params['id'] : 0,
             'data'          => &$data,
             'params'        => &$params,
         ]));
diff --git a/application/admin/controller/Power.php b/application/admin/controller/Power.php
index bbf36a41c..86250cd83 100755
--- a/application/admin/controller/Power.php
+++ b/application/admin/controller/Power.php
@@ -162,7 +162,7 @@ class Power extends Common
         [
             'hook_name'     => $hook_name,
             'is_backend'    => false,
-            'goods_id'      => isset($params['id']) ? $params['id'] : 0,
+            'role_id'      	=> isset($params['id']) ? $params['id'] : 0,
             'data'          => &$data,
             'params'        => &$params,
         ]));
diff --git a/application/admin/view/default/admin/login_info.html b/application/admin/view/default/admin/login_info.html
index 536d3bcbe..0ad91d28c 100755
--- a/application/admin/view/default/admin/login_info.html
+++ b/application/admin/view/default/admin/login_info.html
@@ -30,6 +30,20 @@
 	</div>
 </div>
 <!-- content end -->
+
+<!-- 插件扩展数据 start -->
+{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
+    <div class="plugins-tag">
+        <span>plugins_view_admin_login_info</span>
+    </div>
+{{/if}}
+{{if !empty($plugins_view_admin_login_info_data) and is_array($plugins_view_admin_login_info_data)}}
+    {{foreach $plugins_view_admin_login_info_data as $hook}}
+        {{if is_string($hook) or is_int($hook)}}
+            {{$hook|raw}}
+        {{/if}}
+    {{/foreach}}
+{{/if}}
 		
 <!-- footer -->
 {{include file="public/footer" /}}
\ No newline at end of file
-- 
GitLab