From adb2ba0ab2b334d604b63095a7d55e04378d97ea Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Fri, 22 Mar 2024 17:16:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BE=8B=E4=BC=9A=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96->=E5=AE=9E=E6=97=B6=E7=85=A7=E7=89=87=E6=B0=B4?=
 =?UTF-8?q?=E5=8D=B0=E6=B7=BB=E5=8A=A0=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/application/safetymeeting/home.vue            | 13 ++-----------
 .../safetymeeting/safetymeeting-detail.vue          |  4 ++++
 pages/news/home.vue                                 |  9 +++------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/pages/application/safetymeeting/home.vue b/pages/application/safetymeeting/home.vue
index 84cbfd4..dbe7a2b 100644
--- a/pages/application/safetymeeting/home.vue
+++ b/pages/application/safetymeeting/home.vue
@@ -11,7 +11,7 @@
 			<view class="cu-bar search bg-white">
 				<view class="search-form radius">
 					<text class="cuIcon-search"></text>
-					<input @input="InputBlur" placeholder="请输入关键字" confirm-type="search"></input>
+					<input @input="InputBlur" placeholder="请输入会议标题关键字" confirm-type="search"></input>
 
 				</view>
 				<view class="action">
@@ -35,13 +35,6 @@
 						<view class="dy-subtitle">
 							<text>会议时间：{{i.MEETING_DATE_START}}</text>
 						</view>
-<!--            <view class="dy-subtitle">-->
-<!--              <text>会议状态：{{i.MEETING_STATUS}}</text>-->
-<!--            </view>-->
-<!--            <view class="dy-subtitle">-->
-<!--              <text>会议内容：</text>-->
-<!--              <rich-text :nodes="i.MEETING_CONTENT"></rich-text>-->
-<!--            </view>-->
 					</view>
 				</view>
 			</view>
@@ -61,7 +54,6 @@
 <script>
 	import {
 		basePath,
-		corpinfoId,
 		loginSession,
 	} from '@/common/tool.js';
 	import tkiTree from "@/components/select-tree/select-tree.vue"
@@ -211,8 +203,7 @@
 						'Content-type': 'application/x-www-form-urlencoded'
 					},
 					data: {
-						CORPINFOID: corpinfoId,
-						KEYWORDS: _this.NameLikes, //关键字模糊查询
+            MEETING_TITLE: _this.NameLikes, //关键字模糊查询
 					},
 					success: (res) => {
 						uni.hideLoading(); //结束加载中动画
diff --git a/pages/application/safetymeeting/safetymeeting-detail.vue b/pages/application/safetymeeting/safetymeeting-detail.vue
index e8fa31c..a67aef7 100644
--- a/pages/application/safetymeeting/safetymeeting-detail.vue
+++ b/pages/application/safetymeeting/safetymeeting-detail.vue
@@ -199,6 +199,10 @@
                 // 绘制水印
                 ctx.fillText(`用户名: ${loginUser.NAME}`, 10, 120); // 根据实际情况调整位置
                 ctx.fillText(`当前位置: ${locationAddress}`, 10, 130); // 根据实际情况调整位置
+                // 获取并格式化当前时间
+                const now = new Date();
+                const formattedTime = `${now.getFullYear()}-${now.getMonth()+1}-${now.getDate()} ${now.getHours()}:${now.getMinutes()}:${now.getSeconds()}`;
+                ctx.fillText(`当前时间: ${formattedTime}`, 10, 140); // 绘制时间水印
                 ctx.draw(false, () => {
                   // 将画布内容保存为图片
                   uni.canvasToTempFilePath({
diff --git a/pages/news/home.vue b/pages/news/home.vue
index 1843a5d..625c26e 100644
--- a/pages/news/home.vue
+++ b/pages/news/home.vue
@@ -122,7 +122,7 @@
 				scrollLeft: 0,
 				tabNav: ['平台公告', '企业公告'],
 				noClick:true,
-        		KEYWORDS:'',
+        KEYWORDS:'',
 				list: [],
 				pclist: [],
 				page:1,//分页参数--页数
@@ -133,7 +133,6 @@
 				showCount :-1,
 				currentPage:1,
 				tabCur :0,
-
 			}
 		},
 		mounted(e){
@@ -167,7 +166,6 @@
 					_this.getPcData();//开始分页查询
 				}
 			}
-
 		},
 		onReady() {
 		},
@@ -189,7 +187,6 @@
 				}else{
 				  _this.getPcData();
 				}
-
 			  },
 			getData() {
 				var _this = this;
@@ -206,7 +203,7 @@
 					data: {
 						showCount : _this.showCount,
 						currentPage : _this.currentPage,
-            			KEYWORDS:_this.KEYWORDS,
+            KEYWORDS:_this.KEYWORDS,
 						corpinfoId :corpinfoId,
 						CORPINFO_ID:loginUser.CORPINFO_ID,
 						USER_ID:loginUser.USER_ID,
@@ -243,7 +240,7 @@
 						currentPage : _this.currentPage,
             KEYWORDS:_this.KEYWORDS,
 						loginUserId :loginUserId,
-						CORPINFO_ID:loginUser.CORPINFO_ID,
+						// CORPINFO_ID:loginUser.CORPINFO_ID,
 						USER_ID:loginUser.USER_ID,
 					},
 					success: (res) => {