diff --git a/pages/datain/datain.scss b/pages/datain/datain.scss
index 5574e6b..24bc8bc 100644
--- a/pages/datain/datain.scss
+++ b/pages/datain/datain.scss
@@ -1,6 +1,7 @@
 .page {
 	width: 100%;
-	height: 100%;
+	height: 100vh;
+	overflow: scroll;
 	background-color: #F4F4F4 !important;
 }
 .listBox{
diff --git a/pages/datain/datain.vue b/pages/datain/datain.vue
index 739ca0b..73e0cc3 100644
--- a/pages/datain/datain.vue
+++ b/pages/datain/datain.vue
@@ -1,49 +1,8 @@
 <template>
 	<view class="page">
-		<!-- <view class="listBox">
-			<view class="content">
-				<view class="user-list" v-show="!isAdmin">
-					<view class="list" @click="toData" style="background-color:#D32D25;">
-						<view class="title" style="color:white">
-							<text>表单设计</text>
-						</view>
-						<view class="more-content">
-							<view class="more-content-img">
-								<image src="../../static/right2.png"></image>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="user-list">
-					<view class="list" @click="toPostCom()">
-						<view class="title">
-							<text>企业信息采集</text>
-						</view>
-						<view class="more-content">
-							<view class="more-content-img">
-								<image src="../../static/right2.png"></image>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="user-list" style="padding-top: 0;padding-bottom: 0;" v-for="(item,index) in formList">
-					<view class="list" @click="toForm(it)" v-for="(it,index) in item.children">
-						<view class="title">
-							<text>{{it.fullName}}</text>
-						</view>
-						<view class="more-content">
-							<view class="more-content-img">
-								<image src="../../static/right2.png"></image>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view> -->
-
 		<!-- 图表 -->
 		<!-- <qiun-title-bar title="柱状图+渐变色" /> -->
-		<view class="charts-box">
+		<view class="charts-box" v-if="userId === '360267753694692613'">
 			<view class="example-body">
 				<uni-datetime-picker v-model="range" type="daterange"  @change="change" />
 			</view>
@@ -92,10 +51,60 @@
 					填报企业从业人数大览
 				</view>
 				<view class="charts">
-					<qiun-data-charts type="pie" :opts="opts2" :chartData="chartData4" />
+					<qiun-data-charts type="pie" :opts="opts2" :chartData="chartData4"/>
 				</view>
 			</view>
 		</view>
+		
+		
+		<view class="listBox" v-else>
+			<view class="content">
+				<view class="user-list" v-show="!isAdmin">
+					<view class="list" @click="toData" style="background-color:#D32D25;">
+						<view class="title" style="color:white">
+							<text>表单设计</text>
+						</view>
+						<view class="more-content">
+							<view class="more-content-img">
+								<image src="../../static/right2.png"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="user-list">
+					<view class="list" @click="toPostCom()">
+						<view class="title">
+							<text>企业信息采集</text>
+						</view>
+						<view class="more-content">
+							<view class="more-content-img">
+								<image src="../../static/right2.png"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="user-list" style="padding-top: 0;padding-bottom: 0;" v-for="(item,index) in formList">
+					<view class="list" @click="toForm(it)" v-for="(it,index) in item.children">
+						<view class="title">
+							<text>{{it.fullName}}</text>
+						</view>
+						<view class="more-content">
+							<view class="buttons">
+								<button size="mini">已选择<span>0</span>家企业</button>
+							</view>
+							<view class="buttons">
+								<button size="mini" type="warn">通知</button>
+							</view>
+							<view class="more-content-img">
+								<image src="../../static/right2.png"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		
 	</view>
 </template>
 
@@ -112,6 +121,7 @@
 				startDate: '2024-02-20',
 				// 结束日期
 				endDate: '2024-2-26',
+				isSystem:false,
 				chartsDataColumn1: {
 					categories: [],
 					series: [{
diff --git a/pages/my/messageList/messageList.vue b/pages/my/messageList/messageList.vue
index cef0b61..eb60dce 100644
--- a/pages/my/messageList/messageList.vue
+++ b/pages/my/messageList/messageList.vue
@@ -27,10 +27,11 @@
 		data() {
 			return {
 				messageList:[],
-				isAdmin:false
+				isAdmin:false,
+				baseUrl: 'http://deyanggaoxin.fengshiyun.com'
 			}
 		},
-		onLoad() {
+		onShow() {
 			this.getUser()
 			this.getNoticeTell()
 		},
@@ -109,12 +110,55 @@
 					console.log("修改已读",res)
 					if(res.code == 200){
 						console.log('成功修改')
-						uni.navigateTo({
-							url:link.link + `?data=${JSON.stringify(link.reid)}`
-						})
+						if(link.type === '公文办理通知'){
+							this.download(link.link)
+						}else{
+							uni.navigateTo({
+								url:link.link + `?data=${JSON.stringify(link.reid)}`
+							})
+						}
 					}
 				})
-			}
+			},
+			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,
+										});
+										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: '失败请重新下载',
+							});
+						},
+				});
+			},
 		}
 	}
 </script>
diff --git a/pages/official/official.vue b/pages/official/official.vue
index e1fd7dc..3033457 100644
--- a/pages/official/official.vue
+++ b/pages/official/official.vue
@@ -93,9 +93,12 @@
 		},
 		onShow() {
 			this.getUser()
-			this.getTypeOfCompany()
-			this.getTypeCompanyList('365139048618001669')
-			this.getFileList()
+			if(!this.isAdmin){
+				this.getFileList()
+			}else{
+				this.getTypeOfCompany()
+				this.getTypeCompanyList('365139048618001669')
+			}	
 			// this.getCompanyList()
 			// this.getTypeOfCompany()
 		},
@@ -401,6 +404,7 @@
 						title:'公文消息',
 						companys:this.city_ids5,
 						desc:this.noticeDesc,
+						type:'公文办理通知',
 						fangshi:'通知',
 						reid:id,
 						link:url
diff --git a/pages/postCon/postCon.vue b/pages/postCon/postCon.vue
index 39d7ad5..6975026 100644
--- a/pages/postCon/postCon.vue
+++ b/pages/postCon/postCon.vue
@@ -242,6 +242,7 @@
 						companys:this.companysId,
 						desc:this.tellInfo[1],
 						reid:id,
+						type:'党建通知',
 						link:'/pages/conDetail/conDetail',
 						fangshi:'通知'
 					}
diff --git a/pages/postNews/postNews.vue b/pages/postNews/postNews.vue
index 7ad771b..7d1dc58 100644
--- a/pages/postNews/postNews.vue
+++ b/pages/postNews/postNews.vue
@@ -274,7 +274,8 @@ import utils from '../../service/utils';
 						desc:this.tellInfo[1],
 						reid:id,
 						link:'/pages/newsDetail/newsDetail',
-						fangshi:'通知'
+						fangshi:'通知',
+						type:'新闻信息通知'
 					}
 				}).then(res=>{
 					console.log('通知结果',res)
diff --git a/pages/postNotice/postNotice.vue b/pages/postNotice/postNotice.vue
index 9c5e693..b161269 100644
--- a/pages/postNotice/postNotice.vue
+++ b/pages/postNotice/postNotice.vue
@@ -276,7 +276,8 @@ import utils from '../../service/utils';
 						desc:this.tellInfo[1],
 						reid:id,
 						link:'/pages/conDetail/conDetail',
-						fangshi:'通知'
+						fangshi:'通知',
+						type:'公示公告通知'
 					}
 				}).then(res=>{
 					console.log('通知结果',res)
diff --git a/pages/postPolicy/postPolicy.vue b/pages/postPolicy/postPolicy.vue
index 8ca78e8..f6d1613 100644
--- a/pages/postPolicy/postPolicy.vue
+++ b/pages/postPolicy/postPolicy.vue
@@ -303,7 +303,8 @@ import utils from '../../service/utils';
 						desc:this.tellInfo[1],
 						reid:id,
 						link:'/pages/policyDetail/policyDetail',
-						fangshi:'通知'
+						fangshi:'通知',
+						type:'政策法规通知'
 					}
 				}).then(res=>{
 					console.log('通知结果',res)
diff --git a/pages/recommend/postRecommend/postRecommend.vue b/pages/recommend/postRecommend/postRecommend.vue
index 0d8a205..3065661 100644
--- a/pages/recommend/postRecommend/postRecommend.vue
+++ b/pages/recommend/postRecommend/postRecommend.vue
@@ -214,7 +214,8 @@
 						desc:this.tellInfo[1],
 						reid:id,
 						link:'/pages/recommend/recommendInfo/recommendInfo',
-						fangshi:'通知'
+						fangshi:'通知',
+						type:'人才推介通知'
 					}
 				}).then(res=>{
 					console.log('通知结果',res)
diff --git a/static/2.png b/static/2.png
new file mode 100644
index 0000000..3aaf908
--- /dev/null
+++ b/static/2.png
diff --git a/static/3.png b/static/3.png
new file mode 100644
index 0000000..0a0bf7a
--- /dev/null
+++ b/static/3.png
diff --git a/static/sj.png b/static/sj.png
new file mode 100644
index 0000000..5980227
--- /dev/null
+++ b/static/sj.png
diff --git a/static/yz.png b/static/yz.png
new file mode 100644
index 0000000..ae1cd65
--- /dev/null
+++ b/static/yz.png