diff --git a/app/Http/Controllers/Admin/ArticleController.php b/app/Http/Controllers/Admin/ArticleController.php index 69f542e8..2b02683c 100644 --- a/app/Http/Controllers/Admin/ArticleController.php +++ b/app/Http/Controllers/Admin/ArticleController.php @@ -32,8 +32,6 @@ class ArticleController extends Controller } } - $data['content'] = json_encode($data['content']); - if ($article = Article::create($data)) { return redirect(route('admin.article.edit', $article))->with('successMsg', '添加成功'); } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index b5234fe6..b79bec17 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -70,7 +70,7 @@ class UserController extends Controller 'expireTime' => $user->expiration_date, 'banedTime' => $user->ban_time, 'unusedPercent' => $totalTransfer > 0 ? round($unusedTraffic / $totalTransfer, 2) * 100 : 0, - 'announcements' => Article::type(2)->latest()->simplePaginate(1), // 公告 + 'announcements' => Article::type(2)->lang()->latest()->simplePaginate(1), // 公告 'isTrafficWarning' => $user->isTrafficWarning(), // 流量异常判断 'paying_user' => $userService->isActivePaying(), // 付费用户判断 'userLoginLog' => $user->loginLogs()->latest()->first(), // 近期登录日志 @@ -461,7 +461,7 @@ class UserController extends Controller 'subType' => $data, 'subUrl' => route('sub', $subscribe->code), 'subStatus' => $subscribe->status, - 'knowledges' => Article::type(1)->lang()->latest()->orderByDesc('sort')->get()->groupBy('category'), + 'knowledges' => Article::type(1)->lang()->orderByDesc('sort')->latest()->get()->groupBy('category'), ]); } diff --git a/resources/lang/en/user.php b/resources/lang/en/user.php index 5e65da2a..48e723a7 100644 --- a/resources/lang/en/user.php +++ b/resources/lang/en/user.php @@ -203,7 +203,9 @@ return [ 'link' => 'Subscribe Link', 'tips' => 'Warning：Subscribe Link is for personal used only, Please do not show to anyone else. Otherwise, they may using your service without your permission', 'exchange_warning' => 'Exchange Link:\n1. Old Link will be disabled\n2. Proxy connection password will be reset', - 'ss_only' => 'Subscribe SS/SSR Only', + 'custom' => 'Custom Subscribe', + 'ss_only' => 'Subscribe SS Only', + 'ssr_only' => 'Subscribe SS/SSR Only', 'v2ray_only' => 'Subscribe V2Ray Only', 'trojan_only' => 'Subscribe Trojan Only', 'error' => 'Exchange Link Error', @@ -234,4 +236,8 @@ return [ 'client' => 'Clients', 'tutorials' => 'Tutorials', 'current_role' => 'Current Role as', + 'knowledge' => [ + 'title' => 'Knowledge Base', + 'basic' => 'Basic', + ], ]; diff --git a/resources/lang/zh_CN/user.php b/resources/lang/zh_CN/user.php index 9b0e132b..c2738d61 100644 --- a/resources/lang/zh_CN/user.php +++ b/resources/lang/zh_CN/user.php @@ -203,7 +203,9 @@ return [ 'link' => '订阅链接', 'tips' => '警告：该订阅链接仅限个人使用，请勿传播该链接，否则会导致您的账号流量使用情况异常触发自动封号机制。', 'exchange_warning' => '更换订阅地址将导致:\n1.旧地址立即失效\n2.连接密码被更改', - 'ss_only' => '只订阅SS/SSR', + 'custom' => '自定义订阅', + 'ss_only' => '只订阅SS', + 'ssr_only' => '只订阅SSR (包含SS)', 'v2ray_only' => '只订阅V2Ray', 'trojan_only' => '只订阅Trojan', 'error' => '更换订阅地址异常', @@ -234,4 +236,8 @@ return [ 'client' => '客户端', 'tutorials' => '教程', 'current_role' => '当前身份', + 'knowledge' => [ + 'title' => '知 识 库', + 'basic' => '基 础', + ], ]; diff --git a/resources/views/admin/article/index.blade.php b/resources/views/admin/article/index.blade.php index 8ffd15da..4b9638d9 100644 --- a/resources/views/admin/article/index.blade.php +++ b/resources/views/admin/article/index.blade.php @@ -18,9 +18,11 @@ # - 类型 - 标题 - 排序 + 类 型 + 分 类 + 标 题 + 语 言 + 排 序 发布日期 {{trans('common.action')}} @@ -33,25 +35,27 @@ 文章 @elseif ($article->type === 2) 公告 - @elseif ($article->type === 3) - 购买说明 - @elseif ($article->type === 4) - 使用教程 @else 未知 @endif - - @can('admin.article.show') - {{Str::limit($article->title, 80)}} - @else - {{Str::limit($article->title, 80)}} - @endcan + + {{ Str::limit($article->category, 30) }} + + {{ Str::limit($article->title, 50) }} + + + {!! isset(config('common.language')[$article->language]) ? ' + '.config('common.language')[$article->language][0].'': __('user.unknown') !!} {{$article->sort}} {{$article->created_at}} @canany(['admin.article.edit', 'admin.article.destroy'])
+ @can('admin.article.show') + + + @endcan @can('admin.article.edit') @@ -88,32 +92,32 @@ @can('admin.article.destroy') @endcan @endsection diff --git a/resources/views/admin/article/info.blade.php b/resources/views/admin/article/info.blade.php index ca25410e..a368f76b 100644 --- a/resources/views/admin/article/info.blade.php +++ b/resources/views/admin/article/info.blade.php @@ -71,7 +71,7 @@
- + 值越高显示时越靠前
@@ -85,7 +85,7 @@
- +
@@ -109,7 +109,7 @@ @isset($article) $(document).ready(function() { $("input[name='type'][value='{{$article->type}}']").click(); - $('#title').val('{{$article->title}}'); + $('#title').val('{!! $article->title !!}'); $('#category').val('{{$article->category}}'); $('#language').selectpicker('val', '{{$article->language}}'); $('#sort').val('{{$article->sort}}'); @@ -118,9 +118,10 @@ tinymce.init({ selector: 'textarea', // change this value according to your HTML - plugins: 'advlist autolink code emoticons help image importcss link lists media preview quickbars searchreplace table visualblocks visualchars wordcount', - toolbar: 'undo redo | styles | bold italic forecolor backcolor emoticons| alignleft aligncenter alignright alignjustify | bullist numlist outdent ' + - 'indent | link image media', + plugins: 'advlist autolink autoresize autosave code emoticons help image importcss link lists media ' + + 'preview quickbars searchreplace table visualblocks visualchars wordcount', + toolbar: 'restoredraft undo redo | styles | bold italic forecolor backcolor emoticons| alignleft aligncenter alignright alignjustify' + + ' | bullist numlist outdent indent | link image media', menubar: 'view edit insert format table tools help', link_default_target: '_blank', quickbars_insert_toolbar: 'quicktable image media', @@ -128,6 +129,8 @@ extended_valid_elements: 'i[class|aria-hidden]', language: '{{app()->getLocale()}}', content_css: '/assets/bundle/app.min.css', + min_height: 500, + max_height: 800, }); $('input:radio[name=\'type\']').on('change', function() { diff --git a/resources/views/admin/article/show.blade.php b/resources/views/admin/article/show.blade.php index 716bb93f..72ad7744 100644 --- a/resources/views/admin/article/show.blade.php +++ b/resources/views/admin/article/show.blade.php @@ -14,7 +14,8 @@
-

{{$article->title}}{{$article->created_at}}

+

{{$article->title}} {!! $article->category ?''.$article->category.'':'' !!}

+
{{$article->created_at}}
{!! $article->content !!}
diff --git a/resources/views/user/knowledge.blade.php b/resources/views/user/knowledge.blade.php index 261afe4c..0c77ab0b 100644 --- a/resources/views/user/knowledge.blade.php +++ b/resources/views/user/knowledge.blade.php @@ -6,11 +6,15 @@ ol > li { margin-bottom: 8px; } + + .panel-group .panel-title { + font-size: 20px; + } @endsection @section('content')
-

问题解决库

+

{{ __('user.knowledge.title') }}

@@ -19,7 +23,7 @@
基础 + href="#basic" aria-controls="basic" role="tab">{{ __('user.knowledge.basic') }} @foreach($knowledges as $category => $articles) {{$category}} @@ -57,20 +61,24 @@
diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php index 1eaf5e01..705c9450 100644 --- a/resources/views/user/profile.blade.php +++ b/resources/views/user/profile.blade.php @@ -83,12 +83,12 @@
@csrf
- - + +
- - + +
@@ -99,16 +99,16 @@ @csrf
- - + +
- - + +
- - + +
@@ -119,7 +119,7 @@ @csrf
- +