From f18f95406f57dc0ae2821215b499fab921426e7b Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Tue, 5 Nov 2024 10:18:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=81=A5=E5=BA=B7?=
 =?UTF-8?q?=E5=AE=A3=E6=95=99=20=E6=A0=8F=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/API/Admin/YeWu/ArticleController.php |  8 ++++----
 .../app/Http/Controllers/API/H5/HomeController.php   | 12 ++++++------
 admin/src/views/H5Mngr/ArticlesMngr.vue              |  1 +
 h5/pages/posts/posts/posts.vue                       |  2 +-
 h5/pages/posts/posts/src/list1.vue                   |  3 +++
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/ArticleController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/ArticleController.php
index 5ad04fb..b065432 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/ArticleController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/ArticleController.php
@@ -23,10 +23,10 @@ class ArticleController extends Controller
     $data=[
       'title'=>$Info['title'],
       'type'=>$Info['type'],
-      'head_img'=>$Info['head_img'],
-      'content'=>$Info['content'],
-      'author'=>$Info['author'],
-      'order'=>$Info['order'],
+      'head_img'=>isset($Info['head_img'])?$Info['head_img']:'',
+      'content'=>isset($Info['content'])?$Info['content']:'',
+      'author'=>isset($Info['author'])?$Info['author']:'',
+      'order'=>isset($Info['order'])?$Info['order']:0,
     ];
     $do=false;
     if($Info['id']===0){
diff --git a/Laravel/app/Http/Controllers/API/H5/HomeController.php b/Laravel/app/Http/Controllers/API/H5/HomeController.php
index b753edd..7fde3f0 100644
--- a/Laravel/app/Http/Controllers/API/H5/HomeController.php
+++ b/Laravel/app/Http/Controllers/API/H5/HomeController.php
@@ -96,12 +96,12 @@ class HomeController extends Controller
         'jump' => '/pages/main/bgcx/bgcx',
         'icon' => '/assets/h5/a_baogaochaxun.png'
       ],
-//        [
-//        'message' => '暂未开放',
-//        'name' => '检后复查',
-//        'jump' => '/pages/main/cjwt/cjwt',
-//        'icon' => '/assets/h5/a_jianhoufucha.png'
-//      ],
+        [
+        'message' => '',
+        'name' => '健康宣教',
+        'jump' => '/pages/posts/posts/posts?type=4',
+        'icon' => '/assets/h5/a_jiankangzhidao.png'
+      ],
 
         [
         'message' => '',
diff --git a/admin/src/views/H5Mngr/ArticlesMngr.vue b/admin/src/views/H5Mngr/ArticlesMngr.vue
index ae6f354..e027455 100644
--- a/admin/src/views/H5Mngr/ArticlesMngr.vue
+++ b/admin/src/views/H5Mngr/ArticlesMngr.vue
@@ -14,6 +14,7 @@
 		 			<el-radio-button :label="1">健康指导</el-radio-button>
 		 			<el-radio-button :label="2">注意事项</el-radio-button>
 					<el-radio-button :label="3">院内介绍</el-radio-button>
+					<el-radio-button :label="4">健康宣教</el-radio-button>
 		 		</el-radio-group>
 		 	</el-form-item>
 		 </el-row>
diff --git a/h5/pages/posts/posts/posts.vue b/h5/pages/posts/posts/posts.vue
index e9b6cf8..3007666 100644
--- a/h5/pages/posts/posts/posts.vue
+++ b/h5/pages/posts/posts/posts.vue
@@ -63,7 +63,7 @@ import DraggableButton from "@/pages/components/goHome.vue";
 			<view :ref="configRef"></view>
 		</view>
 		<view>
-			<view v-if="[1,2].includes(Number($props.type))">
+			<view v-if="[1,2,4].includes(Number($props.type))">
 				<List1 :list="posts" :type="Number($props.type)"></List1>
 			</view>
 			<view v-if="[3].includes(Number($props.type))">
diff --git a/h5/pages/posts/posts/src/list1.vue b/h5/pages/posts/posts/src/list1.vue
index c58cc18..4b104bc 100644
--- a/h5/pages/posts/posts/src/list1.vue
+++ b/h5/pages/posts/posts/src/list1.vue
@@ -25,6 +25,9 @@
 	}, {
 		title: '注意事项',
 		desc: 'Physical Examination Notices'
+	}, {
+		title: '健康宣教',
+		desc: 'Health Education'
 	}])
 
 	const $props = defineProps({