diff --git a/pages/home/news.vue b/pages/home/news.vue
index 40b8fc3..65591fc 100644
--- a/pages/home/news.vue
+++ b/pages/home/news.vue
@@ -2,31 +2,24 @@
 	.container{
 		height:100%;
 		background:#f6f6f6;
-		&>.d-search{
-			.u-tabs{
-				margin-top:-20rpx;
-			}
-			.tabs{
-				display:flex;
-				flex-wrap: wrap;
-				margin:20rpx -20rpx -15rpx 0;
-				text{
-					height:48rpx;
-					line-height: 48rpx;
-					background:rgba(238, 238, 238, 0.4);
-					color:#999;
-					font-size:24rpx;
-					border-radius: 48rpx;
-					min-width:110rpx;
-					padding:0 10rpx;
-					box-sizing: border-box;
-					text-align: center;
-					transition: all 0.3s;
-					margin:0 20rpx 15rpx 0;
-					&.active{
-						color:#fff;
-						background:#10C176;
-					}
+		
+		&>.btns{
+			flex-shrink: 0;
+			margin:30rpx;
+			display:flex;
+			border-radius: 30rpx;
+			button{
+				width:50%;
+				color:#999;
+				&:first-child{
+					border-radius: 30rpx 0 0 30rpx;
+				}
+				&:nth-child(2){
+					border-radius:0 30rpx 30rpx 0;
+				}
+				&.active{
+					background:#10C176;
+					color:#fff;
 				}
 			}
 		}
@@ -36,154 +29,59 @@
 			height:1rpx;
 			.card{
 				margin-top:0;
-				&>.info{
-					display:flex;
+				&>view{
+					display: flex;
 					align-items: center;
-					&>.plant-xitongxiaoxi{
+					&+view{
+						border-top:2rpx solid rgba(216, 216, 216, 0.2);
+						margin-top:20rpx;
+						padding-top:20rpx;
+					}
+					.PA-news{
+						flex-shrink: 0;
+						width:76rpx;
+						height:76rpx;
 						background:#10C176;
+						border-radius: 50%;
 						color:#fff;
-						width:90rpx;
-						height:90rpx;
-						line-height: 90rpx;
+						font-size:40rpx;
 						text-align: center;
-						border-radius: 50%;
+						line-height: 76rpx;
+						box-shadow: 0 4rpx 6rpx rgba(0, 0, 0, 0.1);
+						margin-right:20rpx;
 						position:relative;
-						margin-right:16rpx;
-						&.noRead{
-							&:after{
-								content:"";
-								position:absolute;
-								background:red;
-								width:12rpx;
-								height:12rpx;
-								border-radius: 50%;
-								top:9rpx;
-								right:9rpx;
-							}
+						&.unread:after{
+							content:"";
+							position:absolute;
+							width:16rpx;
+							height:16rpx;
+							border-radius: 50%;
+							top:1rpx;
+							right:1rpx;
+							background:#EE4949;
 						}
 					}
-					&>view{
+					.content{
 						flex-grow: 1;
 						width:1rpx;
-						.title{
-							display:flex;
+						.head{
+							display: flex;
 							align-items: center;
-							text{
-								&:first-child{
-									font-weight: bold;
-								}
-								&:nth-child(2){
-									margin:0 20rpx 0 18rpx;
-									color:#fff;
-									background:#10C176;
-									border-radius: 4rpx 40rpx 4rpx 40rpx;
-									height:34rpx;
-									line-height: 34rpx;
-									padding:0 10rpx;
-									min-width:80rpx;
-									text-align: center;
-									font-size:20rpx;
-								}
-								&:nth-child(3){
-									margin-left:auto;
-								}
+							justify-content: space-between;
+							.name{
+								font-size:28rpx;
 							}
-						}
-						.tabs{
-							display:flex;
-							flex-wrap: wrap;
-							margin:12rpx -18rpx -16rpx 0;
-							text{
-								border-radius: 44rpx;
-								margin:0 18rpx 16rpx 0;
+							.date{
 								font-size:24rpx;
-								height:44rpx;
-								line-height: 44rpx;
-								background-position: 20rpx 12rpx;
-								background-repeat: no-repeat;
-								color:rgba(var(--c),1);
-								background-color:rgba(var(--c),0.1);
-								padding-right:20rpx;
-								&.read{
-									color:#999;
-									font-size:24rpx;
-									margin-left:auto;
-								}
-							}
-							.germinate{
-								--c:15, 194, 119;
-								background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAALCAYAAAB24g05AAAAAXNSR0IArs4c6QAAAYZJREFUKFOdkU1IVHEUxc957yE45YwKSRnUpp24dKELZ4YCMdFNJNWyRdDOr3lBkMzK0PmIEsFVqzDMlRsXBcObaBuCgRjMphREUOq9USqc9z/igGKKMHi3554f955D1DCXC8/aLNu8pNgFoonSqsA5v8m8YQ1+NBZTgcB6AN8oXRF5lYAjaakKuFQcbnfgDEHoAlkHaPlfxYz+vZ37AYGxz+4aoe8S7oIwMhxRuPe+fGdmhzEv9RTA9KEAYAPALwA3INh+ItOMD/ftaMvNOYvWIIC9CszAbjxbOLqcMc+doKV9iR0EegUJ4FcJpSAx9TDqua8rDiYdKa6K+VRO5rZPvv1fBg3eWL9Nzgq4BnEeMCuw2O53Zx6dl9XZENNpq74zuP6nJ78e+ei22nXmQTmRzdcOOLXZWEw9/h3PvL0wIOaNTfiJ7POaAZEvbqsT4okl3QMZGKlEoB+EF8K82936uYjBhfC4hVNkRgujL2jbfYBuEWyu6oIvahPkssL98SD5qnTkOwB+A5pVJ9wdJQAAAABJRU5ErkJggg==);
-								background-size:30rpx 22rpx;
-								padding-left:30rpx+25rpx;
-							}
-							.organ{
-								--c:248, 203, 54;
-								background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAANCAYAAACdKY9CAAAAAXNSR0IArs4c6QAAAQ9JREFUKFOlUrtKA1EQPedeHxERFAQRCYK9GCW7Ivb+hEUqsbONhZVFCm0kYCPoD9gFS4tgYeFVsLBLmyaNWO5qmCOYjYJuksJphnmcmTMPIpPkIXoGuda3f7QEoSVgbyoOd+wH0sfoCKL/DZA0A+IAQLMQhR0moVwHXPFv5cxjuJTTIYHpQhTWmYRYA5O/AjoDUAIw+w+A0AV0QcemmTZIVAFm8+V2sBOjzq2bpnJ+fowTVwTjHtWBlGQATgHcSjgmuTUCkD+6YDVPNWjOj8fhfviWhNZrp12aW1jadbK3yc2n6xEA1QW8kFoF3IqXauy9BJbzCAlqOOpG8hVAi864//0aw473EcrbEt8NqnwCf8mG+U/vRGMAAAAASUVORK5CYII=);
-								background-size:26rpx 24rpx;
-								padding-left:26rpx+25rpx;
+								color:#bbb;
 							}
-							.type{
-								--c:235, 67, 118;
-								background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAAAXNSR0IArs4c6QAAASBJREFUKFN9kD0vQ2EYhq/7bUUklUhEYxAMNfsDJk0TGxN/wWJ0EpvExmjpajMYTAaDxSIWg1ERFh/toCGpr55bzkk1qmmf8cl9PR+XqvPRHfY+QRH9KvY2YkXVYmTgEFjCNIBmi8sghv7MSDNtwHapfv8+OlPZ/UhCV4W1wZHJoSpiuAV1AgltxxVJL0nA9ogUCj03YC8iPWBixDiQ/fdS10lz+ZOdsSRULUanwFxfIH0IPhMD2ANIj2rGURzClsT0r5hOS62Rtq8F5aZ9miHMWo4kXXZYSrW2AZ7q942p7MSrklYu5M8Qtz0B7POBz8zCV/Z7+Y3aXi6MHSHV+2xwjZhNiUnsG4I2kC5S4Lm4fqBYxwRWwekJ3aVEdtmi9AMqTJE6K1mcKgAAAABJRU5ErkJggg==);
-								background-size:24rpx 22rpx;
-								padding-left:24rpx+25rpx;
-							}
-						}
-					}
-				}
-				&>.content{
-					display:flex;
-					align-items: center;
-					margin-top:10rpx;
-					.fruit,.food{
-						border-radius: 8rpx;
-						flex-shrink: 0;
-						height:44rpx;
-						line-height: 44rpx;
-						color:rgba(var(--c),1);
-						background:rgba(var(--c),0.1);
-						display:flex;
-						align-items: center;
-						padding:0 5rpx;
-						&:before{
-							content:"";
-							flex-shrink: 0;
-							margin-right:4rpx;
-						}
-						&:after{
-							flex-shrink: 0;
 						}
-					}
-					.fruit{
-						--c:248, 203, 54;
-						&:before{
-							width:29rpx;
-							height:21rpx;
-							background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAALCAYAAACgR9dcAAAAAXNSR0IArs4c6QAAAitJREFUKFNVkV1Ik3EUxp//ecdm84ttMFHDGMYSbKaIbTPISTYzeJmDdiNUUhdZVHRRBEUXel1UBN6EF2LRRdEXIyiyG5sGGqkFUYph4i6knBs13Lv3/Z/YcsLOzTk8D7/DwzkCW6WqqtXutodGb40+Kmi5fjAUau/1Jf3js6WvUtoO98SzJy8KvsgN4fBRt6ZJf01D/Tm54bg2MjI0ntM7VLXt5OHkh/6uDXo7VyqjC/VxW+0P7+DpWDzn5+HW1tZql6tlyOl0RyrLa4zllY/Di4uxO2dPlKz2dSQtZhMjnSFMyAak06nUg5n3XU8vpabzcCAQMHn2hpbMZmtFWbnDvLAwuRmPf/r97t7a7u+zOu5SFezLVgQDNthShPJUevpXZu14HgZAp/oH32SySZ+mbaIzMGCdmbwiRnpfA/w/X1bfB8lN0AwdFos0Plds7C/A+Q2NjY325uaeaGXFTn9d7a7E1T1hW05nHUha6mSitIn0kqpMwmTr9B64ObUNHztz/vKh7iMDzCwAJiHIUISuFC7LTBJExBKSAf4yP5fdhtuDYSeb+YYQKGOIhACbpOSXRNTHzA8ZbIWAiyBaWPJ9kOIpiu1Tw9cJsELwOiTapNRuk2JRNWGMKUAdoDgUhoeZ/0iDxopgb09vUFHQzUATwN8YPAWQuvXTOcGoZgEHgPWp6PMLRXAkElFW/moXhUI+SKwKYXxlQd78O0BLzNIuWeiKMA3Hoo9//gNbO95NYH+HjwAAAABJRU5ErkJggg==);
-						}
-						&:after{
-							content:"水果";
-						}
-					}
-					.food{
-						--c:16, 193, 118;
-						&:before{
-							width:24rpx;
-							height:24rpx;
-							background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAAAXNSR0IArs4c6QAAAkRJREFUKFM1kF9IU2EYxr/v/Nk52s7cGp45qSTMMbNAmDRFCwSXHOtiSQhGkWVddFEXYRde1FUQNaOrLhIMQS8kb3YROOjCZJFRRoWKiLV0Ttf+tu0c5znnO9+3OELP5fs8P3ifBwIAgL9faldaitf2mwsDwtfaqep1x8zi2/Bn0zshSRzTnYtiQbMxBX4b+np6anK3d34rbRmHGTBln3f/4qa9ravvZxWfz8dqEv9RPaq4IYEl6H3etpC7sHWG0mhClRmCq4wK4AgrTnsWLm97UR5pSlTY9SCXirFVr8Cml63fdHdZZBQLZ9gQYrIWHdWVuZM/GnITxS4vIgS/SMRnP2ysDhVFkYKnRs49Tt5ZHa1ZrMtiq0EohQZyR9r+cCy401slOqPFvzip618eTU1I5rvQL/UfKQTi41qD3FGhgQowUDuXmvaulzz1K0xMrxeL1HqWXYmsVd/8FAlvQpPyDQdu5friIeGnM39X67NpShnJ2i7laSxCwFYBou/DpQT3/Vlo5jwcvHf/qYW3dCqOQqOI7HS78ziLCEZbpU22qZ79PxxIZA24vI1eQenqjdeS1NutaxqgaRZACAEh+CBIUTSoVCoAYwQsHA/m5iLz0H/xUtfQlcF3G7EY73K5AMswwDCMA4BhGIAMA6RSKdDibVbHJycDZgdq+MHosiiKx3jOgmmaIaqqUSbA8xzB2KBUTafT6XR8IvTk9EHps8GBYG3t4THBKgg2wUYnU3/2zLvbVXeoJJewrMhyJpMfiYbfhP8BZDwCZS4yOV4AAAAASUVORK5CYII=);
-						}
-						&:after{
-							content:"蔬菜";
+						.dec{
+							font-size:24rpx;
+							color:#999;
+							margin-top:10rpx;
 						}
 					}
-					.cause,.date{
-						color:#999;
-						font-size:24rpx;
-						margin-left:16rpx;
-					}
-					.cause{
-						flex-grow: 1;
-					}
 				}
 			}
 		}
@@ -191,43 +89,26 @@
 </style>
 <template>
 	<view class="container flex">
-		<d-search :btn="false" v-model="searchVal.search" popup ref="dSearch" @search="clean();">
-			<u-tabs :current="tabIndex" @change="tabIndex=$event.index" :list="[{name:'消息类型'},{name:'作物类型'}]" lineColor="#10C176" :activeStyle="{color:'#10C176'}" :inactiveStyle="{color:'#999'}" :itemStyle="{height:'60rpx'}" lineHeight="6rpx" lineWidth="96rpx"/>
-			<view class="tabs" v-if="tabIndex==0">
-				<text :class="{active:searchVal.mesType=='病害'}" @click="clean({cropType:'',mesType:'病害'})">病害</text>
-				<text :class="{active:searchVal.mesType=='虫害'}" @click="clean({cropType:'',mesType:'虫害'})">虫害</text>
-			</view>
-			<view class="tabs" v-else>
-				<text :class="{active:searchVal.cropType=='1610539208847142914'}" @click="clean({cropType:'1610539208847142914',mesType:''});$refs.dSearch.show=false">水果</text>
-				<text :class="{active:searchVal.cropType=='1610539232360411138'}" @click="clean({cropType:'1610539232360411138',mesType:''});$refs.dSearch.show=false">蔬菜</text>
-			</view>
-		</d-search>
+		
+		<view class="btns shadow bg-white">
+			<button class="cu-btn bg-white" :class="{active:searchVal.msgType==0}" @click="searchVal.msgType=0">未读</button>
+			<button class="cu-btn bg-white" :class="{active:searchVal.msgType==1}" @click="searchVal.msgType=1">已读</button>
+		</view>
+
 		<scroll-view scroll-y @scrolltolower="search">
-			<view class="card" v-for="(v,k) in list" :key="k" @click="toDetail(k)">
-				<view class="info">
-					<text class="plant-xitongxiaoxi" :class="{noRead:v.readStatus=='2'}"/>
-					<view>
-						<view class="title">
-							<text class="over">{{v.cropName}}</text>
-							<text>{{v.messageType}}</text>
-							<text class="plant-youbian"/>
-						</view>
-						<view class="tabs">
-							<text class="germinate">{{v.growthProcess_dictText}}</text>
-							<text class="organ">{{v.pestSite_dictText}}</text>
-							<text class="type">{{v.symptom_dictText}}</text>
-							<text class="read">阅读:{{v.readNum}}</text>
+			<view class="card" v-if="list.length>0">
+				<view v-for="(v,k) in list" :key="k" @click="toDetail(v)">
+					<text class="PA-news" :class="{unread:searchVal.msgType==0}"/>
+					<view class="content">
+						<view class="head">
+							<text class="name over">{{v.msgType}}</text> <text class="date">{{v.sendTime}}</text>
 						</view>
+						<view class="dec over">{{v.msgContent}}</view>
 					</view>
 				</view>
-				<view class="content">
-					<text v-if="v.cropType=='水果'" class="fruit"/>
-					<text v-if="v.cropType=='蔬菜'" class="food"/>
-					<text class="cause over">{{v.content}}</text>
-					<text class="date">{{new Date(v.sendTime).format('yyyy/MM/dd')}}</text>
-				</view>
 			</view>
 			<u-empty :show="list.length<=0" text="未查询到相关信息" width="50%" icon="/static/noData.png"/>
+			<view style="border:0.5rpx solid transparent"/>
 		</scroll-view>
 	</view>
 </template>
@@ -238,70 +119,54 @@ export default {
 		return{
 			tabIndex:0,
 			searchVal:{
+				companyId:this.$store.getters.userInfo.companyId,
+				msgType:0,
 				pageNo:1,
-				pageSize:7,
-				search:"",
-				cropType:"",
-				mesType:"",
+				pageSize:5,
 			},
 			list:[],
 			total:0,
 		}
 	},
+	watch:{
+		'searchVal.msgType'(n){
+			this.search('pageOne')
+		}
+	},
 	onLoad(){
 		this.search()
 	},
 	methods:{
-		clean(e){
-			this.total=0
-			this.list=[]
-			this.searchVal.pageNo=1
-			if(e){
-				this.searchVal.cropType=this.searchVal.cropType==e.cropType?'':e.cropType
-				this.searchVal.mesType=this.searchVal.mesType==e.mesType?'':e.mesType
+		async search(type){
+			if(type=='pageOne'){
+				this.searchVal.pageNo=1
+				this.list=[]
+				this.total=0
 			}
-			this.search()
-		},
-		async search(){
-			if(this.total==0||this.list.length<this.total){
-				var res=await request('/api/message/list',{
-					params: this.searchVal
+			if(this.total==0 ||this.list.length<this.total){
+				var res=await request("/suyuan/messageApi/queryMessageList",{
+					method:"post",
+					body: this.searchVal
 				})
 				if(res.statu){
-					this.list=this.list.concat(res.data.records)
+					this.list=this.list.concat(res.data.list)
 					this.total=res.data.total
-					this.searchVal.pageNo++
 					if(this.list.length==this.total)uni.showToast({title:"加载完成！",icon:"none"})
 				}else{
 					uni.showModal({
 						title:"提示",
-						content:res.msg||"获取信息失败！",
+						content:res.msg||"获取消息失败！",
 						showCancel:false,
 					})
 				}
 			}
 		},
-		async toDetail(index){
-			var res=await request("/api/message/getById",{params:{id:this.list[index].id}})
-			if(res.statu){
-				if(this.list[index].readStatus=='2'){
-					this.list[index].readStatus='1'
-					this.$store.state.sysMsgNum-=1
-				}
-				uni.navigateTo({
-					url:`/pages/home/newsDetail?intoPage=news`,
-					success(e){
-						e.eventChannel.emit("detail",res.data)
-					}
-				})
-			}else{
-				uni.showModal({
-					title:"提示",
-					content:res.msg||"获取信息详情失败！",
-					showCancel:false,
-				})
-			}
-		}
+		toDetail(e){
+			uni.navigateTo({
+				url:`/pages/home/newsDetail?type=${e.msgType}&msgType=${this.searchVal.msgType}`,
+				events:{update:()=>this.search('pageOne')}
+			})
+		},
 	},
 }
 </script>
diff --git a/pages/home/newsDetail.vue b/pages/home/newsDetail.vue
index 0d3b921..3ade768 100644
--- a/pages/home/newsDetail.vue
+++ b/pages/home/newsDetail.vue
@@ -1,138 +1,130 @@
 <style lang="less" scoped>
 	.container{
-		padding:0 30rpx;
-		&>view{
-			display:flex;
-			align-items: center;
-			justify-content: space-between;
-			padding:20rpx 0;
-			&+view{
-				border-top:2rpx solid rgba(216, 216, 216, 0.2);
+		height:100%;
+		background:#f6f6f6;
+		scroll-view{
+			height:100%;
+			.date{
+				margin:28rpx auto 12rpx auto;
+				text-align: center;
+				color:#999;
+				font-size:24rpx;
 			}
-			text{
-				&:first-child{
-					color:var(--b,#777);
-					margin-right:20rpx;
-				}
-				&:nth-child(2){
-					color:var(--f,#333);
-					font-size:var(--size,28rpx);
-					&.agr{
-						color:#10C176;
-						margin-top:13rpx;
-						min-height:20rpx;
+			.card{
+				margin-top:0;
+				.head{
+					display: flex;
+					align-items: center;
+					.PA-news{
+						flex-shrink: 0;
+						width:76rpx;
+						height:76rpx;
+						background:#10C176;
+						border-radius: 50%;
+						color:#fff;
+						font-size:40rpx;
+						text-align: center;
+						line-height: 76rpx;
+						box-shadow: 0 4rpx 6rpx rgba(0, 0, 0, 0.1);
+						margin-right:20rpx;
+						position:relative;
+					}
+					.type{
+						margin-right:auto;
 					}
-					&.account{
-						margin-top:13rpx;
-						padding:30rpx;
-						border-radius: 24rpx;
-						color:#999;
-						background: #F7F7F7;
-						width:calc(100% - 60rpx);
+					.name{
+						font-size:24rpx;
+						display: flex;
+						align-items: center;
+						margin-left:20rpx;
+						&:before{
+							content:"";
+							background-image: url("data:image/svg+xml,%3Csvg width='12.854980' height='14' viewBox='0 0 12.855 14' fill='none' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E %3Cg opacity='0.450000'%3E %3Cpath d='M0 12.19C0 12.22 0 12.25 0 12.28C0.01 12.31 0.02 12.34 0.03 12.36C0.04 12.39 0.05 12.42 0.06 12.45C0.08 12.48 0.1 12.51 0.12 12.54C0.14 12.57 0.16 12.6 0.19 12.63C0.21 12.66 0.24 12.68 0.27 12.71C0.3 12.74 0.34 12.77 0.37 12.8C0.41 12.82 0.44 12.85 0.48 12.88C0.52 12.91 0.57 12.93 0.61 12.96C0.66 12.99 0.7 13.01 0.75 13.04C0.8 13.07 0.86 13.09 0.91 13.12C0.96 13.14 1.02 13.17 1.08 13.19C1.14 13.22 1.2 13.24 1.26 13.26C1.32 13.29 1.39 13.31 1.45 13.33C1.52 13.36 1.59 13.38 1.66 13.4C1.73 13.42 1.8 13.44 1.88 13.47C1.95 13.49 2.03 13.51 2.11 13.53C2.18 13.55 2.26 13.57 2.35 13.58C2.43 13.6 2.51 13.62 2.59 13.64C2.68 13.66 2.76 13.67 2.85 13.69C2.94 13.71 3.03 13.72 3.12 13.74C3.21 13.75 3.3 13.77 3.39 13.78C3.49 13.8 3.58 13.81 3.67 13.82C3.77 13.83 3.87 13.85 3.96 13.86C4.06 13.87 4.16 13.88 4.26 13.89C4.36 13.9 4.46 13.91 4.56 13.92C4.66 13.93 4.76 13.93 4.86 13.94C4.96 13.95 5.07 13.95 5.17 13.96C5.27 13.97 5.38 13.97 5.48 13.98C5.58 13.98 5.69 13.98 5.79 13.99C5.9 13.99 6 13.99 6.11 13.99C6.21 13.99 6.32 14 6.42 14C6.53 14 6.63 13.99 6.74 13.99C6.84 13.99 6.95 13.99 7.05 13.99C7.16 13.98 7.26 13.98 7.37 13.98C7.47 13.97 7.57 13.97 7.68 13.96C7.78 13.95 7.88 13.95 7.98 13.94C8.09 13.93 8.19 13.93 8.29 13.92C8.39 13.91 8.49 13.9 8.59 13.89C8.69 13.88 8.79 13.87 8.88 13.86C8.98 13.85 9.08 13.83 9.17 13.82C9.27 13.81 9.36 13.8 9.45 13.78C9.55 13.77 9.64 13.75 9.73 13.74C9.82 13.72 9.91 13.71 9.99 13.69C10.08 13.67 10.17 13.66 10.25 13.64C10.34 13.62 10.42 13.6 10.5 13.58C10.58 13.57 10.66 13.55 10.74 13.53C10.82 13.51 10.89 13.49 10.97 13.47C11.04 13.44 11.11 13.42 11.18 13.4C11.26 13.38 11.32 13.36 11.39 13.33C11.46 13.31 11.52 13.29 11.59 13.26C11.65 13.24 11.71 13.22 11.77 13.19C11.83 13.17 11.88 13.14 11.94 13.12C11.99 13.09 12.04 13.07 12.09 13.04C12.14 13.01 12.19 12.99 12.23 12.96C12.28 12.93 12.32 12.91 12.36 12.88C12.4 12.85 12.44 12.82 12.47 12.8C12.51 12.77 12.54 12.74 12.57 12.71C12.6 12.68 12.63 12.66 12.66 12.63C12.68 12.6 12.71 12.57 12.73 12.54C12.75 12.51 12.77 12.48 12.78 12.45C12.8 12.42 12.81 12.39 12.82 12.36C12.83 12.34 12.84 12.31 12.84 12.28C12.85 12.25 12.85 12.22 12.85 12.19C12.85 12.16 12.85 12.13 12.84 12.1C12.84 12.07 12.83 12.04 12.82 12.01C12.81 11.98 12.8 11.95 12.78 11.92C12.77 11.89 12.75 11.86 12.73 11.83C12.71 11.81 12.68 11.78 12.66 11.75C12.63 11.72 12.6 11.69 12.57 11.66C12.54 11.63 12.51 11.61 12.47 11.58C12.44 11.55 12.4 11.52 12.36 11.5C12.32 11.47 12.28 11.44 12.23 11.41C12.19 11.39 12.14 11.36 12.09 11.34C12.04 11.31 11.99 11.28 11.94 11.26C11.88 11.23 11.83 11.21 11.77 11.18C11.71 11.16 11.65 11.13 11.59 11.11C11.52 11.09 11.46 11.06 11.39 11.04C11.32 11.02 11.26 11 11.18 10.97C11.11 10.95 11.04 10.93 10.97 10.91C10.89 10.89 10.82 10.87 10.74 10.85C10.66 10.83 10.58 10.81 10.5 10.79C10.42 10.77 10.34 10.75 10.25 10.74C10.17 10.72 10.08 10.7 9.99 10.68C9.91 10.67 9.82 10.65 9.73 10.64C9.64 10.62 9.55 10.61 9.45 10.59C9.36 10.58 9.27 10.57 9.17 10.55C9.08 10.54 8.98 10.53 8.88 10.52C8.79 10.51 8.69 10.5 8.59 10.49C8.49 10.48 8.39 10.47 8.29 10.46C8.19 10.45 8.09 10.44 7.98 10.43C7.88 10.43 7.78 10.42 7.68 10.41C7.57 10.41 7.47 10.4 7.37 10.4C7.26 10.4 7.16 10.39 7.05 10.39C6.95 10.39 6.84 10.38 6.74 10.38C6.63 10.38 6.53 10.38 6.42 10.38C6.32 10.38 6.21 10.38 6.11 10.38C6 10.38 5.9 10.39 5.79 10.39C5.69 10.39 5.58 10.4 5.48 10.4C5.38 10.4 5.27 10.41 5.17 10.41C5.07 10.42 4.96 10.43 4.86 10.43C4.76 10.44 4.66 10.45 4.56 10.46C4.46 10.47 4.36 10.48 4.26 10.49C4.16 10.5 4.06 10.51 3.96 10.52C3.87 10.53 3.77 10.54 3.67 10.55C3.58 10.57 3.49 10.58 3.39 10.59C3.3 10.61 3.21 10.62 3.12 10.64C3.03 10.65 2.94 10.67 2.85 10.68C2.76 10.7 2.68 10.72 2.59 10.74C2.51 10.75 2.43 10.77 2.35 10.79C2.26 10.81 2.18 10.83 2.11 10.85C2.03 10.87 1.95 10.89 1.88 10.91C1.8 10.93 1.73 10.95 1.66 10.97C1.59 11 1.52 11.02 1.45 11.04C1.39 11.06 1.32 11.09 1.26 11.11C1.2 11.13 1.14 11.16 1.08 11.18C1.02 11.21 0.96 11.23 0.91 11.26C0.86 11.28 0.8 11.31 0.75 11.34C0.7 11.36 0.66 11.39 0.61 11.41C0.57 11.44 0.52 11.47 0.48 11.5C0.44 11.52 0.41 11.55 0.37 11.58C0.34 11.61 0.3 11.63 0.27 11.66C0.24 11.69 0.21 11.72 0.19 11.75C0.16 11.78 0.14 11.81 0.12 11.83C0.1 11.86 0.08 11.89 0.06 11.92C0.05 11.95 0.04 11.98 0.03 12.01C0.02 12.04 0.01 12.07 0 12.1C0 12.13 0 12.16 0 12.19Z' fill='%2310C176' fill-opacity='1' fill-rule='nonzero'/%3E %3C/g%3E %3Cpath d='M11.15 4.72C11.15 2.11 9.04 0 6.42 0C3.81 0 1.69 2.11 1.69 4.72C1.69 5.84 2.08 6.86 2.72 7.67L5.58 11.88C5.97 12.44 6.8 12.45 7.19 11.89L10.07 7.74C10.75 6.92 11.15 5.87 11.15 4.72Z' fill='%2310C176' fill-rule='nonzero'/%3E %3Cpath d='M6.42 6.67C5.13 6.67 4.08 5.62 4.08 4.33C4.08 3.04 5.13 1.99 6.42 1.99C7.71 1.99 8.77 3.04 8.77 4.33C8.77 5.62 7.72 6.67 6.42 6.67ZM6.42 3.34C5.87 3.34 5.43 3.78 5.43 4.33C5.43 4.88 5.87 5.32 6.42 5.32C6.97 5.32 7.42 4.88 7.42 4.33C7.42 3.78 6.97 3.34 6.42 3.34Z' fill='%23FFF' fill-rule='nonzero'/%3E %3C/svg%3E");
+							height:14rpx*2;
+							width:13rpx*2;
+							margin-right:6rpx;
+						}
 					}
 				}
-			}
-			&.info{
-				--b:#333;
-				--f:#777;
-				--size:24rpx;
-			}
-			&.vertical{
-				flex-direction: column;
-				align-items: flex-start;
-				.imgs{
-					margin-top:15rpx;
-					min-height:160rpx;
+				.content{
+					color:#707070;
+					font-size:24rpx;
+					margin-top:20rpx;
 				}
 			}
 		}
 	}
 </style>
 <template>
-	<view class="container">
-		<template v-if="intoPage=='news'">
-			<view class="info">
-				<text>基本信息</text> <text>推送时间：{{detail.sendTime}}</text>
-			</view>
-			<view>
-				<text>品种名称</text> <text class="over">{{detail.cropName}}</text>
-			</view>
-			<view>
-				<text>作物类型</text> <text class="over">{{detail.cropType}}</text>
-			</view>
-			<view>
-				<text>生长过程</text> <text class="over">{{detail.growthProcess}}</text>
-			</view>
-			<view>
-				<text>病虫害部位</text> <text class="over">{{detail.pestSite}}</text>
-			</view>
-			<view>
-				<text>显著症状</text> <text class="over">{{detail.symptom}}</text>
-			</view>
-			<view class="vertical">
-				<text>推荐农资</text> <text class="agr">{{detail.agrMaterialsName}}</text>
-			</view>
-			<view class="vertical">
-				<text>推荐理由</text> <text class="account">{{detail.content}}</text>
-			</view>
-		</template>
-		<template v-else>
-			<view class="info">
-				<text>基本信息</text> <text>推送时间：{{detail.time}}</text>
-			</view>
-			<view>
-				<text>负责人</text> <text class="over">{{detail.principal}}</text>
-			</view>
-			<view>
-				<text>操作类型</text> <text class="over">{{detail.type}}</text>
-			</view>
-			<view>
-				<text>农资名称</text> <text class="over">{{detail.inputName}}</text>
-			</view>
-			<view>
-				<text>生长过程</text> <text class="over">{{detail.growthProcess}}</text>
-			</view>
-			<view>
-				<text>病虫害部位</text> <text class="over">{{detail.pestSite}}</text>
-			</view>
-			<view>
-				<text>显著症状</text> <text class="over">{{detail.symptom}}</text>
-			</view>
-			<view class="vertical">
-				<text>病虫名称</text> <text class="agr">{{detail.pestName}}</text>
-			</view>
-			<view class="vertical">
-				<text>凭证</text>
-				<view class="imgs">
-					<u-image v-for="(v,k) in detail.images" :key="k" width="220rpx" height="160rpx" radius="10rpx" :src="`${host}/${v}`">
-						<text slot="error" class="plant-xiaopangchetupianjiazaishibai"/>
-					</u-image>
+	<view class="container flex">
+		<scroll-view scroll-y @scrolltolower="search">
+			<view style="border:0.5rpx solid transparent"/>
+			<template v-for="(v,k) in list">
+				<view class="date" :key="k">{{v.sendTime}}</view>
+				<view class="card" :key="`_${k}`">
+					<view class="head">
+						<text class="PA-news"/>
+						<text class="type">{{v.msgType}}</text>
+						<text class="name over">{{v.baseName}}</text>
+					</view>
+					<view class="content">{{v.msgContent}}</view>
 				</view>
-			</view>
-			<view class="vertical">
-				<text>备注</text> <text class="account">{{detail.remark}}</text>
-			</view>
-		</template>
+			</template>
+			<u-empty :show="list.length<=0" text="未查询到相关信息" width="50%" icon="/static/noData.png"/>
+			<view style="border:0.5rpx solid transparent"/>
+		</scroll-view>
 	</view>
 </template>
 <script>
-import {host} from '@/common/request.js'
+import request,{host} from '@/common/request.js'
 export default {
 	data(){
 		return{
-			intoPage:"",
-			detail:{},
 			host:host('imgUrl'),
+			searchVal:{
+				companyId:this.$store.getters.userInfo.companyId,
+				msgType:0,
+				pageNo: 1,
+				pageSize: 6,
+				type: ""
+			},
+			list:[],
+			total:0,
 			eventChannel:null,
 		}
 	},
 	onLoad(options){
-		this.intoPage=options.intoPage
 		this.eventChannel=this.getOpenerEventChannel()
-		this.eventChannel.on("detail",e=>this.detail=e)
-		uni.setNavigationBarTitle({
-			title:({farming:"农事记录",news:"消息详情"})[options.intoPage]
-		})
+		this.searchVal.msgType=options.msgType
+		this.searchVal.type=options.type
+		this.search()
+	},
+	methods:{
+		async search(e){
+			if(this.total==0||this.list.length<this.total){
+				var res=await request("/suyuan/messageApi/queryMessageList",{
+					method:"post",
+					body:this.searchVal
+				})
+				if(res.statu){
+					this.list=this.list.concat(res.data.list)
+					this.searchVal.pageNo++
+					this.total=res.dta.total
+					if(this.list.length==this.total)uni.showToast({title:"加载完成！",icon:"none"})
+				}else{
+					uni.showModal({
+						title:"提示",
+						content:res.msg||"获取消息失败！",
+						showCancel:false,
+					})
+				}
+			}
+		},
+	},
+	destroyed(){
+		if(this.searchVal.msgType==0){
+			this.eventChannel.emit("update")
+		}
 	},
 }
 </script>
\ No newline at end of file
diff --git a/router/home.js b/router/home.js
index 5d5e0b9..557e1e0 100644
--- a/router/home.js
+++ b/router/home.js
@@ -91,7 +91,7 @@ module.exports=[
 	{
 		path:"pages/home/newsDetail",
 		style:{
-			navigationBarTitleText:"",
+			navigationBarTitleText:"消息详情",
 			navigationBarBackgroundColor:"#10C176",
 			navigationBarTextStyle:"white",
 			"app-plus":{
diff --git a/store/index.js b/store/index.js
index f4786bc..dd64e59 100644
--- a/store/index.js
+++ b/store/index.js
@@ -53,8 +53,15 @@ export default new Vuex.Store({
 		},
 	},
 	actions:{
-		async getSysMsg({commit,dispatch}){
-			var res=await request("/api/message/readNum",{disabledLoad:true})
+		async getSysMsg({commit,dispatch,getters}){
+			var res=await request("/suyuan/messageApi/queryMessageUnreadNum",{
+				disabledLoad:true,
+				method:"post",
+				body:{
+					companyId: getters.userInfo.companyId,
+					msgType:0,
+				}
+			})
 			if(res.statu){
 				commit("setSysMsgNum",res.data)
 			}else{
diff --git a/uni.scss b/uni.scss
index 684db2c..126e59f 100644
--- a/uni.scss
+++ b/uni.scss
@@ -85,7 +85,7 @@ $uni-font-size-paragraph:15px;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }
-@import url('https://at.alicdn.com/t/c/font_4432735_hckyohi9s2p.css');
+@import url('https://at.alicdn.com/t/c/font_4432735_14jlifn9uay.css');
 [class*=PA-]{
 	font-family: "plantApp" !important;
 	font-size: 16px;