From 08bb69c3b4ad366946c0dc06337666efb525b682 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Tue, 12 Feb 2019 11:46:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Admin.php | 14 ++-- application/admin/controller/Answer.php | 4 +- application/admin/controller/Appconfig.php | 4 +- application/admin/controller/Apphomenav.php | 4 +- .../admin/controller/Appminialipayconfig.php | 4 +- .../admin/controller/Appminialipaylist.php | 4 +- .../admin/controller/Appminiweixinconfig.php | 4 +- .../admin/controller/Appminiweixinlist.php | 4 +- application/admin/controller/Article.php | 4 +- .../admin/controller/Articlecategory.php | 4 +- application/admin/controller/Brand.php | 4 +- .../admin/controller/Brandcategory.php | 4 +- application/admin/controller/Cache.php | 4 +- application/admin/controller/Common.php | 11 +-- application/admin/controller/Config.php | 4 +- application/admin/controller/Customview.php | 4 +- application/admin/controller/Email.php | 4 +- application/admin/controller/Express.php | 4 +- application/admin/controller/Goods.php | 4 +- .../admin/controller/Goodscategory.php | 4 +- application/admin/controller/Index.php | 2 +- application/admin/controller/Integrallog.php | 4 +- application/admin/controller/Link.php | 4 +- application/admin/controller/Message.php | 4 +- application/admin/controller/Navigation.php | 4 +- application/admin/controller/Order.php | 4 +- application/admin/controller/Paylog.php | 4 +- application/admin/controller/Payment.php | 4 +- application/admin/controller/Plugins.php | 66 ++++++++++-------- application/admin/controller/Power.php | 4 +- application/admin/controller/Region.php | 4 +- .../admin/controller/Screeningprice.php | 4 +- application/admin/controller/Seo.php | 4 +- application/admin/controller/Site.php | 4 +- application/admin/controller/Slide.php | 4 +- application/admin/controller/Sms.php | 4 +- application/admin/controller/Theme.php | 4 +- application/admin/controller/Ueditor.php | 2 +- application/admin/controller/User.php | 4 +- .../admin/view/default/plugins/index.html | 18 +++-- .../admin/view/default/plugins/nav.html | 8 +++ .../admin/view/default/plugins/upload.html | 31 +++++++++ .../admin/view/default/theme/upload.html | 1 + .../{Commontopmaxpicture.php => Index.php} | 34 +--------- .../plugins/commontopmaxpicture/config.json | 16 +++++ application/plugins/controller/Index.php | 67 ++++++++++++++----- .../view/commontopmaxpicture/index.html | 2 +- .../view/commontopmaxpicture/saveinfo.html | 4 +- application/plugins/view/public/header.html | 2 +- application/service/PluginsService.php | 14 ++-- application/tags.php | 2 +- config/shopxo.php | 2 +- public/static/admin/default/css/plugins.css | 12 +++- .../index.css} | 0 54 files changed, 266 insertions(+), 178 deletions(-) create mode 100644 application/admin/view/default/plugins/nav.html create mode 100644 application/admin/view/default/plugins/upload.html rename application/plugins/commontopmaxpicture/{Commontopmaxpicture.php => Index.php} (85%) create mode 100644 application/plugins/commontopmaxpicture/config.json rename public/static/plugins/css/{commontopmaxpicture.css => commontopmaxpicture/index.css} (100%) diff --git a/application/admin/controller/Admin.php b/application/admin/controller/Admin.php index d41e61495..db716316e 100755 --- a/application/admin/controller/Admin.php +++ b/application/admin/controller/Admin.php @@ -44,10 +44,10 @@ class Admin extends Common public function Index() { // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); // 参数 $params = input(); @@ -104,7 +104,7 @@ class Admin extends Common public function SaveInfo() { // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 参数 $params = input(); @@ -113,7 +113,7 @@ class Admin extends Common if(!isset($params['id']) || $params['id'] != $this->admin['id']) { // 权限校验 - $this->Is_Power(); + $this->IsPower(); } // 管理员编辑 @@ -154,7 +154,7 @@ class Admin extends Common public function Save() { // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 是否ajax if(!IS_AJAX) @@ -178,10 +178,10 @@ class Admin extends Common public function Delete() { // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); // 是否ajax if(!IS_AJAX) diff --git a/application/admin/controller/Answer.php b/application/admin/controller/Answer.php index 998d79130..1d6819c37 100755 --- a/application/admin/controller/Answer.php +++ b/application/admin/controller/Answer.php @@ -34,10 +34,10 @@ class Answer extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Appconfig.php b/application/admin/controller/Appconfig.php index 53b0d1540..6014c5da1 100755 --- a/application/admin/controller/Appconfig.php +++ b/application/admin/controller/Appconfig.php @@ -34,10 +34,10 @@ class AppConfig extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Apphomenav.php b/application/admin/controller/Apphomenav.php index 489ce903c..fd441e539 100755 --- a/application/admin/controller/Apphomenav.php +++ b/application/admin/controller/Apphomenav.php @@ -34,10 +34,10 @@ class AppHomeNav extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Appminialipayconfig.php b/application/admin/controller/Appminialipayconfig.php index 4f88cc33c..fc81f1f67 100755 --- a/application/admin/controller/Appminialipayconfig.php +++ b/application/admin/controller/Appminialipayconfig.php @@ -34,10 +34,10 @@ class AppMiniAlipayConfig extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Appminialipaylist.php b/application/admin/controller/Appminialipaylist.php index 25c6296f4..8e44d57ec 100755 --- a/application/admin/controller/Appminialipaylist.php +++ b/application/admin/controller/Appminialipaylist.php @@ -38,10 +38,10 @@ class AppMiniAlipayList extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); // 参数 $this->params = input(); diff --git a/application/admin/controller/Appminiweixinconfig.php b/application/admin/controller/Appminiweixinconfig.php index 1ffb9c499..26d313bfe 100755 --- a/application/admin/controller/Appminiweixinconfig.php +++ b/application/admin/controller/Appminiweixinconfig.php @@ -34,10 +34,10 @@ class AppMiniWeixinConfig extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Appminiweixinlist.php b/application/admin/controller/Appminiweixinlist.php index 7abbd9983..b2a8afbf6 100755 --- a/application/admin/controller/Appminiweixinlist.php +++ b/application/admin/controller/Appminiweixinlist.php @@ -38,10 +38,10 @@ class AppMiniWeixinList extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); // 参数 $this->params = input(); diff --git a/application/admin/controller/Article.php b/application/admin/controller/Article.php index e08c3efae..f01c3b4eb 100755 --- a/application/admin/controller/Article.php +++ b/application/admin/controller/Article.php @@ -34,10 +34,10 @@ class Article extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Articlecategory.php b/application/admin/controller/Articlecategory.php index b878fb6e2..08f4189e1 100755 --- a/application/admin/controller/Articlecategory.php +++ b/application/admin/controller/Articlecategory.php @@ -34,10 +34,10 @@ class ArticleCategory extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Brand.php b/application/admin/controller/Brand.php index ad0ba3840..4aa389a0b 100755 --- a/application/admin/controller/Brand.php +++ b/application/admin/controller/Brand.php @@ -34,10 +34,10 @@ class Brand extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Brandcategory.php b/application/admin/controller/Brandcategory.php index 40727c12a..cb3588557 100755 --- a/application/admin/controller/Brandcategory.php +++ b/application/admin/controller/Brandcategory.php @@ -34,10 +34,10 @@ class BrandCategory extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Cache.php b/application/admin/controller/Cache.php index 87515b6bf..9c6a9aee6 100755 --- a/application/admin/controller/Cache.php +++ b/application/admin/controller/Cache.php @@ -32,10 +32,10 @@ class Cache extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Common.php b/application/admin/controller/Common.php index 6dbd4e079..dcd67b41a 100755 --- a/application/admin/controller/Common.php +++ b/application/admin/controller/Common.php @@ -79,13 +79,13 @@ class Common extends Controller } /** - * [Is_Login 登录校验] + * [IsLogin 登录校验] * @author Devil * @blog http://gong.gg/ * @version 0.0.1 * @datetime 2016-12-03T12:42:35+0800 */ - protected function Is_Login() + protected function IsLogin() { if(session('admin') === null) { @@ -138,16 +138,19 @@ class Common extends Controller // 图片host地址 $this->assign('attachment_host', config('shopxo.attachment_host')); + + // 开发模式 + $this->assign('shopxo_is_develop', config('shopxo.is_develop')); } /** - * [Is_Power 是否有权限] + * [IsPower 是否有权限] * @author Devil * @blog http://gong.gg/ * @version 0.0.1 * @datetime 2016-12-20T19:18:29+0800 */ - protected function Is_Power() + protected function IsPower() { // 不需要校验权限的方法 $unwanted_power = array('getnodeson'); diff --git a/application/admin/controller/Config.php b/application/admin/controller/Config.php index e57e469fb..ec2b8f23a 100755 --- a/application/admin/controller/Config.php +++ b/application/admin/controller/Config.php @@ -34,10 +34,10 @@ class Config extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Customview.php b/application/admin/controller/Customview.php index f72b64e7b..46497827d 100755 --- a/application/admin/controller/Customview.php +++ b/application/admin/controller/Customview.php @@ -34,10 +34,10 @@ class CustomView extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Email.php b/application/admin/controller/Email.php index bdc401b55..39981b0b6 100755 --- a/application/admin/controller/Email.php +++ b/application/admin/controller/Email.php @@ -34,10 +34,10 @@ class Email extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Express.php b/application/admin/controller/Express.php index d8d5df9c0..395c5edd2 100755 --- a/application/admin/controller/Express.php +++ b/application/admin/controller/Express.php @@ -34,10 +34,10 @@ class Express extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Goods.php b/application/admin/controller/Goods.php index c7fc74657..89708d601 100755 --- a/application/admin/controller/Goods.php +++ b/application/admin/controller/Goods.php @@ -37,10 +37,10 @@ class Goods extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Goodscategory.php b/application/admin/controller/Goodscategory.php index 6224b9447..716bc44ff 100755 --- a/application/admin/controller/Goodscategory.php +++ b/application/admin/controller/Goodscategory.php @@ -34,10 +34,10 @@ class GoodsCategory extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php index 1878482fd..a6ee485ff 100755 --- a/application/admin/controller/Index.php +++ b/application/admin/controller/Index.php @@ -32,7 +32,7 @@ class Index extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); } /** diff --git a/application/admin/controller/Integrallog.php b/application/admin/controller/Integrallog.php index df1f03d30..e5317c8fe 100755 --- a/application/admin/controller/Integrallog.php +++ b/application/admin/controller/Integrallog.php @@ -34,10 +34,10 @@ class IntegralLog extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Link.php b/application/admin/controller/Link.php index a641f8fca..36fa791c9 100755 --- a/application/admin/controller/Link.php +++ b/application/admin/controller/Link.php @@ -34,10 +34,10 @@ class Link extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Message.php b/application/admin/controller/Message.php index a39d2dcc4..f4785604c 100755 --- a/application/admin/controller/Message.php +++ b/application/admin/controller/Message.php @@ -34,10 +34,10 @@ class Message extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Navigation.php b/application/admin/controller/Navigation.php index deb0a003d..af70a94ee 100755 --- a/application/admin/controller/Navigation.php +++ b/application/admin/controller/Navigation.php @@ -38,10 +38,10 @@ class Navigation extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); // 导航类型 $this->nav_type = input('nav_type', 'header'); diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php index 4972597bd..743d82a4b 100755 --- a/application/admin/controller/Order.php +++ b/application/admin/controller/Order.php @@ -36,10 +36,10 @@ class Order extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Paylog.php b/application/admin/controller/Paylog.php index 5d28771ca..f63bdfda0 100755 --- a/application/admin/controller/Paylog.php +++ b/application/admin/controller/Paylog.php @@ -34,10 +34,10 @@ class PayLog extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Payment.php b/application/admin/controller/Payment.php index cd2cf7d77..4a2dcc054 100755 --- a/application/admin/controller/Payment.php +++ b/application/admin/controller/Payment.php @@ -34,10 +34,10 @@ class Payment extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Plugins.php b/application/admin/controller/Plugins.php index 34be1ea91..0823e9d37 100644 --- a/application/admin/controller/Plugins.php +++ b/application/admin/controller/Plugins.php @@ -34,10 +34,13 @@ class Plugins extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); + + // 小导航 + $this->view_type = input('view_type', 'home'); } /** @@ -49,39 +52,48 @@ class Plugins extends Common */ public function Index() { + // 导航参数 + $this->assign('view_type', $this->view_type); + // 参数 $params = input(); - // 分页 - $number = 12; + // 页面类型 + if($this->view_type == 'home') + { + // 分页 + $number = 12; - // 条件 - $where = PluginsService::PluginsListWhere($params); + // 条件 + $where = PluginsService::PluginsListWhere($params); - // 获取总数 - $total = PluginsService::PluginsTotal($where); + // 获取总数 + $total = PluginsService::PluginsTotal($where); - // 分页 - $page_params = array( - 'number' => $number, - 'total' => $total, - 'where' => $params, - 'page' => isset($params['page']) ? intval($params['page']) : 1, - 'url' => MyUrl('admin/plugins/index'), + // 分页 + $page_params = array( + 'number' => $number, + 'total' => $total, + 'where' => $params, + 'page' => isset($params['page']) ? intval($params['page']) : 1, + 'url' => MyUrl('admin/plugins/index'), + ); + $page = new \base\Page($page_params); + $this->assign('page_html', $page->GetPageHtml()); + + // 获取列表 + $data_params = array( + 'm' => $page->GetPageStarNumber(), + 'n' => $number, + 'where' => $where, ); - $page = new \base\Page($page_params); - $this->assign('page_html', $page->GetPageHtml()); + $data = PluginsService::PluginsList($data_params); + $this->assign('data_list', $data['data']); - // 获取列表 - $data_params = array( - 'm' => $page->GetPageStarNumber(), - 'n' => $number, - 'where' => $where, - ); - $data = PluginsService::PluginsList($data_params); - $this->assign('data_list', $data['data']); - - return $this->fetch(); + return $this->fetch(); + } else { + return $this->fetch('upload'); + } } /** diff --git a/application/admin/controller/Power.php b/application/admin/controller/Power.php index e363ce271..852df71f5 100755 --- a/application/admin/controller/Power.php +++ b/application/admin/controller/Power.php @@ -34,10 +34,10 @@ class Power extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Region.php b/application/admin/controller/Region.php index c1a77faa4..3e1e10787 100755 --- a/application/admin/controller/Region.php +++ b/application/admin/controller/Region.php @@ -34,10 +34,10 @@ class Region extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Screeningprice.php b/application/admin/controller/Screeningprice.php index cffd8a005..216448d4d 100755 --- a/application/admin/controller/Screeningprice.php +++ b/application/admin/controller/Screeningprice.php @@ -34,10 +34,10 @@ class ScreeningPrice extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Seo.php b/application/admin/controller/Seo.php index 4f01b9d53..937389e97 100755 --- a/application/admin/controller/Seo.php +++ b/application/admin/controller/Seo.php @@ -34,10 +34,10 @@ class Seo extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Site.php b/application/admin/controller/Site.php index f8efba29f..276c30502 100755 --- a/application/admin/controller/Site.php +++ b/application/admin/controller/Site.php @@ -34,10 +34,10 @@ class Site extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Slide.php b/application/admin/controller/Slide.php index 9f07fe04d..157565f8a 100755 --- a/application/admin/controller/Slide.php +++ b/application/admin/controller/Slide.php @@ -34,10 +34,10 @@ class Slide extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Sms.php b/application/admin/controller/Sms.php index a60b82fd2..c478172e2 100755 --- a/application/admin/controller/Sms.php +++ b/application/admin/controller/Sms.php @@ -34,10 +34,10 @@ class Sms extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/controller/Theme.php b/application/admin/controller/Theme.php index f107b9784..cd116032d 100755 --- a/application/admin/controller/Theme.php +++ b/application/admin/controller/Theme.php @@ -35,10 +35,10 @@ class Theme extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); // 小导航 $this->view_type = input('view_type', 'home'); diff --git a/application/admin/controller/Ueditor.php b/application/admin/controller/Ueditor.php index 40eab781d..952fe3726 100755 --- a/application/admin/controller/Ueditor.php +++ b/application/admin/controller/Ueditor.php @@ -53,7 +53,7 @@ class Ueditor extends Common if($this->current_action != 'config') { // 登录校验 - $this->Is_Login(); + $this->IsLogin(); } // action diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index 46ef37866..1b1c145a6 100755 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -35,10 +35,10 @@ class User extends Common parent::__construct(); // 登录校验 - $this->Is_Login(); + $this->IsLogin(); // 权限校验 - $this->Is_Power(); + $this->IsPower(); } /** diff --git a/application/admin/view/default/plugins/index.html b/application/admin/view/default/plugins/index.html index b64698b4a..f65fbb9a6 100644 --- a/application/admin/view/default/plugins/index.html +++ b/application/admin/view/default/plugins/index.html @@ -3,10 +3,16 @@
+ + {{include file="plugins/nav" /}} + + -
- 新增 -
+ {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} +
+ 新增 +
+ {{/if}} {{if !empty($data_list)}} @@ -23,9 +29,11 @@
{{$v.desc}}
- + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} + + {{/if}} - + diff --git a/application/admin/view/default/plugins/nav.html b/application/admin/view/default/plugins/nav.html new file mode 100644 index 000000000..2e33a8a47 --- /dev/null +++ b/application/admin/view/default/plugins/nav.html @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/application/admin/view/default/plugins/upload.html b/application/admin/view/default/plugins/upload.html new file mode 100644 index 000000000..0c8442828 --- /dev/null +++ b/application/admin/view/default/plugins/upload.html @@ -0,0 +1,31 @@ +{{include file="public/header" /}} + + +
+
+ + {{include file="plugins/nav" /}} + + + +
+ +
+ + + 上传一个zip压缩格式的主题安装包 +
+
+
+ +
+
+ +
+
+ + + +{{include file="public/footer" /}} + \ No newline at end of file diff --git a/application/admin/view/default/theme/upload.html b/application/admin/view/default/theme/upload.html index 73a4c3fa9..3f948553e 100755 --- a/application/admin/view/default/theme/upload.html +++ b/application/admin/view/default/theme/upload.html @@ -6,6 +6,7 @@ {{include file="theme/nav" /}} +
diff --git a/application/plugins/commontopmaxpicture/Commontopmaxpicture.php b/application/plugins/commontopmaxpicture/Index.php similarity index 85% rename from application/plugins/commontopmaxpicture/Commontopmaxpicture.php rename to application/plugins/commontopmaxpicture/Index.php index 0b8c43ee1..f70dc7953 100644 --- a/application/plugins/commontopmaxpicture/Commontopmaxpicture.php +++ b/application/plugins/commontopmaxpicture/Index.php @@ -20,7 +20,7 @@ use app\service\PluginsService; * @version 0.0.1 * @datetime 2016-12-01T21:51:08+0800 */ -class Commontopmaxpicture extends Controller +class Index extends Controller { /** * 应用响应入口 @@ -112,38 +112,6 @@ class Commontopmaxpicture extends Controller return $html; } - /** - * 配置信息 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2019-02-06T16:16:34+0800 - */ - public function config() - { - // 基础信息 - $base = [ - 'name' => '顶部广告', - 'author' => 'Devil', - 'author_url' => 'https://shopxo.net/', - 'version' => '1.0.0', - 'desc' => '顶部大图广告，突破视觉', - 'apply_terminal'=> ['pc'], - 'apply_version' => ['1.3.0'], - 'sales_amount' => 0, - ]; - - // 钩子 - $hook = [ - 'plugins_common_top' => ['app\\plugins\\commontopmaxpicture\\Commontopmaxpicture'], - ]; - - return [ - 'base' => $base, - 'hook' => $hook, - ]; - } - /** * 首页 * @author Devil diff --git a/application/plugins/commontopmaxpicture/config.json b/application/plugins/commontopmaxpicture/config.json new file mode 100644 index 000000000..54d0dffc0 --- /dev/null +++ b/application/plugins/commontopmaxpicture/config.json @@ -0,0 +1,16 @@ +{ + "base": { + "name": "顶部广告", + "logo": "/static/upload/images/plugins_commontopmaxpicture/2019/02/09/1549671733987654.png", + "author": "Devil", + "author_url": "https://shopxo.net/", + "version": "1.0.0", + "desc": "顶部大图广告，突破视觉", + "apply_terminal": ["pc"], + "apply_version": ["1.3.0"], + "sales_amount": 0 + }, + "hook": { + "plugins_common_top": ["app\\plugins\\commontopmaxpicture\\Index"] + } +} \ No newline at end of file diff --git a/application/plugins/controller/Index.php b/application/plugins/controller/Index.php index dd1f330d3..5f36088fa 100644 --- a/application/plugins/controller/Index.php +++ b/application/plugins/controller/Index.php @@ -13,7 +13,7 @@ namespace app\plugins\controller; use think\Controller; /** - * 插件入口控制器 + * 应用入口控制器 * @author Devil * @blog http://gong.gg/ * @version 0.0.1 @@ -35,20 +35,53 @@ class Index extends Controller // 参数 $params = input(); - $control = strtolower($params['control']); - $action = strtolower($params['action']); + + // 请求参数校验 + $p = [ + [ + 'checked_type' => 'empty', + 'key_name' => 'pluginsname', + 'error_msg' => '应用名称有误', + ], + [ + 'checked_type' => 'empty', + 'key_name' => 'pluginscontrol', + 'error_msg' => '应用控制器有误', + ], + [ + 'checked_type' => 'empty', + 'key_name' => 'pluginsaction', + 'error_msg' => '应用操作方法有误', + ], + ]; + $ret = ParamsChecked($params, $p); + if($ret !== true) + { + if(IS_AJAX) + { + exit(json_encode(DataReturn($ret, -5000))); + } else { + $this->assign('msg', $ret); + return $this->fetch('public/error'); + } + } + + // 应用名称/控制器/方法 + $pluginsname = $params['pluginsname']; + $pluginscontrol = strtolower($params['pluginscontrol']); + $pluginsaction = strtolower($params['pluginsaction']); // 编辑器文件存放地址定义 - $this->assign('editor_path_type', 'plugins_'.$control); + $this->assign('editor_path_type', 'plugins_'.$pluginsname); // 系统初始化 $this->SystemInit(); // 视图初始化 - $this->ViewInit($control, $action); + $this->ViewInit($pluginsname, $pluginscontrol, $pluginsaction); - // 调用插件 - return controller(ucfirst($control), $control)->$action(input('post.')); + // 调用应用 + return controller(ucfirst($pluginscontrol), $pluginsname)->$pluginsaction($params); } /** @@ -91,26 +124,28 @@ class Index extends Controller * @blog http://gong.gg/ * @version 1.0.0 * @datetime 2019-02-07T22:46:29+0800 - * @param [string] $controller_name [控制器名称] - * @param [string] $action_name [方法] + * @param [string] $plugins_name [应用名称] + * @param [string] $plugins_control [控制器名称] + * @param [string] $plugins_action [方法] */ - public function ViewInit($controller_name, $action_name) + public function ViewInit($plugins_name, $plugins_control, $plugins_action) { // 当前操作名称 $module_name = strtolower(request()->module()); // 当前操作名称 + $this->assign('plugins_name', $plugins_name); $this->assign('module_name', $module_name); - $this->assign('controller_name', $controller_name); - $this->assign('action_name', $action_name); + $this->assign('controller_name', $plugins_control); + $this->assign('action_name', $plugins_action); // 控制器静态文件状态css,js - $module_css = $module_name.DS.'css'.DS.$controller_name; - $module_css .= file_exists(ROOT_PATH.'static'.DS.$module_css.'.'.$action_name.'.css') ? '.'.$action_name.'.css' : '.css'; + $module_css = $module_name.DS.'css'.DS.$plugins_name.DS.$plugins_control; + $module_css .= file_exists(ROOT_PATH.'static'.DS.$module_css.'.'.$plugins_action.'.css') ? '.'.$plugins_action.'.css' : '.css'; $this->assign('module_css', file_exists(ROOT_PATH.'static'.DS.$module_css) ? $module_css : ''); - $module_js = $module_name.DS.'js'.DS.$controller_name; - $module_js .= file_exists(ROOT_PATH.'static'.DS.$module_js.'.'.$action_name.'.js') ? '.'.$action_name.'.js' : '.js'; + $module_js = $module_name.DS.'js'.DS.$plugins_name.DS.$plugins_control; + $module_js .= file_exists(ROOT_PATH.'static'.DS.$module_js.'.'.$plugins_action.'.js') ? '.'.$plugins_action.'.js' : '.js'; $this->assign('module_js', file_exists(ROOT_PATH.'static'.DS.$module_js) ? $module_js : ''); // 图片host地址 diff --git a/application/plugins/view/commontopmaxpicture/index.html b/application/plugins/view/commontopmaxpicture/index.html index 8503c168e..5107db15f 100644 --- a/application/plugins/view/commontopmaxpicture/index.html +++ b/application/plugins/view/commontopmaxpicture/index.html @@ -63,7 +63,7 @@ {{/if}}
- 编辑 + 编辑 diff --git a/application/plugins/view/commontopmaxpicture/saveinfo.html b/application/plugins/view/commontopmaxpicture/saveinfo.html index 9214cc33e..4175e6241 100644 --- a/application/plugins/view/commontopmaxpicture/saveinfo.html +++ b/application/plugins/view/commontopmaxpicture/saveinfo.html @@ -4,11 +4,11 @@
- + 顶部大图 - 返回 + 返回
diff --git a/application/plugins/view/public/header.html b/application/plugins/view/public/header.html index bc15c5539..9a13e5269 100755 --- a/application/plugins/view/public/header.html +++ b/application/plugins/view/public/header.html @@ -17,6 +17,6 @@ {{/if}} \ No newline at end of file diff --git a/application/service/PluginsService.php b/application/service/PluginsService.php index dcbc35de7..020a0bfa4 100644 --- a/application/service/PluginsService.php +++ b/application/service/PluginsService.php @@ -67,9 +67,9 @@ class PluginsService $result[] = [ 'id' => $v['id'], 'plugins' => $v['plugins'], - 'logo_old' => $v['logo'], - 'logo' => ResourcesService::AttachmentPathViewHandle($v['logo']), 'is_enable' => $v['is_enable'], + 'logo_old' => $base['logo'], + 'logo' => ResourcesService::AttachmentPathViewHandle($base['logo']), 'name' => isset($base['name']) ? $base['name'] : '', 'author' => isset($base['author']) ? $base['author'] : '', 'author_url' => isset($base['author_url']) ? $base['author_url'] : '', @@ -261,14 +261,10 @@ class PluginsService */ private static function GetPluginsConfig($plugins) { - $plugins = '\app\plugins\\'.$plugins.'\\'.ucfirst($plugins); - if(class_exists($plugins)) + $config_file = APP_PATH.'plugins'.DS.$plugins.DS.'config.json'; + if(file_exists($config_file)) { - $obj = new $plugins(); - if(method_exists($obj, 'config')) - { - return $obj->config(); - } + return json_decode(file_get_contents($config_file), true); } return false; } diff --git a/application/tags.php b/application/tags.php index bac468623..62043137d 100755 --- a/application/tags.php +++ b/application/tags.php @@ -27,6 +27,6 @@ return [ 'app_end' => [], // 钩子测试 - 'plugins_common_top' => ['app\\plugins\\commontopmaxpicture\\Commontopmaxpicture'], + 'plugins_common_top' => ['app\\plugins\\commontopmaxpicture\\Index'], ]; ?> \ No newline at end of file diff --git a/config/shopxo.php b/config/shopxo.php index d37e4d1da..715cf1062 100644 --- a/config/shopxo.php +++ b/config/shopxo.php @@ -15,7 +15,7 @@ return [ // 开发模式 - 'is_develop' => false, + 'is_develop' => true, // 默认编码 'default_charset' => 'utf-8', diff --git a/public/static/admin/default/css/plugins.css b/public/static/admin/default/css/plugins.css index 2a3365f0d..853a19156 100644 --- a/public/static/admin/default/css/plugins.css +++ b/public/static/admin/default/css/plugins.css @@ -1,3 +1,6 @@ +/** + * 列表 + */ .content ul { padding: 0px; width: calc(100% + 10px); @@ -92,4 +95,11 @@ .content ul li .base p { line-height: 16px; } -} \ No newline at end of file +} + + +/** + * 安装 + */ +input[name="plugins"] { width: 105px !important; height: 32px; } +input.file-event { margin-top: 0 !important; } \ No newline at end of file diff --git a/public/static/plugins/css/commontopmaxpicture.css b/public/static/plugins/css/commontopmaxpicture/index.css similarity index 100% rename from public/static/plugins/css/commontopmaxpicture.css rename to public/static/plugins/css/commontopmaxpicture/index.css