From 755fa1c64cb9bde48ecbbc3f537726574ffb3645 Mon Sep 17 00:00:00 2001 From: tensent Date: Sat, 4 Apr 2020 16:48:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A9=E5=B1=95=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/syslogin/Plugin.php | 2 +- addons/syslogin/controller/Admin.php | 12 +- addons/syslogin/view/admin/login.html | 3 - addons/syslogin/view/admin/setting.html | 1 + addons/syslogin/view/base.html | 213 ++++++++++++++++++++++++ app/controller/Base.php | 3 + 6 files changed, 226 insertions(+), 8 deletions(-) delete mode 100644 addons/syslogin/view/admin/login.html create mode 100644 addons/syslogin/view/admin/setting.html create mode 100644 addons/syslogin/view/base.html diff --git a/addons/syslogin/Plugin.php b/addons/syslogin/Plugin.php index 7675bf6d..d95e5649 100644 --- a/addons/syslogin/Plugin.php +++ b/addons/syslogin/Plugin.php @@ -19,7 +19,7 @@ class Plugin extends \sent\Addons{ 'name'=>'Syslogin', 'title'=>'第三方登录', 'description'=>'第三方登录', - 'status'=>0, + 'status'=>1, 'author'=>'molong', 'version'=>'0.1' ); diff --git a/addons/syslogin/controller/Admin.php b/addons/syslogin/controller/Admin.php index 9848f7b2..d72b67bf 100644 --- a/addons/syslogin/controller/Admin.php +++ b/addons/syslogin/controller/Admin.php @@ -8,12 +8,16 @@ // +---------------------------------------------------------------------- namespace addons\syslogin\controller; -use app\common\controller\Addons; -class Admin extends Addons{ +class Admin extends \app\controller\admin\Base{ + /** + * @title 第三方登录设置 + */ public function setting(){ - $this->setMeta('第三方登录设置'); - $this->template('admin/login'); + $this->data = [ + 'meta_title' => '第三方登录设置', + ]; + return $this->fetch(); } } diff --git a/addons/syslogin/view/admin/login.html b/addons/syslogin/view/admin/login.html deleted file mode 100644 index d6efb672..00000000 --- a/addons/syslogin/view/admin/login.html +++ /dev/null @@ -1,3 +0,0 @@ -{extend name="admin@public:base"/} -{block name="body"} -{/block} \ No newline at end of file diff --git a/addons/syslogin/view/admin/setting.html b/addons/syslogin/view/admin/setting.html new file mode 100644 index 00000000..338c1132 --- /dev/null +++ b/addons/syslogin/view/admin/setting.html @@ -0,0 +1 @@ +{extend name="base"/} \ No newline at end of file diff --git a/addons/syslogin/view/base.html b/addons/syslogin/view/base.html new file mode 100644 index 00000000..7ade0e80 --- /dev/null +++ b/addons/syslogin/view/base.html @@ -0,0 +1,213 @@ +{include file="../../../view/admin/public/header" /} +{block name="style"}{/block} +
+ + + +
+{include file="../../../view/admin/public/tool" /} +{include file="../../../view/admin/public/footer" /} +{block name="script"}{/block} \ No newline at end of file diff --git a/app/controller/Base.php b/app/controller/Base.php index 3f25e450..581126fd 100644 --- a/app/controller/Base.php +++ b/app/controller/Base.php @@ -122,6 +122,9 @@ class Base { } protected function fetch($template = '') { + if($this->request->param('addon')){ + $this->tpl_config['view_dir_name'] = 'addons' . DIRECTORY_SEPARATOR . $this->request->param('addon') . DIRECTORY_SEPARATOR . 'view'; + } View::config($this->tpl_config); View::assign($this->data); return View::fetch($template);