Skip to content

Dev #30

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.

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
wants to merge 228 commits into
base: master
Choose a base branch
from
Open

Dev #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
228 commits
Select commit Hold shift + click to select a range
1de45a3
fix
zsping1989 Dec 4, 2020
3adfff0
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 4, 2020
a109f13
inif
zsping1989 Dec 4, 2020
5c5875e
init
zsping1989 Dec 5, 2020
8a593fc
fix
zsping1989 Dec 5, 2020
d654345
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 5, 2020
b495202
fix
zsping1989 Dec 5, 2020
7391d9a
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 5, 2020
bf85da1
fix
zsping1989 Dec 5, 2020
1f9de92
fix
zsping1989 Dec 5, 2020
b58c3ae
fix
zsping1989 Dec 5, 2020
af92ddd
fix
zsping1989 Dec 5, 2020
21c4674
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 5, 2020
28f0b7d
fix
zsping1989 Dec 5, 2020
2c793e4
fix 配色
zsping1989 Dec 5, 2020
993fb6e
fix json高亮
zsping1989 Dec 5, 2020
0b04437
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 6, 2020
e5a1100
fix
zsping1989 Dec 6, 2020
ae8452b
fix
zsping1989 Dec 6, 2020
83c46dc
fix
zsping1989 Dec 6, 2020
8683ae5
fix
zsping1989 Dec 6, 2020
b6f612b
fix
zsping1989 Dec 6, 2020
fd2ea23
fix
zsping1989 Dec 7, 2020
6dfc7bf
fix
zsping1989 Dec 7, 2020
e0f9b2a
fix
zsping1989 Dec 8, 2020
8ad9e99
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 8, 2020
fec6194
fix
zsping1989 Dec 14, 2020
895e6fc
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 14, 2020
e1cabcc
fix
zsping1989 Dec 24, 2020
0122100
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 24, 2020
f1be272
fix 样式调整
zsping1989 Dec 24, 2020
944d058
fix 搜索引擎优化
zsping1989 Dec 24, 2020
f6d40ca
fix
zsping1989 Dec 24, 2020
bc9986d
fix
zsping1989 Dec 25, 2020
21d966c
fix
zsping1989 Dec 25, 2020
66d72f7
fix goole搜索
zsping1989 Dec 25, 2020
fc09cc0
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 26, 2020
1976a49
fix
zsping1989 Dec 28, 2020
1ad5b44
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 28, 2020
b81ae19
fix
zsping1989 Dec 28, 2020
3b9b73a
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 29, 2020
fe894cf
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 29, 2020
83c058e
fix seo关键字
zsping1989 Dec 29, 2020
741324b
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 29, 2020
25dbaef
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 30, 2020
aa093e9
fix SEO优化
zsping1989 Dec 30, 2020
4852ffe
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 30, 2020
4599208
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 30, 2020
91c6565
fix 评论功能
zsping1989 Dec 30, 2020
4f3d851
fix 加入评论系统
zsping1989 Dec 31, 2020
a5e2b73
fix
zsping1989 Dec 31, 2020
d5b58cc
fix
zsping1989 Dec 31, 2020
49014b8
fix
zsping1989 Dec 31, 2020
4bb6333
fix
zsping1989 Dec 31, 2020
bd01a94
fix
zsping1989 Dec 31, 2020
eacf811
fix
zsping1989 Dec 31, 2020
15c52e3
fix
zsping1989 Dec 31, 2020
7263d62
fix
zsping1989 Dec 31, 2020
ba7d712
fix
zsping1989 Dec 31, 2020
de20814
fix
zsping1989 Dec 31, 2020
b88dba7
fix
zsping1989 Dec 31, 2020
32d8f32
fix
zsping1989 Dec 31, 2020
37714e0
fix
zsping1989 Dec 31, 2020
4ab1319
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 1, 2021
3833e97
fix 添加logo
zsping1989 Jan 4, 2021
25115e6
fix
zsping1989 Jan 4, 2021
d7ef5c1
fix
zsping1989 Jan 4, 2021
6ef2792
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 4, 2021
249f437
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 4, 2021
6b7c3af
fix logo错位问题
zsping1989 Jan 4, 2021
79a3896
fix logo位置调整
zsping1989 Jan 4, 2021
5e309dd
fix
zsping1989 Jan 4, 2021
0df6d1d
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 6, 2021
aad5d78
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 7, 2021
571b5a5
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 7, 2021
4f56dca
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 8, 2021
2bd38ff
fix
zsping1989 Jan 8, 2021
3cc4dee
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 8, 2021
36f6cbf
fix
zsping1989 Jan 9, 2021
2886577
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 9, 2021
abf2184
fix
zsping1989 Jan 9, 2021
11b9470
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 12, 2021
3a01852
fix 文档插件
zsping1989 Jan 12, 2021
c732282
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 12, 2021
ea62e7d
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 13, 2021
1973669
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 13, 2021
6793fe1
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 13, 2021
b3d491e
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 16, 2021
ddde61f
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 16, 2021
4d6464c
fix 文档修改
zsping1989 Jan 18, 2021
ddba984
fix 文档更新
zsping1989 Jan 18, 2021
8a5c129
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 18, 2021
426c0f5
fix
zsping1989 Jan 18, 2021
a542943
fix
zsping1989 Jan 18, 2021
d4988a7
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 18, 2021
5e5ca4f
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 20, 2021
3cddb6f
fix
zsping1989 Jan 20, 2021
29708d9
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Feb 3, 2021
fd18fe4
fix
zsping1989 Feb 3, 2021
4ec4606
fix
zsping1989 Feb 3, 2021
2d99050
fix
zsping1989 Feb 3, 2021
0280699
fix 修复定时任务不执行问题
zsping1989 Mar 10, 2021
0b6cb42
fix 导入后验证失败数据被转码问题修复
zsping1989 Mar 10, 2021
fb170f6
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Mar 10, 2021
0244a0a
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Mar 15, 2021
949e38a
fix
zsping1989 Mar 15, 2021
51670ad
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Mar 29, 2021
32a63e1
feature 特别鸣谢
zsping1989 Mar 29, 2021
bd8f459
fix
zsping1989 Mar 29, 2021
1b54def
fix
zsping1989 Mar 30, 2021
cc17751
fix
zsping1989 Mar 30, 2021
5ab129b
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Apr 1, 2021
d6d1e18
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Apr 3, 2021
b06794a
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Apr 7, 2021
103fbc6
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Apr 19, 2021
bade6ed
fix
zsping1989 Apr 19, 2021
e7c3427
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 2, 2021
84cc488
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 7, 2021
7133c30
fix
zsping1989 May 7, 2021
c4286e6
fix
zsping1989 May 7, 2021
0b3a0e9
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 7, 2021
85d3784
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 7, 2021
fb47d6b
fix 翻译
zsping1989 May 7, 2021
b0ff5e9
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 7, 2021
48c9786
fix
zsping1989 May 7, 2021
25ed814
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 7, 2021
801b51c
fix
zsping1989 May 8, 2021
c6a6208
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 8, 2021
685b945
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 8, 2021
f5ada33
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 10, 2021
7e13b85
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 17, 2021
34ee20d
fix
zsping1989 May 17, 2021
f442ab9
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 17, 2021
e51d1c4
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 20, 2021
a6ebd14
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 20, 2021
a2816ff
fix 多语言
zsping1989 May 20, 2021
53c2e01
fix 翻译
zsping1989 May 20, 2021
2e303b2
fix 挂载demo站点
zsping1989 May 20, 2021
c552060
fix 翻译问题
zsping1989 May 23, 2021
2dede28
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 23, 2021
079568b
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 24, 2021
26baf89
fix 翻译
zsping1989 May 24, 2021
056be92
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 24, 2021
35f6c2b
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 25, 2021
62c26e8
fix 消息通知样式优化
zsping1989 May 26, 2021
18cc9fc
fix 优化打包方式
zsping1989 May 27, 2021
ad8ddf0
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 27, 2021
8e7e20d
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 27, 2021
a72374f
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 27, 2021
d4680ec
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 27, 2021
3ee81dd
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 28, 2021
b69fdff
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 28, 2021
0122a7d
fix
zsping1989 Jun 1, 2021
00dbd3e
fix
zsping1989 Jun 1, 2021
6c0c41c
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jun 1, 2021
6b6a334
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jun 2, 2021
c0ec750
fix
zsping1989 Jun 2, 2021
c3a3995
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jun 3, 2021
0d4dced
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jun 4, 2021
fcb514c
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jun 4, 2021
fad8adb
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jun 4, 2021
0c41c19
fix 添加友情链接
zsping1989 Jun 8, 2021
62e1a79
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jun 16, 2021
b9db1db
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jun 26, 2021
2edf5e1
fix 小屏幕样式问题
zsping1989 Jun 26, 2021
afeaa87
fix 设置表备注
zsping1989 Jun 28, 2021
4d6f169
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jun 29, 2021
ee2dde6
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jun 30, 2021
224418e
fix
zsping1989 Jul 6, 2021
de50ae8
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jul 6, 2021
43e95a3
fix
zsping1989 Jul 6, 2021
cc9f110
fix
zsping1989 Jul 6, 2021
1a951a0
fix
zsping1989 Jul 7, 2021
815f64e
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jul 7, 2021
9015bea
fix
zsping1989 Jul 8, 2021
ca7abd7
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jul 8, 2021
8e3f59d
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jul 20, 2021
a41187a
fix
zsping1989 Jul 20, 2021
ad644a0
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jul 21, 2021
4ffd993
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Aug 9, 2021
8afa7ad
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Aug 9, 2021
8b79e68
fix 翻译
zsping1989 Aug 9, 2021
3bc349f
fix
zsping1989 Aug 9, 2021
d3abb1e
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Aug 9, 2021
93133b2
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Aug 9, 2021
8cce6e6
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Aug 9, 2021
35d6cf3
fix
zsping1989 Aug 18, 2021
0085aa7
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Sep 3, 2021
32aec06
fix 备案需要隐藏部分功能
zsping1989 Sep 3, 2021
96cdc6c
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Sep 3, 2021
485071b
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Sep 4, 2021
b47e24c
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Sep 8, 2021
4a7092f
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Sep 14, 2021
868658c
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Sep 17, 2021
62ab5de
fix
zsping1989 Sep 17, 2021
2368ddb
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Oct 5, 2021
1de1c21
fix
zsping1989 Oct 28, 2021
118f169
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Oct 29, 2021
1dbc65e
update database/seeders/MenuTableSeeder.php.
zsping1989 Nov 16, 2021
342e5f0
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Nov 18, 2021
bd557fe
Merge branch 'dev' of https://gitee.com/laravel-admin/laraveladmin in…
zsping1989 Nov 18, 2021
b3fa9e0
fix 页面主题修改
zsping1989 Nov 18, 2021
fbe425a
fix
zsping1989 Nov 19, 2021
e674d90
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Nov 19, 2021
a4f1a06
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Nov 23, 2021
b1b618f
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Nov 28, 2021
a662f33
fix
zsping1989 Nov 28, 2021
339eb43
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Nov 28, 2021
1c34729
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Nov 29, 2021
4035972
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 4, 2021
bfbac0d
fix
zsping1989 Dec 4, 2021
565d9fc
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Dec 4, 2021
b7f7e5b
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Jan 8, 2022
41e8cc8
fix
zsping1989 Jan 27, 2022
4083a00
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Mar 28, 2022
eb14d09
feature 捐赠推广费规则
zsping1989 Mar 28, 2022
51c0583
feature 捐赠会员收益统计
zsping1989 Mar 28, 2022
6b161b1
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 18, 2022
f2ca504
fix 前端静态文件引入方式修改
zsping1989 May 18, 2022
9b1061f
fix
zsping1989 May 18, 2022
1dff762
fix
zsping1989 May 18, 2022
3069374
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 May 25, 2022
c7adc01
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Aug 14, 2022
cd424c1
fix
zsping1989 Aug 14, 2022
d4a40fe
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Oct 13, 2022
3baaa1a
fix
zsping1989 Oct 13, 2022
3ac284d
Merge branch 'master' of https://gitee.com/laravel-admin/laraveladmin…
zsping1989 Nov 19, 2022
a2c5cfc
fix新增接口文档入口
zsping1989 Nov 19, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,6 @@
<img src="https://www.laraveladmin.cn/dist/img/logo1.png" width="200px" data-origin="httpw://www.laraveladmin.cn/dist/img/logo1.png" alt="Logo" style="width: 200px" />
</p>

<p align="center">
<a href="https://gitee.com/laravel-admin/laraveladmin" target="_blank" rel="noopener">
<img src="https://img.shields.io/packagist/l/encore/laravel-admin.svg?maxAge=2592000" data-origin="https://img.shields.io/packagist/l/encore/laravel-admin.svg?maxAge=2592000" alt="Packagist">
</a>
<a href="https://gitee.com/laravel-admin/laraveladmin" target="_blank" rel="noopener">
<img src="https://img.shields.io/packagist/dt/zsping1989/laravel-admin.svg?style=flat-square" data-origin="https://img.shields.io/packagist/dt/zsping1989/laravel-admin.svg?style=flat-square" alt="Total Downloads">
</a>
<a href="https://gitee.com/laravel-admin/laraveladmin" target="_blank" rel="noopener">
<img src="https://img.shields.io/badge/Awesome-laraveladmin-green" data-origin="https://img.shields.io/badge/Awesome-laraveladmin-green" alt="Awesome Laravel">
</a>
</p>

# LaravelAdmin

## 项目简介
Expand All @@ -26,6 +14,7 @@

**QQ群: `391528810`**
<a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=FbY7isqq9mvl0QYzKaSqubXWo75uwqnY&jump_from=webapi"><img border="0" src="//pub.idqqimg.com/wpa/images/group.png" alt="QQ群链接" title="QQ群链接"></a>

![QQ群](https://www.laraveladmin.cn/api/home/docs/images/QQ群.jpg)

### 功能特色
Expand Down
12 changes: 0 additions & 12 deletions README_self.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,6 @@
<img src="https://www.laraveladmin.cn/dist/img/logo1.png" data-origin="httpw://www.laraveladmin.cn/dist/img/logo1.png" alt="Logo" style="width: 200px" />
</p>

<p align="center">
<a href="https://gitee.com/laravel-admin/laraveladmin" target="_blank" rel="noopener">
<img src="https://img.shields.io/packagist/l/encore/laravel-admin.svg?maxAge=2592000" data-origin="https://img.shields.io/packagist/l/encore/laravel-admin.svg?maxAge=2592000" alt="Packagist">
</a>
<a href="https://gitee.com/laravel-admin/laraveladmin" target="_blank" rel="noopener">
<img src="https://img.shields.io/packagist/dt/zsping1989/laravel-admin.svg?style=flat-square" data-origin="https://img.shields.io/packagist/dt/zsping1989/laravel-admin.svg?style=flat-square" alt="Total Downloads">
</a>
<a href="https://gitee.com/laravel-admin/laraveladmin" target="_blank" rel="noopener">
<img src="https://img.shields.io/badge/Awesome-laraveladmin-green" data-origin="https://img.shields.io/badge/Awesome-laraveladmin-green" alt="Awesome Laravel">
</a>
</p>

# LaravelAdmin

#### 介绍
Expand Down
13 changes: 1 addition & 12 deletions README_windows.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
<p align="center">
<img src="https://www.laraveladmin.cn/dist/img/logo1.png" data-origin="httpw://www.laraveladmin.cn/dist/img/logo1.png" alt="Logo" style="width: 200px" />
</p>

<p align="center">
<a href="https://gitee.com/laravel-admin/laraveladmin" target="_blank" rel="noopener">
<img src="https://img.shields.io/packagist/l/encore/laravel-admin.svg?maxAge=2592000" data-origin="https://img.shields.io/packagist/l/encore/laravel-admin.svg?maxAge=2592000" alt="Packagist">
</a>
<a href="https://gitee.com/laravel-admin/laraveladmin" target="_blank" rel="noopener">
<img src="https://img.shields.io/packagist/dt/zsping1989/laravel-admin.svg?style=flat-square" data-origin="https://img.shields.io/packagist/dt/zsping1989/laravel-admin.svg?style=flat-square" alt="Total Downloads">
</a>
<a href="https://gitee.com/laravel-admin/laraveladmin" target="_blank" rel="noopener">
<img src="https://img.shields.io/badge/Awesome-laraveladmin-green" data-origin="https://img.shields.io/badge/Awesome-laraveladmin-green" alt="Awesome Laravel">
</a>
<img src="https://www.laraveladmin.cn/dist/img/logo1.png" data-origin="httpw://www.laraveladmin.cn/dist/img/logo1.png" alt="Logo" style="width: 200px" />
</p>

# LaravelAdmin
Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/BuildIndexHtml.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

namespace App\Console\Commands;

use App\Console\BaseCommand;
use App\Http\Controllers\Open\IndexController;
use App\Console\BaseCommand;
use Illuminate\Support\Str;

class BuildIndexHtml extends BaseCommand
Expand Down
68 changes: 68 additions & 0 deletions app/Http/Controllers/Admin/BillController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?php

namespace App\Http\Controllers\Admin;

use App\Http\Controllers\Traits\ResourceController;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Request;
use App\Models\Bill;
use Illuminate\Support\Facades\Response;

class BillController extends Controller
{
use ResourceController;

protected $sizer=[
'member_id'=>'=',
'donation_id'=>'=',
'status'=>'='
];

public $showIndexFields=[
'member'=>['user'=>[]],
'donation'=>[]
];
public $editFields=[
'donation'=>[
'member'=>[
'user'=>[]
]
],
'member'=>['user'=>[]],
];

public $mapsWhereFields=[
'donation_id'=>['id','amount']
];


/**
* 资源模型
* @var string
*/
protected $resourceModel = 'Bill';

/**
* 验证规则
* @return array
*/
protected function getValidateRule(){
$validate = [];
return $validate;
}

/**
* 编辑页面数据返回处理
* @param $id
* @param $data
* @return mixed
*/
protected function handleEditReturn($id,&$data){
$data['maps']['member_id'] = mapOption($data['row'],'member_id');
$data['maps']['donation_id'] = mapOption($data['row'],'donation_id');
return $data;
}



}
46 changes: 46 additions & 0 deletions app/Http/Controllers/Admin/DocController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?php

namespace App\Http\Controllers\Admin;

use App\Http\Controllers\Traits\ResourceController;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Request;
use App\Models\Doc;
use Illuminate\Support\Facades\Response;

class DocController extends Controller
{
use ResourceController;

protected $sizer=[
'name|description'=>'like'
];

/**
* Index页面字段名称显示
* @var array
*/
public $showIndexFields = [

];

/**
* 资源模型
* @var string
*/
protected $resourceModel = 'Doc';

/**
* 验证规则
* @return array
*/
protected function getValidateRule(){
return [
'name'=>'required',
'description'=>'required'
];
}



}
132 changes: 132 additions & 0 deletions app/Http/Controllers/Admin/DonationController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
<?php

namespace App\Http\Controllers\Admin;

use App\Http\Controllers\Traits\ResourceController;
use App\Http\Controllers\Controller;
use App\Models\Member;
use App\Models\User;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Request;
use App\Models\Donation;
use Illuminate\Support\Facades\Response;

class DonationController extends Controller
{
use ResourceController;

protected $sizer=[
'from'=>'=',
'sponsor.name'=>'like',
'member.user.name'=>'like',

];

public $editFields=[
'member'=>[
'id','user_id',
'user'=>[
'id',
'name',
'uname'
]
],
'sponsor'=>[
'id','name'
]

];

/**
* Index页面字段名称显示多条数据统计值
* @var array
*/
public $showIndexFieldsCount=[
'bills'
];

/**
* 其它筛选条件输出
* @var array
*/
protected $otherSizerOutput = [
'_key' => 'member.user.name' //默认使用的关键字
];

/**
* 关键字搜索组
* @var array
*/
protected $keywordsMap=[
'sponsor.name'=>'捐赠会员',
'member.user.name'=>'赞助商',
];

/**
* Index页面字段名称显示
* @var array
*/
public $showIndexFields=[
'member'=>['id','user_id','user'=>['id','name']],
'sponsor'=>['id','name']
];


/**
* 资源模型
* @var string
*/
protected $resourceModel = 'Donation';

/**
* 验证规则
* @return array
*/
protected function getValidateRule()
{
$validate = [
'member_id' => 'required|integer|exists:members,id',
'sponsor_id' => 'required|integer|exists:sponsors,id',
'amount' => 'sometimes|required|min:0.02'
];
return $validate;
}

/**
* 编辑页面数据返回处理
* @param $id
* @param $data
* @return mixed
*/
protected function handleEditReturn($id, &$data)
{
return $data;
}

/**
* 执行修改前查询到数据结果后对数据进行处理
* @param $data
* @param $item
* @return mixed
*/
protected function handlePostEditFindReturn(&$data,$item){
$member = Member::query()->find($data['member_id']);
$amount = $data['amount'];
$data['name'] = Arr::get($member,'user.name','')."捐赠: {$amount} 元";
return $data;
}

/**
* 保存数据后对返回数据处理
* @param $item
* @param $data
*/
protected function handlePostEdit($item, $data,$old_data=[])
{
if(!$old_data){ //新增数据
$item->createBills();
}
}


}
48 changes: 48 additions & 0 deletions app/Http/Controllers/Admin/FeatureController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?php

namespace App\Http\Controllers\Admin;

use App\Http\Controllers\Traits\ResourceController;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Request;
use App\Models\Feature;
use Illuminate\Support\Facades\Response;

class FeatureController extends Controller
{
use ResourceController;
protected $sizer=[
'name'=>'like'
];

/**
* 资源模型
* @var string
*/
protected $resourceModel = 'Feature';

/**
* 验证规则
* @return array
*/
protected function getValidateRule(){
return [
'name'=>'required|min:2|max:8',
'color'=>'required',
'description'=>'required|min:20|max:100',
'icon'=>'nullable|alpha_dash'
];
}

/**
* 编辑页面数据返回处理
* @param $id
* @param $data
* @return mixed
*/
protected function handleEditReturn($id,&$data){
return $data;
}


}
Loading