diff --git a/application/admin/controller/Common.php b/application/admin/controller/Common.php index 06217020089a2bdfe24197b31b32b616d69f615a..1bcf568b367a3326714ea030f656036b4e85b362 100755 --- a/application/admin/controller/Common.php +++ b/application/admin/controller/Common.php @@ -29,9 +29,6 @@ class Common extends Controller // 管理员 protected $admin; - // 权限 - protected $power; - // 左边权限菜单 protected $left_menu; @@ -80,10 +77,7 @@ class Common extends Controller // 权限菜单 AdminPowerService::PowerMenuInit(); - - // 权限 - $this->left_menu = isset($this->admin['id']) ? cache(config('cache_admin_left_menu_key').$this->admin['id']) : []; - $this->power = isset($this->admin['id']) ? cache(config('cache_admin_power_key').$this->admin['id']) : []; + $this->left_menu = AdminPowerService::MenuData(); // 视图初始化 $this->ViewInit(); diff --git a/application/admin/controller/Power.php b/application/admin/controller/Power.php index fa047b0f12513b9b2ff34ab19c70f818ffaa2eaf..20bd5a43ac1686db8dc98d7f3be1f5af432d307e 100755 --- a/application/admin/controller/Power.php +++ b/application/admin/controller/Power.php @@ -50,7 +50,7 @@ class Power extends Common public function Index() { $data_params = [ - 'field' => 'id,pid,name,control,action,sort,is_show,icon', + 'field' => 'id,pid,name,control,action,url,sort,is_show,icon', 'order_by' => 'sort asc', 'where' => ['pid'=>0], ]; diff --git a/application/admin/form/Payrequestlog.php b/application/admin/form/Payrequestlog.php index d03095d9754c10d4dd0c6455ef02deba5a79fa91..6fd496d4a72869604028ebccc64abaead9581094 100644 --- a/application/admin/form/Payrequestlog.php +++ b/application/admin/form/Payrequestlog.php @@ -101,6 +101,7 @@ class PayRequestLog 'label' => '请求url地址', 'view_type' => 'field', 'view_key' => 'request_url', + 'grid_size' => 'sm', 'search_config' => [ 'form_type' => 'input', 'form_name' => 'business_handle', diff --git a/application/admin/view/default/index/init.html b/application/admin/view/default/index/init.html index d0658b69180fbcfb1343d158954473a0ae36159e..fbc6959f9c67559794c63c7bcb805f3efa105f26 100755 --- a/application/admin/view/default/index/init.html +++ b/application/admin/view/default/index/init.html @@ -14,11 +14,19 @@
用户总量
0
-订单总量
0
-成交总量
0
-收入总计
0.00
-