Skip to content

所有样式变成pear-admin #880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zeyudada wants to merge 5 commits into
base: master
Choose a base branch
from
Open

所有样式变成pear-admin #880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ade813e
所有样式变成pear-admin
zeyudada Apr 19, 2022
20593b3
去除无用tinymce和旧版layui，修复jq依赖加载不完全
zeyudada Apr 20, 2022
9a07804
继续删没有用的
zeyudada Apr 20, 2022
99b622a
压缩代码，修复原版错误语法
zeyudada Apr 20, 2022
4c101e9
Merge branch 'magicblack:master' into master
zeyudada May 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
21 changes: 21 additions & 0 deletions 403.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>403 - 访问被拒绝</title>
<link href="/static/component/pear/css/pear.css" rel="stylesheet" />
<link href="/static/css/other/error.css" rel="stylesheet" />
</head>
<body>
<div class="content">
<img src="/static/images/403.svg" alt="">
<div class="content-r">
<h1>403</h1>
<p>抱歉，你无权访问该页面</p>
<button class="pear-btn pear-btn-primary">返回首页</button>
</div>
</div>
<script src="/static/component/layui/layui.js"></script>
<script src="/static/component/pear/pear.js"></script>
</body>
</html>
21 changes: 21 additions & 0 deletions 404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>404 - 页面不存在</title>
<link href="/static/component/pear/css/pear.css" rel="stylesheet" />
<link href="/static/css/other/error.css" rel="stylesheet" />
</head>
<body>
<div class="content">
<img src="/static/images/404.svg" alt="">
<div class="content-r">
<h1>404</h1>
<p>抱歉，你访问的页面不存在或仍在开发中</p>
<button class="pear-btn pear-btn-primary">返回首页</button>
</div>
</div>
<script src="/static/component/layui/layui.js"></script>
<script src="/static/component/pear/pear.js"></script>
</body>
</html>
21 changes: 21 additions & 0 deletions 500.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>500 - 服务器错误</title>
<link href="/static/component/pear/css/pear.css" rel="stylesheet" />
<link href="/static/css/other/error.css" rel="stylesheet" />
</head>
<body>
<div class="content">
<img src="/static/images/500.svg" alt="">
<div class="content-r">
<h1>500</h1>
<p>抱歉，服务器出错了</p>
<button class="pear-btn pear-btn-primary">返回首页</button>
</div>
</div>
<script src="/static/component/layui/layui.js"></script>
<script src="/static/component/pear/pear.js"></script>
</body>
</html>
456 changes: 228 additions & 228 deletions application/admin/common/auth.php
View file
Open in desktop

Large diffs are not rendered by default.

199 changes: 100 additions & 99 deletions application/admin/controller/Index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

namespace app\admin\controller;

use think\Hook;

class Index extends Base
Expand All @@ -11,7 +13,7 @@ public function __construct()

public function login()
{
if(Request()->isPost()) {
if (Request()->isPost()) {
$data = input('post.');
$res = model('Admin')->login($data);
if ($res['code'] > 1) {
Expand All @@ -30,113 +32,116 @@ public function logout()
}

public function index()
{
$this->assign('title', lang('admin/index/title'));


return $this->fetch('admin@index/index');
}

public function pearconfig(){
$config = [ "logo" => [ "title" => lang('admin/index/index/name'), "image" => "/static/images/logo.png" ], "menu" => [ "data" => "../../admin/index/memu", "method" => "GET", "accordion" => true, "collaspe" => false, "control" => true, "controlWidth" => 500, "select" => "11", "async" => true ], "tab" => [ "enable" => true, "keepState" => true, "session" => false, "max" => "30", "index" => [ "id" => "11", "href" => "../../admin/index/welcome.html", "title" => "首页" ] ], "theme" => [ "defaultColor" => "2", "defaultMenu" => "dark-theme", "defaultHeader" => "light-theme", "allowCustom" => true, "banner" => true ], "colors" => [[ "id" => "1", "color" => "#2d8cf0", "second" => "#ecf5ff" ], [ "id" => "2", "color" => "#36b368", "second" => "#f0f9eb" ], [ "id" => "3", "color" => "#f6ad55", "second" => "#fdf6ec" ], [ "id" => "4", "color" => "#f56c6c", "second" => "#fef0f0" ], [ "id" => "5", "color" => "#3963bc", "second" => "#ecf5ff" ] ], "other" => [ "keepLoad" => "1200", "autoHead" => true ], "header" => [ "message" => false ] ];
return json($config);
}

public function memu()
{
$menus = @include MAC_ADMIN_COMM . 'auth.php';

foreach($menus as $k1=>$v1){
foreach($v1['sub'] as $k2=>$v2){
if($v2['show'] == 1) {
if(strpos($v2['action'],'javascript')!==false){
$url = $v2['action'];
}
else {
$url = url('admin/' . $v2['controller'] . '/' . $v2['action']);
}
if (!empty($v2['param'])) {
$url .= '?' . $v2['param'];
}
if ($this->check_auth($v2['controller'], $v2['action'])) {
$menus[$k1]['sub'][$k2]['url'] = $url;
} else {
unset($menus[$k1]['sub'][$k2]);
}
}
else{
unset($menus[$k1]['sub'][$k2]);
foreach ($menus as $k1 => $v1) {
$menus[$k1]['id'] = $k1;
$menus[$k1]['type'] = 0;
foreach ($v1['children'] as $k2 => $v2) {
$menus[$k1]['children'][$k2]['id'] = $k2;
$menus[$k1]['children'][$k2]['type'] = 1;
if ($v2['show'] == 1) {
if (strpos($v2['action'], 'javascript') !== false) $url = $v2['action'];
else $url = url('admin/' . $v2['controller'] . '/' . $v2['action']);
if (!empty($v2['param'])) $url .= '?' . $v2['param'];
if ($this->check_auth($v2['controller'], $v2['action'])) $menus[$k1]['children'][$k2]['href'] = $url;
else unset($menus[$k1]['children'][$k2]);
} else {
unset($menus[$k1]['children'][$k2]);
}
}

if(empty($menus[$k1]['sub'])){
unset($menus[$k1]);
}
if (empty($menus[$k1]['children'])) unset($menus[$k1]);
}

$quickmenu = config('quickmenu');
if(empty($quickmenu)){
$quickmenu = mac_read_file( APP_PATH.'data/config/quickmenu.txt');
$quickmenu = explode(chr(13),$quickmenu);
}
if(!empty($quickmenu)){
$menus[1]['sub'][13] = ['name'=>lang('admin/index/quick_tit'), 'url'=>'javascript:void(0);return false;','controller'=>'', 'action'=>'' ];

foreach($quickmenu as $k=>$v){
if(empty($v)){
continue;
}
$one = explode(',',trim($v));
if(substr($one[1],0,4)=='http' || substr($one[1],0,2)=='//'){

}
elseif(substr($one[1],0,1) =='/'){

}
elseif(strpos($one[1],'###')!==false || strpos($one[1],'javascript:')!==false){

}
else{
if (empty($quickmenu)) {
$quickmenu = mac_read_file(APP_PATH . 'data/config/quickmenu.txt');
$quickmenu = explode(chr(13), $quickmenu);
}
if (!empty($quickmenu)) {
$menus[1]['children'][] = ['id' => 13, 'type' => 1, 'title' => lang('admin/index/quick_tit'), 'href' => 'javascript:void(0);return false;'];

foreach ($quickmenu as $k => $v) {
if (empty($v)) continue;

$one = explode(',', trim($v));
if (substr($one[1], 0, 4) == 'http' || substr($one[1], 0, 2) == '//') {
} elseif (substr($one[1], 0, 1) == '/'|| strpos($one[1], 'javascript:') !== false) {
} elseif (strpos($one[1], '###') !== false ) {
$one[0] = '====不支持分隔符====';
$one[1] = 'javascript:void(0);return false;';
} else {
$one[1] = url($one[1]);
}
$menus[1]['sub'][14 + $k] = ['name'=>$one[0], 'url'=>$one[1],'controller'=>'', 'action'=>'' ];
$menus[1]['children'][] = ['id' => 14 + $k,'type' => 1, 'title' => $one[0], 'href' => $one[1]];
}
}
$this->assign('menus',$menus);
//$this->assign('menus',$menus);

$this->assign('title',lang('admin/index/title'));
return $this->fetch('admin@index/index');
foreach ($menus as $kkp => $pear) {
unset($menus[$kkp]['children']);
$menus[$kkp]['children'] = array_values($pear['children']);
}

header("Content-Type:application/json; charset=utf-8");
return json(array_values($menus));
}

public function welcome()
{
$version = config('version');
$update_sql = file_exists('./application/data/update/database.php');

$this->assign('version',$version);
$this->assign('update_sql',$update_sql);
$this->assign('mac_lang',config('default_lang'));
$this->assign('version', $version);
$this->assign('update_sql', $update_sql);
$this->assign('mac_lang', config('default_lang'));

$this->assign('admin',$this->_admin);
$this->assign('title',lang('admin/index/welcome/title'));
$this->assign('admin', $this->_admin);
$this->assign('title', lang('admin/index/welcome/title'));
return $this->fetch('admin@index/welcome');
}

public function quickmenu()
{
if(Request()->isPost()){
if (Request()->isPost()) {
$param = input();
$validate = \think\Loader::validate('Token');
if(!$validate->check($param)){
if (!$validate->check($param)) {
return $this->error($validate->getError());
}
$quickmenu = input('post.quickmenu');
$quickmenu = str_replace(chr(10),'',$quickmenu);
$menu_arr = explode(chr(13),$quickmenu);
$quickmenu = str_replace(chr(10), '', $quickmenu);
$menu_arr = explode(chr(13), $quickmenu);
$res = mac_arr2file(APP_PATH . 'extra/quickmenu.php', $menu_arr);
if ($res === false) {
return $this->error(lang('save_err'));
}
return $this->success(lang('save_ok'));
}
else{
} else {
$config_menu = config('quickmenu');
if(empty($config_menu)){
$quickmenu = mac_read_file(APP_PATH.'data/config/quickmenu.txt');
}
else{
if (empty($config_menu)) {
$quickmenu = mac_read_file(APP_PATH . 'data/config/quickmenu.txt');
} else {
$quickmenu = array_values($config_menu);
$quickmenu = join(chr(13),$quickmenu);
$quickmenu = join(chr(13), $quickmenu);
}
$this->assign('quickmenu',$quickmenu);
$this->assign('title',lang('admin/index/quickmenu/title'));
$this->assign('quickmenu', $quickmenu);
$this->assign('title', lang('admin/index/quickmenu/title'));
return $this->fetch('admin@index/quickmenu');
}
}
Expand All @@ -145,7 +150,7 @@ public function checkcache()
{
$res = 'no';
$r = cache('cache_data');
if($r=='1'){
if ($r == '1') {
$res = 'haved';
}
echo $res;
Expand All @@ -155,7 +160,7 @@ public function clear()
{
$res = $this->_cache_clear();
//运行缓存
if(!$res) {
if (!$res) {
$this->error(lang('admin/index/clear_err'));
}
return $this->success(lang('admin/index/clear_ok'));
Expand All @@ -180,7 +185,7 @@ public function unlocked()
$param = input();
$password = $param['password'];

if($this->_admin['admin_pwd'] != md5($password)){
if ($this->_admin['admin_pwd'] != md5($password)) {
return $this->error(lang('admin/index/pass_err'));
}

Expand All @@ -206,47 +211,43 @@ public function select()

$refresh = $param['refresh'];

if(empty($tpl) || empty($tab) || empty($col) || empty($ids) || empty($url)){
if (empty($tpl) || empty($tab) || empty($col) || empty($ids) || empty($url)) {
return $this->error(lang('param_err'));
}

if(is_array($ids)){
$ids = join(',',$ids);
if (is_array($ids)) {
$ids = join(',', $ids);
}

if(empty($refresh)){
if (empty($refresh)) {
$refresh = 'yes';
}

$url = url($url);
$mid = 1;
if($tab=='art'){
if ($tab == 'art') {
$mid = 2;
} elseif ($tab == 'actor') {
$mid = 8;
} elseif ($tab == 'website') {
$mid = 11;
}
elseif($tab=='actor'){
$mid=8;
}
elseif($tab=='website'){
$mid=11;
}
$this->assign('mid',$mid);
$this->assign('mid', $mid);

if($tpl=='select_type'){
if ($tpl == 'select_type') {
$type_tree = model('Type')->getCache('type_tree');
$this->assign('type_tree',$type_tree);
}
elseif($tpl =='select_level'){
$level_list = [1,2,3,4,5,6,7,8,9];
$this->assign('level_list',$level_list);
}

$this->assign('refresh',$refresh);
$this->assign('url',$url);
$this->assign('tab',$tab);
$this->assign('col',$col);
$this->assign('ids',$ids);
$this->assign('val',$val);
return $this->fetch( 'admin@public/'.$tpl);
$this->assign('type_tree', $type_tree);
} elseif ($tpl == 'select_level') {
$level_list = [1, 2, 3, 4, 5, 6, 7, 8, 9];
$this->assign('level_list', $level_list);
}

$this->assign('refresh', $refresh);
$this->assign('url', $url);
$this->assign('tab', $tab);
$this->assign('col', $col);
$this->assign('ids', $ids);
$this->assign('val', $val);
return $this->fetch('admin@public/' . $tpl);
}

}
1 change: 1 addition & 0 deletions application/admin/controller/Urlsend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ public function push($pp=[])
$this->_param = $pp;
}
$ac = $this->_param['ac'];

$cp = 'app\\common\\extend\\urlsend\\' . ucfirst($ac);
if (class_exists($cp)) {
$data = $this->data();
Expand Down
Loading