From c612912d4132e4d7b4a58279071fac837891c381 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 27 九月 2024 17:08:25 +0800
Subject: [PATCH] feat:库管确认装卸毛重净重按条件显示,司机填原发信息增加限制

---
 pages/public-page/message/message.vue |   69 +++++++++++++++++++++++++++++++---
 1 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/pages/public-page/message/message.vue b/pages/public-page/message/message.vue
index ffc270b..91608b0 100644
--- a/pages/public-page/message/message.vue
+++ b/pages/public-page/message/message.vue
@@ -20,17 +20,20 @@
 							<u-badge :isDot="true"
 								type="error"
 								v-if="item.status !== 1"></u-badge>
-							<u-cell size="large"
-								:title="item.title"
-								@click="messageDetails(item, index)">
-								<u-parse :content="item.content"
+								<!-- @click="messageDetails(item, index)" -->
+							<u-cell size="large">
+								<u-parse  
+								:content="item.content"
 									slot="label"></u-parse>
 
 								<view class="prepose"
 									slot="icon"><u-icon name="volume"
 										color="#035CFB"
 										size="40"></u-icon></view>
-									<span slot="right-icon" style="font-size: 12px; margin-bottom: 20px;">{{ item.createTime }}</span>
+									<view slot="right-icon" style="font-size: 12px;">
+										<view>{{ item.createTime }}</view>
+										<view>鍙戦�佷汉锛�<text style="font-size:12px;color:#00000082">{{item.createByName}}</text></view>
+										</view>
 							</u-cell>
 						</u-swipe-action-item>
 					</u-swipe-action>
@@ -68,6 +71,11 @@
 		onShow() {
 			this.messageReq();
 		},
+		onPullDownRefresh(){
+			this.messageReq();
+			uni.stopPullDownRefresh();
+			
+		},
 		onHide() {
 			this.messageList = [];
 			this.pageNum = 1;
@@ -98,7 +106,7 @@
 								return {
 									...v,
 									title: v.title.slice(0, 8) + '...',
-									content: removeTags(v.content).trim().slice(0, 8) + '...'
+									content: removeTags(v.content).trim()
 								};
 							});
 						} else if (this.pageNum == 1) {
@@ -107,10 +115,13 @@
 								return {
 									...v,
 									title: v.title.slice(0, 8) + '...',
-									content: removeTags(v.content).trim().slice(0, 8) + '...'
+									content: removeTags(v.content).trim()
 								};
 							});
 						}
+						setTimeout(() => {
+									this.onShowMessage();
+						}, 500);
 					} else {
 						this.$u.toast('鍔犺浇澶辫触');
 					}
@@ -135,6 +146,49 @@
 						url: `/pages/public-page/messageDetails/messageDetails?messageId=${value.messageId}&id=${value.id}`
 					});
 				}
+			},
+			//鐐瑰紑棣栭〉宸叉秷鎭�
+			onShowMessage(){
+				const messageIds = this.messageList.filter(item=>item.status === 0);
+				console.log(messageIds,this.messageList,'messageIds')
+				this.$reqAllJson('readMessage', {
+						messageIds: messageIds.map(item=>item.id).join(","),
+						status: 0
+					}, { method: 'PUT', 'Content-Type': 'application/json' }).then(res=>{
+						console.log(res,'resss')
+					})
+					//閲嶆柊娓叉煋鎺ュ彛
+					this.$reqGet('getMessageByUser', { current: this.pageNum, size: this.pageSize }).then(res => {
+					if (res.code == 0) {
+						uni.hideLoading();
+						this.total = res.data.total;
+
+						function removeTags(str) {
+							return str.replace(/<\/?[^>]+>/gi, '');
+						}
+						if (this.pageNum > 1) {
+							this.messageList = this.messageList.concat(res.data.records);
+							this.messageList = this.messageList.map(v => {
+								return {
+									...v,
+									title: v.title.slice(0, 8) + '...',
+									content: removeTags(v.content).trim()
+								};
+							});
+						} else if (this.pageNum == 1) {
+							this.messageList = res.data.records;
+							this.messageList = this.messageList.map(v => {
+								return {
+									...v,
+									title: v.title.slice(0, 8) + '...',
+									content: removeTags(v.content).trim()
+								};
+							});
+						}
+					} else {
+						this.$u.toast('鍔犺浇澶辫触');
+					}
+				});
 			},
 			// 鍒犻櫎娑堟伅
 			deleteMsg(value, index) {
@@ -201,6 +255,7 @@
 	.message-body {
 		width: 100%;
 		height: 100%;
+	    background-color: #cccccc26;
 
 		.message-list {
 			margin: vww(5) 0;

--
Gitblit v1.9.1