diff --git a/app/Admin/Controllers/Resume/IndexController.php b/app/Admin/Controllers/Resume/IndexController.php index fc1ccf1..a70b029 100644 --- a/app/Admin/Controllers/Resume/IndexController.php +++ b/app/Admin/Controllers/Resume/IndexController.php @@ -75,12 +75,11 @@ class IndexController extends AdminController $form->text('direction', '研究方向'); }); - - $form->ueditor('part_job', '学术兼职'); -// $form->ueditor('content', '简历')->rules('required', ['required' => '简历不能为空']); + $form->ueditor('project', '主要科研项目'); $form->ueditor('outcome', '成果获奖情况'); $form->ueditor('thesis', '发表专著及论文选列'); - $form->ueditor('project', '主要科研项目'); + $form->ueditor('part_job', '学术兼职'); +// $form->ueditor('content', '简历')->rules('required', ['required' => '简历不能为空']); $form->datetime('created_at', '发布时间'); $form->switch('status', '状态')->default(1); diff --git a/app/Models/Resume.php b/app/Models/Resume.php index 664f419..316fff0 100644 --- a/app/Models/Resume.php +++ b/app/Models/Resume.php @@ -81,6 +81,7 @@ class Resume extends Model 'email' => '电子邮件', 'address' => '通讯地址', 'part_job' => '学术兼职', + 'direction' => '研究方向', ][$key] ?? '未知'; } } diff --git a/resources/views/resume/show.blade.php b/resources/views/resume/show.blade.php index 416637b..c5e2570 100644 --- a/resources/views/resume/show.blade.php +++ b/resources/views/resume/show.blade.php @@ -43,14 +43,6 @@ {{-- {!! $resume->content !!}--}} {{-- --}} {{-- --}} - @if($resume->direction) -
-
学术兼职
-
- {!! $resume->direction !!} -
-
- @endif @if($resume->project)
主要科研项目
@@ -59,6 +51,7 @@
@endif + @if($resume->outcome)
成果获奖情况
@@ -67,6 +60,7 @@
@endif + @if($resume->thesis)
发表专著及论文选列
@@ -76,6 +70,15 @@
@endif + @if($resume->part_job) +
+
学术兼职
+
+ {!! $resume->part_job !!} +
+
+ @endif +