Skip to content

Commit abb6369

Browse files
feat: remove icons
1 parent a04bd9a commit abb6369

File tree

188 files changed

+1106
-244
lines changed

Some content is hidden

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

188 files changed

+1106
-244
lines changed

module/AdminManager/Asset/entry/upgrade.js

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

module/AdminManager/resources/asset/src/pages/Upgrade.vue

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,15 @@
100100
<pre class="tw-p-4 tw-leading-loose">{{upgradeLogs.join("\n")}}</pre>
101101
</div>
102102
</div>
103-
<el-dialog :visible.sync="memberUserShow" append-to-body>
103+
<el-dialog :visible.sync="memberUserShow" append-to-body custom-class="pb-member-info-dialog">
104104
<div slot="title">
105-
<i class="iconfont icon-user"></i>
106-
账号信息
105+
<a href="https://modstart.com" target="_blank">
106+
<img class="tw-h-8" :src="$url.cdn('vendor/AdminManager/image/logo_modstart.png')"/>
107+
</a>
107108
</div>
108109
<div v-if="!memberUser.id">
109-
<div style="max-width:300px;margin:0 auto 2rem auto;">
110-
<div class="tw-text-center">
111-
<a href="https://modstart.com" target="_blank">
112-
<img class="tw-h-20" :src="$url.cdn('vendor/AdminManager/image/logo_modstart.png')"/>
113-
</a>
114-
</div>
115-
<div class="tw-font-bold tw-py-2 tw-text-center tw-text-lg">
110+
<div style="padding:0 1.5rem;">
111+
<div class="tw-py-2 tw-text-center tw-text-lg">
116112
请登录账号
117113
</div>
118114
<div class="ub-form vertical">
@@ -471,3 +467,9 @@ export default {
471467
}
472468
</script>
473469

470+
<style lang="less">
471+
.pb-member-info-dialog{
472+
max-width:18rem;
473+
}
474+
</style>
475+

module/Blog/Admin/Controller/BlogCategoryController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ protected function crud(AdminCRUDBuilder $builder)
2525

2626
$builder->id('id', 'ID');
2727
$builder->text('title', '名称');
28+
$builder->image('cover', '封面')->help('默认模板不显示,可安装更多模板查看效果');
2829
$builder->text('keywords', '关键词');
2930
$builder->textarea('description', '描述');
3031
$builder->select('templateView', '列表模板')->optionType(BlogCategoryTemplateView::class);

module/Blog/Core/MBlog.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ public static function latestBlog($limit)
2222
return $paginateData['records'];
2323
}
2424

25+
26+
27+
public static function hottestBlog($limit)
28+
{
29+
$paginateData = self::paginateBlog(0, 1, $limit, [
30+
'order' => ['clickCount', 'desc'],
31+
]);
32+
return $paginateData['records'];
33+
}
34+
2535

2636
public static function paginateBlog($categoryId, $page = 1, $pageSize = 10, $option = [])
2737
{

module/Blog/Docs/release.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
- 新增:博客标签独立页面
44
- 新增:可根据博客分类选择列表模板
5+
- 新增:博客分类增加封面字段,可用于模板开发优化显示
6+
- 新增:最热博客获取方法
57
- 优化:博客列表手机和电脑显示样式优化
68
- 优化:博客后台管理菜单顺序
79

module/Blog/Model/Blog.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
3+
4+
namespace Module\Blog\Model;
5+
6+
7+
use Illuminate\Database\Eloquent\Model;
8+
9+
class Blog extends Model
10+
{
11+
protected $table = 'blog';
12+
}

module/Blog/Model/BlogCategory.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?php
2+
3+
4+
namespace Module\Blog\Model;
5+
6+
7+
use Illuminate\Database\Eloquent\Model;
8+
9+
class BlogCategory extends Model
10+
{
11+
protected $table = 'blog_category';
12+
}

module/ModuleStore/Asset/entry/moduleStore.js

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

module/ModuleStore/resources/asset/src/pages/ModuleStore.vue

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -246,19 +246,15 @@
246246
</div>
247247
</div>
248248
</div>
249-
<el-dialog :visible.sync="memberUserShow" append-to-body>
249+
<el-dialog :visible.sync="memberUserShow" append-to-body custom-class="pb-member-info-dialog">
250250
<div slot="title">
251-
<i class="iconfont icon-user"></i>
252-
账号信息
251+
<a href="https://modstart.com" target="_blank">
252+
<img class="tw-h-8" :src="$url.cdn('vendor/ModuleStore/image/logo_modstart.png')"/>
253+
</a>
253254
</div>
254255
<div v-if="!memberUser.id">
255-
<div style="max-width:300px;margin:0 auto 2rem auto;">
256-
<div class="tw-text-center">
257-
<a href="https://modstart.com" target="_blank">
258-
<img class="tw-h-20" :src="$url.cdn('vendor/ModuleStore/image/logo_modstart.png')"/>
259-
</a>
260-
</div>
261-
<div class="tw-font-bold tw-py-2 tw-text-center tw-text-lg">
256+
<div style="padding:0 1.5rem;">
257+
<div class="tw-py-2 tw-text-center tw-text-lg">
262258
请登录账号
263259
</div>
264260
<div class="ub-form vertical">
@@ -822,3 +818,8 @@ export default {
822818
}
823819
</script>
824820

821+
<style lang="less">
822+
.pb-member-info-dialog{
823+
max-width:18rem;
824+
}
825+
</style>

module/Vendor/Asset/entry-chunk-0-5b953419.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)