From 0820307fe6fde5d86ba271ddccff2ced1d54bd32 Mon Sep 17 00:00:00 2001
From: xyc <3422692813@qq.com>
Date: Fri, 25 Apr 2025 16:36:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/notice/report-list.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/notice/report-list.vue b/pages/notice/report-list.vue
index e63aeba..401aab3 100644
--- a/pages/notice/report-list.vue
+++ b/pages/notice/report-list.vue
@@ -214,7 +214,7 @@
 			 * 上滑加载数据
 			 */
 			onReachBottomCus() {
-				let quertData = {}
+				let queryData = {}
 				if (this.menuIndex == 0) {
 					queryData = this.waitingParams
 				} else if (this.menuIndex == 1) {
@@ -234,7 +234,7 @@
 			 * 下拉刷新数据
 			 */
 			onRefresherrefresh() {
-				let quertData = {}
+				let queryData = {}
 				if (this.menuIndex == 0) {
 					queryData = this.waitingParams
 				} else if (this.menuIndex == 1) {

From fbe4bf4c64ad65167f69f23685ff87e2f5de0e34 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Fri, 25 Apr 2025 16:43:21 +0800
Subject: [PATCH 2/2] 1

---
 pages/components/my-notice-tg.vue |  4 ++--
 pages/components/my-notice.vue    |  2 +-
 pages/notice/public-notice.vue    | 11 +++++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pages/components/my-notice-tg.vue b/pages/components/my-notice-tg.vue
index 5185925..a12c875 100644
--- a/pages/components/my-notice-tg.vue
+++ b/pages/components/my-notice-tg.vue
@@ -218,11 +218,11 @@
 			padding: 0 20rpx 0 20rpx;
 
 			.dl-item-box {
-				height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 337rpx);
+				height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 344rpx);
 				padding-top: 20rpx;
 				isplay: flex;
 				flex-direction: column;
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/components/my-notice.vue b/pages/components/my-notice.vue
index 8ebf780..186ce27 100644
--- a/pages/components/my-notice.vue
+++ b/pages/components/my-notice.vue
@@ -207,7 +207,7 @@
 			padding: 0 20rpx 0 20rpx;
 
 			.dl-item-box {
-				height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 337rpx);
+				height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 344rpx);
 				isplay: flex;
 				flex-direction: column;
 			}
diff --git a/pages/notice/public-notice.vue b/pages/notice/public-notice.vue
index f12f70b..70b81e0 100644
--- a/pages/notice/public-notice.vue
+++ b/pages/notice/public-notice.vue
@@ -204,8 +204,10 @@
 							通告明细
 						</view>
 						<view class="item-value">
-							<textarea v-model="dataObj.detail" style="height: 600rpx;" type="text"
-								placeholder="请输入通告明细" />
+							<fuck-textarea v-model="dataObj.detail" height="600rpx" placeholder="请输入内容"
+								maxlength="3000"></fuck-textarea>
+							<!-- <textarea v-model="dataObj.detail" style="height: 600rpx;" type="text"
+								placeholder="请输入通告明细" /> -->
 						</view>
 					</view>
 				</view>
@@ -270,9 +272,11 @@
 		saveNotice,
 		getNoticeDetail
 	} from '@/api/business/notice';
+	import fuckTextarea from '@/components/fuck-textarea/fuck-textarea.vue'
 	export default {
 		components: {
 			navigationBarVue,
+			fuckTextarea
 		},
 		data() {
 			return {
@@ -503,6 +507,9 @@
 				if (this.validForm(this.dataObj)) {
 					return
 				}
+				let str = this.dataObj.detail.replace(/\n|\r\n/g, "<br>")
+				console.log(str, "str")
+				this.dataObj.detail = str
 				//草稿状态
 				this.dataObj.approvalStatus = '8'
 				if (this.fileList && this.fileList.length > 0) {