From 6edbea353dfeda82a9b24ad723abe05ce2b0eedc Mon Sep 17 00:00:00 2001
From: “wangming” <“wangming@antissoft.com”>
Date: Thu, 29 Feb 2024 15:02:05 +0800
Subject: [PATCH] 1

---
 pages/my/adminMessageList/adminMessageList.vue |  67 ++++++++++++++++++++++++++++++++++++++-----------------------------
 pages/my/messageList/messageList.vue           | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------
 2 files changed, 129 insertions(+), 111 deletions(-)

diff --git a/pages/my/adminMessageList/adminMessageList.vue b/pages/my/adminMessageList/adminMessageList.vue
index 5ea4eb9..653ddd8 100644
--- a/pages/my/adminMessageList/adminMessageList.vue
+++ b/pages/my/adminMessageList/adminMessageList.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="page">
 		<view class="list-box">
-			<view class="item" v-for="(it,index) in messageList" :key="index" @click="toDetail(it.MessageEntity,it.MessageReceiveEntity.MessageId)">
+			<view class="item" v-for="(it,index) in messageList" :key="index"
+				@click="toDetail(it.MessageEntity,it.MessageReceiveEntity.MessageId)">
 				<view class="info">
 					<view class="title">
 						{{it.MessageEntity.Title}}
@@ -10,10 +11,10 @@
 						{{it.MessageEntity.BodyText}}
 					</view>
 				</view>
-				<view class="isRead" style="color: red;" v-if="it.MessageReceiveEntity.IsRead === 0">
+				<view class="isRead" style="background: red;" v-if="it.MessageReceiveEntity.IsRead === 0">
 					未读
 				</view>
-				<view class="isRead" style="color: greenyellow;" v-else>
+				<view class="isRead" style="background: #009e00;" v-else>
 					已读
 				</view>
 			</view>
@@ -26,8 +27,8 @@
 	export default {
 		data() {
 			return {
-				messageList:[],
-				isAdmin:false
+				messageList: [],
+				isAdmin: false
 			}
 		},
 		onShow() {
@@ -44,16 +45,15 @@
 				if (uni.getStorageSync('user')) {
 					let userCode = uni.getStorageSync("user")
 					console.log(userCode)
-					if(userCode.userInfo.userId === 'admin'){
+					if (userCode.userInfo.userId === 'admin') {
 						this.isAdmin = true
 					}
 					console.log('用户已登录！')
-				} 
-				else {
+				} else {
 					uni.showToast({
 						title: '请登录',
 						icon: 'none',
-						duration:1500
+						duration: 1500
 					})
 					// setTimeout(() => {
 					// 	uni.reLaunch({
@@ -63,23 +63,23 @@
 				}
 			},
 			// 获取消息通知
-			getAdminNoticeTell(){
+			getAdminNoticeTell() {
 				request({
-					url:'/api/extend/demo/GetMessageList',
-					method:'get',
-					data:{}
-				}).then(res=>{
-					console.log('通知列表',res)
-					if(res.code == 200){
+					url: '/api/extend/demo/GetMessageList',
+					method: 'get',
+					data: {}
+				}).then(res => {
+					console.log('通知列表', res)
+					if (res.code == 200) {
 						this.messageList = JSON.parse(JSON.stringify(res.data))
 					}
 				})
 			},
 			// 跳转到消息详情
-			toDetail(it,id){
+			toDetail(it, id) {
 				let link = JSON.parse(it.bodyJson)
 				// let id = it.Id
-				console.log('link',link.link)
+				console.log('link', link.link)
 				// uni.navigateTo({
 				// 	url:link.link + `?data=${JSON.stringify(link.reid)}`
 				// })
@@ -93,7 +93,7 @@
 				// 	}
 				// })
 				uni.navigateTo({
-					url:link.link + `?data=${JSON.stringify(link.reid)}`
+					url: link.link + `?data=${JSON.stringify(link.reid)}`
 				})
 				// request({
 				// 	url:`/api/extend/demo/UpdateIsReadEnd?MessageId=${id}`,
@@ -114,18 +114,20 @@
 </script>
 
 <style lang="scss" scoped>
-	.page{
+	.page {
 		width: 100%;
 		height: 100vh;
 		overflow: scroll;
 		background-color: #f3f3f3;
 	}
-	.list-box{
+
+	.list-box {
 		width: 96%;
 		margin: 0 auto;
 		overflow-y: scroll;
 	}
-	.item{
+
+	.item {
 		width: 100%;
 		background-color: white;
 		border-radius: 30rpx;
@@ -134,25 +136,32 @@
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		.info{
+
+		.info {
 			display: flex;
 			flex-direction: column;
+
 			// align-items: center;
-			.title{
+			.title {
 				font-size: 36rpx;
 				font-weight: bold;
 			}
-			.desc{
+
+			.desc {
 				// width: 400rpx;
 				overflow: hidden;
 				white-space: nowrap;
 				text-overflow: ellipsis;
-				margin-left: 20rpx;
+				margin-left: 18rpx;
 			}
 		}
-		.isRead{
+
+		.isRead {
 			color: red;
-			margin-right: 40rpx;
+			margin-right: 10rpx;
+			padding: 6rpx 18rpx;
+			border-radius: 5px;
+			color: #f3f3f3;
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/my/messageList/messageList.vue b/pages/my/messageList/messageList.vue
index 11f94d5..04c0624 100644
--- a/pages/my/messageList/messageList.vue
+++ b/pages/my/messageList/messageList.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="page">
 		<view class="list-box">
-			<view class="item" v-for="(it,index) in messageList" :key="index" @click="toDetail(it.MessageContent,it.MessageInfo.MessageId)">
+			<view class="item" v-for="(it,index) in messageList" :key="index"
+				@click="toDetail(it.MessageContent,it.MessageInfo.MessageId)">
 				<view class="info">
 					<view class="title">
 						{{it.MessageContent.Title}}
@@ -10,10 +11,10 @@
 						{{it.MessageContent.BodyText}}
 					</view>
 				</view>
-				<view class="isRead" style="color: red;" v-if="it.MessageInfo.IsRead === 0">
+				<view class="isRead" style="background: red;" v-if="it.MessageReceiveEntity.IsRead === 0">
 					未读
 				</view>
-				<view class="isRead" style="color: greenyellow;" v-else>
+				<view class="isRead" style="background: #009e00;" v-else>
 					已读
 				</view>
 			</view>
@@ -26,8 +27,8 @@
 	export default {
 		data() {
 			return {
-				messageList:[],
-				isAdmin:false,
+				messageList: [],
+				isAdmin: false,
 				baseUrl: 'http://deyanggaoxin.fengshiyun.com'
 			}
 		},
@@ -41,16 +42,15 @@
 				if (uni.getStorageSync('user')) {
 					let userCode = uni.getStorageSync("user")
 					console.log(userCode)
-					if(userCode.userInfo.userId === 'admin'){
+					if (userCode.userInfo.userId === 'admin') {
 						this.isAdmin = true
 					}
 					console.log('用户已登录！')
-				} 
-				else {
+				} else {
 					uni.showToast({
 						title: '请登录',
 						icon: 'none',
-						duration:1500
+						duration: 1500
 					})
 					// setTimeout(() => {
 					// 	uni.reLaunch({
@@ -60,36 +60,36 @@
 				}
 			},
 			// 获取消息通知
-			getNoticeTell(){
+			getNoticeTell() {
 				request({
-					url:'/api/extend/demo/GetMyMessage',
-					method:'get',
-					data:{}
-				}).then(res=>{
-					console.log('通知列表',res)
-					if(res.code == 200){
+					url: '/api/extend/demo/GetMyMessage',
+					method: 'get',
+					data: {}
+				}).then(res => {
+					console.log('通知列表', res)
+					if (res.code == 200) {
 						this.messageList = res.data
 					}
 				})
 			},
 			// 获取消息通知
-			getAdminNoticeTell(){
+			getAdminNoticeTell() {
 				request({
-					url:'/api/extend/demo/GetMessageList',
-					method:'get',
-					data:{}
-				}).then(res=>{
-					console.log('通知列表',res)
-					if(res.code == 200){
+					url: '/api/extend/demo/GetMessageList',
+					method: 'get',
+					data: {}
+				}).then(res => {
+					console.log('通知列表', res)
+					if (res.code == 200) {
 						this.messageList = res.data
 					}
 				})
 			},
 			// 跳转到消息详情
-			toDetail(it,id){
+			toDetail(it, id) {
 				let link = JSON.parse(it.bodyJson)
 				// let id = it.Id
-				console.log('link',link.link)
+				console.log('link', link.link)
 				// uni.navigateTo({
 				// 	url:link.link + `?data=${JSON.stringify(link.reid)}`
 				// })
@@ -103,30 +103,30 @@
 				// 	}
 				// })
 				request({
-					url:`/api/extend/demo/UpdateIsReadEnd?MessageId=${id}`,
-					method:'put',
-					data:{}
-				}).then(res=>{
-					console.log("修改已读",res)
-					if(res.code == 200){
+					url: `/api/extend/demo/UpdateIsReadEnd?MessageId=${id}`,
+					method: 'put',
+					data: {}
+				}).then(res => {
+					console.log("修改已读", res)
+					if (res.code == 200) {
 						console.log('成功修改')
-						if(link.type === '公文办理通知'){
+						if (link.type === '公文办理通知') {
 							this.download(link.link)
-						}else{
+						} else {
 							uni.navigateTo({
-								url:link.link + `?data=${JSON.stringify(link.reid)}`
+								url: link.link + `?data=${JSON.stringify(link.reid)}`
 							})
 						}
-						
-						if(link.type === '公文办理通知'){
+
+						if (link.type === '公文办理通知') {
 							this.download(link.link)
-						}else if(link.type === '表单填报通知'){
+						} else if (link.type === '表单填报通知') {
 							uni.navigateTo({
-								url:link.link + `?id=${link.reid}`
+								url: link.link + `?id=${link.reid}`
 							})
-						}else{
+						} else {
 							uni.navigateTo({
-								url:link.link + `?data=${JSON.stringify(link.reid)}`
+								url: link.link + `?data=${JSON.stringify(link.reid)}`
 							})
 						}
 					}
@@ -134,41 +134,41 @@
 			},
 			download(it) {
 				uni.downloadFile({
-						url: this.baseUrl + it,//下载地址接口返回
-						success: (data) => {
-							if (data.statusCode === 200) {
-								//文件保存到本地
-								uni.saveFile({
-									tempFilePath: data.tempFilePath, //临时路径
-									success: function(res) {
-										uni.showToast({
-											icon: 'none',
-											mask: true,
-											title: '文件已保存：' + res.savedFilePath, //保存路径
-											duration: 3000,
+					url: this.baseUrl + it, //下载地址接口返回
+					success: (data) => {
+						if (data.statusCode === 200) {
+							//文件保存到本地
+							uni.saveFile({
+								tempFilePath: data.tempFilePath, //临时路径
+								success: function(res) {
+									uni.showToast({
+										icon: 'none',
+										mask: true,
+										title: '文件已保存：' + res.savedFilePath, //保存路径
+										duration: 3000,
+									});
+									setTimeout(() => {
+										//打开文档查看
+										uni.openDocument({
+											filePath: res.savedFilePath,
+											success: function(res) {
+												// console.log('打开文档成功');
+											}
 										});
-										setTimeout(() => {
-											//打开文档查看
-											uni.openDocument({
-												filePath: res.savedFilePath,
-												success: function(res) {
-													// console.log('打开文档成功');
-												}
-											});
-										}, 3000)
-									}
-								});
-							}
-						},
-						fail: (err) => {
-							that.loadelshow = false
-							console.log(err);
-							uni.showToast({
-								icon: 'none',
-								mask: true,
-								title: '失败请重新下载',
+									}, 3000)
+								}
 							});
-						},
+						}
+					},
+					fail: (err) => {
+						that.loadelshow = false
+						console.log(err);
+						uni.showToast({
+							icon: 'none',
+							mask: true,
+							title: '失败请重新下载',
+						});
+					},
 				});
 			},
 		}
@@ -176,17 +176,19 @@
 </script>
 
 <style lang="scss" scoped>
-	.page{
+	.page {
 		width: 100%;
 		height: 100vh;
 		background-color: #f3f3f3;
 	}
-	.list-box{
+
+	.list-box {
 		width: 96%;
 		margin: 0 auto;
 		overflow-y: scroll;
 	}
-	.item{
+
+	.item {
 		width: 100%;
 		background-color: white;
 		border-radius: 30rpx;
@@ -195,15 +197,18 @@
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		.info{
+
+		.info {
 			display: flex;
 			flex-direction: column;
+
 			// align-items: center;
-			.title{
+			.title {
 				font-size: 36rpx;
 				font-weight: bold;
 			}
-			.desc{
+
+			.desc {
 				// width: 400rpx;
 				overflow: hidden;
 				white-space: nowrap;
@@ -211,9 +216,13 @@
 				margin-left: 20rpx;
 			}
 		}
-		.isRead{
+
+		.isRead {
 			color: red;
-			margin-right: 40rpx;
+			margin-right: 10rpx;
+			padding: 6rpx 18rpx;
+			border-radius: 5px;
+			color: #f3f3f3;
 		}
 	}
-</style>
+</style>
\ No newline at end of file
--
libgit2 0.21.4