调整简历+文章增加外链

app/Admin/Controllers/Article/IndexController.php

@@ -23,10 +23,10 @@ class IndexController extends AdminController
             $filter->column(1 / 2, function ($filter) {
                 $filter->like('title', '文章标题');
                 $filter->equal('categories.id', '所属分类')
-                       ->select(Category::selectOptions(function ($model) {
+                    ->select(Category::selectOptions(function ($model) {
-                           return $model->where('status', 1)
+                        return $model->where('status', 1)
-                                        ->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW,Category::TYPE_PERSON]);
+                            ->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW, Category::TYPE_PERSON]);
-                       }, '所有分类'));
+                    }, '所有分类'));
 
             });
 
@@ -57,7 +57,7 @@ class IndexController extends AdminController
         $form->text('title', '文章标题')->rules('min:2')->required();
 
         $form->select('position', '推荐')
-             ->options(Article::POSITIONS);
+            ->options(Article::POSITIONS);
 
         $form->belongsToMany('categories', CategorySelectAble::class, __('关联分类'))->required();
 
@@ -67,9 +67,9 @@ class IndexController extends AdminController
         $form->text('rank', '职称')->help('领导班子需要添加此数据');
 
         $form->image('cover', '封面')
-             ->move('images/' . date('Y/m/d'))
+            ->move('images/'.date('Y/m/d'))
-             ->removable()
+            ->removable()
-             ->uniqueName();
+            ->uniqueName();
 
         $form->ueditor('content', '文章内容')->rules('required', ['required' => '详情不能为空']);
         $form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先');
@@ -80,6 +80,7 @@ class IndexController extends AdminController
         $form->datetime('created_at', '发布时间');
 
         $form->switch('status', '状态')->states($states)->default(1);
+        $form->url('url', '外链地址');
 
         //        $form->saved(function (Form $form) {
         //            $category_ids = request()->category_ids;

app/Admin/Controllers/Resume/IndexController.php

@@ -66,6 +66,7 @@ class IndexController extends AdminController
 
         $form->embeds('information', '基本信息', function ($form) {
             $form->text('duty', '职务');
+            $form->text('tenure', '任期');
             $form->text('rank', '职称');
             $form->text('education', '学历');
             $form->text('mobile', '电话');
@@ -75,10 +76,11 @@ class IndexController extends AdminController
         });
 
 
-        $form->ueditor('direction', '主要科研项目')->required();
+        $form->ueditor('direction', '研究方向')->rules('required', ['required' => '研究方向不能为空']);
 //        $form->ueditor('content', '简历')->rules('required', ['required' => '简历不能为空']);
-        $form->ueditor('outcome', '成果获奖情况')->required();
+        $form->ueditor('outcome', '成果获奖情况')->rules('required', ['required' => '成果获奖情况不能为空']);
-        $form->ueditor('project', '发表专著及论文选列')->required();
+        $form->ueditor('thesis', '发表专著及论文选列')->rules('required', ['required' => '发表专著及论文选列不能为空']);
+        $form->ueditor('project', '主要科研项目')->rules('required', ['required' => '主要科研项目不能为空']);
         $form->datetime('created_at', '发布时间');
 
         $form->switch('status', '状态')->default(1);

app/Http/Controllers/ArticleController.php

@@ -11,18 +11,22 @@ class ArticleController extends Controller
 
     /**
      * 显示分类
-     * @param \App\Models\Article $article
+     *
+     * @param  \App\Models\Article  $article
      * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View [type]             [description]
      */
     public function show(Article $article)
     {
+        if ($article->url) {
+            return redirect()->away($article->url);
+        }
         $categories = $article->categories;
         $next       = Article::where('id', '>', $article->id)
-                             ->whereHas('categories', function ($q) use ($categories) {
+            ->whereHas('categories', function ($q) use ($categories) {
-                                 $q->whereIN('id', $categories->pluck('id'));
+                $q->whereIN('id', $categories->pluck('id'));
-                             })
+            })
-                             ->where('status', 1)
+            ->where('status', 1)
-                             ->first();
+            ->first();
 
         return view('article.show', compact('article', 'next'));
 
@@ -33,12 +37,12 @@ class ArticleController extends Controller
     {
         $title    = $request->title;
         $articles = Article::where('status', 1)
-                           ->when($title, function ($q) use ($title) {
+            ->when($title, function ($q) use ($title) {
-                               $q->where('title', 'like', "%{$title}%")
+                $q->where('title', 'like', "%{$title}%")
-                                 ->orWhere('content', 'like', "%{$title}%");
+                    ->orWhere('content', 'like', "%{$title}%");
-                           })
+            })
-                            ->latest()
+            ->latest()
-                           ->paginate();
+            ->paginate();
 
         return view('article.search', compact('articles'));
 

app/Models/Resume.php

@@ -74,6 +74,7 @@ class Resume extends Model
     {
         return [
                    'duty'      => '职务',
+                   'tenure'    => '任期',
                    'rank'      => '职称',
                    'education' => '学历',
                    'mobile'    => '电话',

database/migrations/2021_12_01_094854_create_resumes_table.php

@@ -18,9 +18,9 @@ class CreateResumesTable extends Migration
             $table->unsignedBigInteger('category_id')->index();
             $table->unsignedBigInteger('group_id')->index();
             $table->string('name');
-            $table->string('cover');
+            $table->string('cover')->nullable();
             $table->json('information')->comment('基本信息');
-            $table->text('content')->comment('简历');
+            $table->text('content')->nullable()->comment('简历');
             $table->string('direction')->comment('研究方向');
             $table->text('outcome')->comment('代表成果');
             $table->text('project')->comment('承担科研项目情况');

resources/views/resume/show.blade.php

@@ -44,9 +44,9 @@
                             {{--                                </div>--}}
                             {{--                            </div>--}}
                             <div class="tdrcCont-label">
-                                <div class="tdrcCont-title">主要科研项目</div>
+                                <div class="tdrcCont-title">研究方向</div>
                                 <div class="tdrcCont-text">
-                                    {{ $resume->direction }}
+                                    {!! $resume->direction !!}
                                 </div>
                             </div>
                             <div class="tdrcCont-label">
@@ -57,6 +57,12 @@
                             </div>
                             <div class="tdrcCont-label">
                                 <div class="tdrcCont-title">发表专著及论文选列</div>
+                                <div class="tdrcCont-text">
+                                    {!! $resume->thesis !!}
+                                </div>
+                            </div>
+                            <div class="tdrcCont-label">
+                                <div class="tdrcCont-title">主要科研项目</div>
                                 <div class="tdrcCont-text">
                                     {!! $resume->project !!}
                                 </div>