3. 用户端公告新增之后出现在医生端的公告列表，医生端公告新增之后出现在用户端公告列表（陈武杰）

app/Admin/Controllers/WeChatProgram/DoctorManagement/NoticeDoctorController.php

@@ -25,10 +25,10 @@ class NoticeDoctorController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new Notice());
-        $grid->model()->where('type','1')->orderBy('id','desc');
+        $grid->model()->where('type','2')->orderBy('id','desc');
         $grid->column('id', __('Id'));
         $grid->column('title', __('标题'));
-        $grid->column('content', __('内容'));
+        $grid->column('content', __('内容'))->limit(20,'');
         $grid->column('url', __('小程序链接'));
         $status = [
             'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
@@ -51,7 +51,7 @@ class NoticeDoctorController extends AdminController
 
         $form->text('title', __('标题'))->rules('required|min:3|max:255',['required'=>'请填写标题','min'=>'标题字符不能少于3个','max'=>'标题长度过长']);
         $form->editor('content', __('内容'))->rules('required' ,['required'=>'请填写内容！']);
-        $form->url('url', __('链接'))->rules('required',['required'=>'请填写链接']);
+        $form->text('url', __('小程序链接'))->rules('required',['required'=>'请填写链接']);
         $form->hidden('type', __('分类'))->default('2');
         $status = [
             'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],

app/Admin/Controllers/WeChatProgram/UserManagement/NoticeUserController.php

@@ -25,10 +25,10 @@ class NoticeUserController extends AdminController
     protected function grid()
     {
         $grid = new Grid(new Notice());
-        $grid->model()->where('type','2')->orderBy('id','desc');
+        $grid->model()->where('type','1')->orderBy('id','desc');
         $grid->column('id', __('Id'));
         $grid->column('title', __('标题'));
-        $grid->column('content', __('内容'));
+        $grid->column('content', __('内容'))->limit(20,'');
         $grid->column('url', __('小程序链接'));
         $status = [
             'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],
@@ -51,7 +51,7 @@ class NoticeUserController extends AdminController
 
         $form->text('title', __('标题'))->rules('required|min:3|max:255',['required'=>'请填写标题','min'=>'标题字符不能少于3个','max'=>'标题长度过长']);
         $form->editor('content', __('内容'))->rules('required' ,['required'=>'请填写内容！']);
-        $form->url('url', __('链接'))->rules('required',['required'=>'请填写链接']);
+        $form->text('url', __('小程序链接'))->rules('required',['required'=>'请填写链接']);
         $form->hidden('type', __('分类'))->default('1');
         $status = [
             'off' => ['value' => 0, 'text' => '禁用', 'color' => 'danger'],