From 31ed5dce8af5663e221e5120375e2a621132352c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=84=E5=B0=98?= <122383162@qq.com>
Date: Fri, 10 Dec 2021 14:15:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Resume/IndexController.php    |  7 +++----
 app/Models/Resume.php                         |  1 +
 resources/views/resume/show.blade.php         | 19 +++++++++++--------
 3 files changed, 15 insertions(+), 12 deletions(-)

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 !!}--}}
                             {{--                                </div>--}}
                             {{--                            </div>--}}
-                            @if($resume->direction)
-                                <div class="tdrcCont-label">
-                                    <div class="tdrcCont-title">学术兼职</div>
-                                    <div class="tdrcCont-text">
-                                        {!! $resume->direction !!}
-                                    </div>
-                                </div>
-                            @endif
                             @if($resume->project)
                                 <div class="tdrcCont-label">
                                     <div class="tdrcCont-title">主要科研项目</div>
@@ -59,6 +51,7 @@
                                     </div>
                                 </div>
                             @endif
+
                             @if($resume->outcome)
                                 <div class="tdrcCont-label">
                                     <div class="tdrcCont-title">成果获奖情况</div>
@@ -67,6 +60,7 @@
                                     </div>
                                 </div>
                             @endif
+
                             @if($resume->thesis)
                                 <div class="tdrcCont-label">
                                     <div class="tdrcCont-title">发表专著及论文选列</div>
@@ -76,6 +70,15 @@
                                 </div>
                             @endif
 
+                            @if($resume->part_job)
+                                <div class="tdrcCont-label">
+                                    <div class="tdrcCont-title">学术兼职</div>
+                                    <div class="tdrcCont-text">
+                                        {!! $resume->part_job !!}
+                                    </div>
+                                </div>
+                            @endif
+
                         </div>
                     </div>
                 </div>