Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/notice/public-notice.vue

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>

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;
 			}

pages/notice/public-notice.vue

@@ -204,8 +204,10 @@
 							通告明细
 						</view>
 						<view class="item-value">
-							<textarea maxlength="3000" 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) {
@@ -1075,3 +1082,4 @@
 		margin-right: 0 !important;
 	}
 </style>
+

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) {