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 @@