Skip to content

Commit a0131a7

Browse files
author
liweisen
committed
添加静态资源文件
1 parent 4ebb688 commit a0131a7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1271
-6
lines changed

‎application/common/Model/MemberAccount.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ class MemberAccount extends CommonModel
2222
* @throws ModelNotFoundException
2323
* @throws DbException
2424
*/
25-
public static function getAuthMenuList()
25+
public static function getAuthMenuList($isTree = true)
2626
{
2727
NodeService::applyProjectAuthNode();
2828
$menuModel = new ProjectMenu();
29-
$list = $menuModel->listForUser();
29+
$list = $menuModel->listForUser($isTree);
3030
return $list;
3131
}
3232

‎application/common/Model/ProjectMenu.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function treeList()
7070
* @throws \think\db\exception\ModelNotFoundException
7171
* @throws \think\exception\DbException
7272
*/
73-
public function listForUser()
73+
public function listForUser($isTree = true)
7474
{
7575
NodeService::applyProjectAuthNode();
7676
$list = $this->where(['status' => '1'])->order('sort asc,id asc')->select();
@@ -85,8 +85,9 @@ public function listForUser()
8585
$member = getCurrentMember();
8686
$menus = $member['is_owner'] ? $list : $this->filterMenu($list, $member['nodes']);
8787
$new = [];
88-
$this->buildFilterMenuData(ToolsService::arr2tree($menus), $new);
89-
$menus = ToolsService::arr2tree($new);
88+
$isTree && $menus = ToolsService::arr2tree($menus);
89+
$this->buildFilterMenuData($menus, $new);
90+
$isTree && $menus = ToolsService::arr2tree($new);
9091
return $menus;
9192
}
9293

‎application/project/controller/Index.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@ public function index()
4242
$this->success('', $list);
4343
}
4444

45+
public function _menus()
46+
{
47+
$menusFormat = MemberAccount::getAuthMenuList();
48+
$menus = MemberAccount::getAuthMenuList(false);
49+
$this->success('', ['menus' => $menus, 'menusFormat' => $menusFormat]);
50+
}
51+
4552
/**
4653
* 更换当前组织
4754
* @throws DataNotFoundException

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html><head><meta charset=utf-8><link id=icon rel=icon type=image/x-icon href=https://static.vilson.online/pearProject/favicon.ico><title>Pear Project</title><link href=https://static.vilson.online/pearProject/static/css/chunk-010e6240.8f164f9a.css rel=prefetch><link href=https://static.vilson.online/pearProject/static/css/chunk-3df780ba.9186476f.css rel=prefetch><link href=https://static.vilson.online/pearProject/static/css/chunk-47d42318.c661772a.css rel=prefetch><link href=https://static.vilson.online/pearProject/static/css/chunk-5af90eac.c661772a.css rel=prefetch><link href=https://static.vilson.online/pearProject/static/css/chunk-5bd3e142.9ab40095.css rel=prefetch><link href=https://static.vilson.online/pearProject/static/css/chunk-758da350.242435fb.css rel=prefetch><link href=https://static.vilson.online/pearProject/static/css/chunk-77182037.242435fb.css rel=prefetch><link href=https://static.vilson.online/pearProject/static/css/chunk-9db6d922.6e9b3b28.css rel=prefetch><link href=https://static.vilson.online/pearProject/static/css/chunk-b2404562.c661772a.css rel=prefetch><link href=https://static.vilson.online/pearProject/static/css/chunk-f00276f6.a525068a.css rel=prefetch><link href=https://static.vilson.online/pearProject/static/css/chunk-f731460a.a95968b7.css rel=prefetch><link href=https://static.vilson.online/pearProject/static/css/user.9ac27071.css rel=prefetch><link href=https://static.vilson.online/pearProject/static/js/chunk-010e6240.bca9faa0.js rel=prefetch><link href=https://static.vilson.online/pearProject/static/js/chunk-3df780ba.e4028055.js rel=prefetch><link href=https://static.vilson.online/pearProject/static/js/chunk-47d42318.63a5c25a.js rel=prefetch><link href=https://static.vilson.online/pearProject/static/js/chunk-5af90eac.965f01e1.js rel=prefetch><link href=https://static.vilson.online/pearProject/static/js/chunk-5bd3e142.1f14b8b1.js rel=prefetch><link href=https://static.vilson.online/pearProject/static/js/chunk-758da350.ed8b10a5.js rel=prefetch><link href=https://static.vilson.online/pearProject/static/js/chunk-77182037.8413d837.js rel=prefetch><link href=https://static.vilson.online/pearProject/static/js/chunk-9db6d922.d7c71174.js rel=prefetch><link href=https://static.vilson.online/pearProject/static/js/chunk-b2404562.644a18cf.js rel=prefetch><link href=https://static.vilson.online/pearProject/static/js/chunk-f00276f6.a787e5c8.js rel=prefetch><link href=https://static.vilson.online/pearProject/static/js/chunk-f731460a.953216f9.js rel=prefetch><link href=https://static.vilson.online/pearProject/static/js/user.053ae34b.js rel=prefetch><link href=https://static.vilson.online/pearProject/static/css/app.ee3fecf0.css rel=preload as=style><link href=https://static.vilson.online/pearProject/static/css/chunk-vendors.9bcbdad7.css rel=preload as=style><link href=https://static.vilson.online/pearProject/static/js/app.983db9a1.js rel=preload as=script><link href=https://static.vilson.online/pearProject/static/js/chunk-vendors.e115f959.js rel=preload as=script><link href=https://static.vilson.online/pearProject/static/css/chunk-vendors.9bcbdad7.css rel=stylesheet><link href=https://static.vilson.online/pearProject/static/css/app.ee3fecf0.css rel=stylesheet></head><body><div id=app></div><script src=https://static.vilson.online/pearProject/static/js/chunk-vendors.e115f959.js></script><script src=https://static.vilson.online/pearProject/static/js/app.983db9a1.js></script></body></html>
1+
<!DOCTYPE html><html><head><meta charset=utf-8><link id=icon rel=icon type=image/x-icon href=static/dist/favicon.ico><title>Pear Project</title><link href=static/dist/css/chunk-0d42a50c.9186476f.css rel=prefetch><link href=static/dist/css/chunk-1015abd2.675c9411.css rel=prefetch><link href=static/dist/css/chunk-198e20c4.c661772a.css rel=prefetch><link href=static/dist/css/chunk-1edc8af9.c661772a.css rel=prefetch><link href=static/dist/css/chunk-22f8bc8e.ea56cb2d.css rel=prefetch><link href=static/dist/css/chunk-2c9b02f2.9c6560f1.css rel=prefetch><link href=static/dist/css/chunk-44e16e3a.90919cc8.css rel=prefetch><link href=static/dist/css/chunk-65efb36c.bae004f3.css rel=prefetch><link href=static/dist/css/chunk-8d78036c.8f164f9a.css rel=prefetch><link href=static/dist/css/chunk-97de7ce6.bae004f3.css rel=prefetch><link href=static/dist/css/chunk-d7a59532.c661772a.css rel=prefetch><link href=static/dist/css/user.020d47d3.css rel=prefetch><link href=static/dist/js/chunk-0d42a50c.17dd8edd.js rel=prefetch><link href=static/dist/js/chunk-1015abd2.2c5cfac4.js rel=prefetch><link href=static/dist/js/chunk-198e20c4.895d5ba4.js rel=prefetch><link href=static/dist/js/chunk-1edc8af9.7d5f1d5d.js rel=prefetch><link href=static/dist/js/chunk-22f8bc8e.b62f6ded.js rel=prefetch><link href=static/dist/js/chunk-2c9b02f2.61936913.js rel=prefetch><link href=static/dist/js/chunk-44e16e3a.2325e050.js rel=prefetch><link href=static/dist/js/chunk-65efb36c.971a88d0.js rel=prefetch><link href=static/dist/js/chunk-8d78036c.580b1dae.js rel=prefetch><link href=static/dist/js/chunk-97de7ce6.f303fba8.js rel=prefetch><link href=static/dist/js/chunk-d7a59532.ba2774a2.js rel=prefetch><link href=static/dist/js/user.1e5d343f.js rel=prefetch><link href=static/dist/css/app.41e5d825.css rel=preload as=style><link href=static/dist/css/chunk-vendors.a365ef0b.css rel=preload as=style><link href=static/dist/js/app.88c3a762.js rel=preload as=script><link href=static/dist/js/chunk-vendors.de9a05a4.js rel=preload as=script><link href=static/dist/css/chunk-vendors.a365ef0b.css rel=stylesheet><link href=static/dist/css/app.41e5d825.css rel=stylesheet></head><body><div id=app></div><script src=static/dist/js/chunk-vendors.de9a05a4.js></script><script src=static/dist/js/app.88c3a762.js></script></body></html>

‎static/dist/css/app.41e5d825.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/dist/css/chunk-0d42a50c.9186476f.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/dist/css/chunk-1015abd2.675c9411.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/dist/css/chunk-198e20c4.c661772a.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎static/dist/css/chunk-1edc8af9.c661772a.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)