diff --git a/.gitignore b/.gitignore
index 7dc0584..c4df731 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 **/.idea
 .idea
+/miniprogram_npm/
+/node_modules/
diff --git a/components/custom-tab-bar/index.js b/components/custom-tab-bar/index.js
index b21e30c..075ea51 100644
--- a/components/custom-tab-bar/index.js
+++ b/components/custom-tab-bar/index.js
@@ -47,7 +47,7 @@ Component({
         this.setData({
             selected: app.globalData.selected
         })
-        // secretary 书记
+        // secretary 书记 admin 管理员
         console.log( app.globalData.roleList.filter(item => item.roleKey === 'secretary'))
         if(app.globalData.roleList.length <= 0) {
 
@@ -55,13 +55,13 @@ Component({
             getOwnedRolesOfStaffId(res.data.id).then(res2 => {
                 app.globalData.user = res.data
                 this.setData({
-                    "list[2].show": res2.data.filter(item => item.roleKey === 'secretary').length > 0
+                    "list[2].show": res2.data.filter(item => item.roleKey === 'secretary' || item.roleKey === 'admin').length > 0
                 })
             })
         })
         } else {
             this.setData({
-                "list[2].show": app.globalData.roleList.filter(item => item.roleKey === 'secretary').length > 0
+                "list[2].show": app.globalData.roleList.filter(item => item.roleKey === 'secretary' || item.roleKey === 'admin').length > 0
             })
         }
         console.log(app.globalData.roleList, 'userss')
diff --git a/subpages/statistics/pages/demand/list/list.wxml b/subpages/statistics/pages/demand/list/list.wxml
index 3cf804c..c1b7277 100644
--- a/subpages/statistics/pages/demand/list/list.wxml
+++ b/subpages/statistics/pages/demand/list/list.wxml
@@ -42,7 +42,7 @@
         筛选
     </view>
 </view>
-<scroll-view bind:scrolltolower="scrolltolower" scroll-y style="height: calc(90vh - 46rpx)"
+<scroll-view bind:scrolltolower="scrolltolower" scroll-y style="height: calc(100vh - 92rpx)"
              class="statistics-container">
     <view class="card-list" wx:for="{{list}}" wx:key="{{index}}">
         <view class="content">
diff --git a/subpages/statistics/pages/dissatisfied/list/list.wxml b/subpages/statistics/pages/dissatisfied/list/list.wxml
index 10cc923..3fe3c6f 100644
--- a/subpages/statistics/pages/dissatisfied/list/list.wxml
+++ b/subpages/statistics/pages/dissatisfied/list/list.wxml
@@ -39,7 +39,7 @@
     </view>
 </view>
 <!--        bind:scrolltoupper="prevMonth"-->
-<scroll-view scroll-y style="height: calc(90vh - 46rpx)" bind:scrolltolower="nextMonth"
+<scroll-view scroll-y style="height: calc(100vh - 92rpx)" bind:scrolltolower="nextMonth"
              class="statistics-container">
     <view class="card-list" wx:for="{{list}}" wx:key="{{index}}">
         <view class="head">
diff --git a/subpages/statistics/pages/event/detail/detail.wxml b/subpages/statistics/pages/event/detail/detail.wxml
index 0852ee7..c361c31 100644
--- a/subpages/statistics/pages/event/detail/detail.wxml
+++ b/subpages/statistics/pages/event/detail/detail.wxml
@@ -6,18 +6,18 @@
             <image src="../../../images/tel.png" class="tel-btn" mode="widthFix"></image>
         </view>
         <view class="address">
-            <view class="address-name">{{detail.agencyName}}</view>
-            <view class="date">{{detail.happenTime}}</view>
+            <view class="address-name">{{detail.agencyName?detail.agencyName:''}}</view>
+            <view class="date">{{detail.happenTime?detail.happenTime:''}}</view>
         </view>
         <view class="describe">
             <view class="text">
                 {{detail.eventContent}}
             </view>
             <view class="time">上报渠道：{{detail.sourceTypeName}}</view>
-            <view class="time">事件类型：{{detail.parentCategoryName}}-{{detail.categoryName}}</view>
-            <view class="time">详细地址：{{detail.address}}</view>
-            <view class="time">办结时限：{{detail.latestOperatedTime}}</view>
-            <view class="time">满意度评价：{{detail.satisfactionName}}</view>
+            <view class="time">事件类型：{{detail.parentCategoryName?detail.parentCategoryName:''}}-{{detail.categoryName?detail.categoryName:''}}</view>
+            <view class="time">详细地址：{{detail.address?detail.address:''}}</view>
+            <view class="time">办结时限：{{detail.latestOperatedTime?detail.latestOperatedTime:''}}</view>
+            <view class="time">满意度评价：{{detail.satisfactionName?detail.satisfactionName:''}}</view>
         </view>
     </view>
 
diff --git a/subpages/statistics/pages/event/list/list.wxml b/subpages/statistics/pages/event/list/list.wxml
index e83d997..daa64bc 100644
--- a/subpages/statistics/pages/event/list/list.wxml
+++ b/subpages/statistics/pages/event/list/list.wxml
@@ -39,7 +39,7 @@
         筛选
     </view>
 </view>
-<scroll-view bind:scrolltolower="scrolltolower" scroll-y style="height: calc(90vh - 46rpx)" class="statistics-container">
+<scroll-view bind:scrolltolower="scrolltolower" scroll-y style="height: calc(100vh - 92rpx)" class="statistics-container">
     <view class="card-list" wx:for="{{list}}" wx:key="{{index}}">
         <view class="content">
             <view class="item" bind:tap="gotopage" data-id="{{item.icEventId}}">
diff --git a/subpages/statistics/pages/qzbmy/qzbmy.wxml b/subpages/statistics/pages/qzbmy/qzbmy.wxml
index e4e761f..03421b5 100644
--- a/subpages/statistics/pages/qzbmy/qzbmy.wxml
+++ b/subpages/statistics/pages/qzbmy/qzbmy.wxml
@@ -22,7 +22,7 @@
         <view class="qz-item" wx:for="{{list}}" wx:key="{{index}}">
             <view class="user-info">
                 <view class="name">{{item.name}} {{item.mobile}}</view>
-                <view class="address">{{item.agencyName}}</view>
+                <view class="address">{{item.agencyName?item.agencyName:''}}</view>
             </view>
             <view class="num-list">
                 <view class="num-item" bind:tap="gotopage" data-url="{{'/subpages/statistics/pages/sjwjj/sjwjj?id='+item.reportUserId+'&name='+item.name+'&mobile='+item.mobile+'&agencyName='+item.agencyName}}">
diff --git a/subpages/statistics/pages/xqwmz/xqwmz.wxml b/subpages/statistics/pages/xqwmz/xqwmz.wxml
index c1080d8..921027f 100644
--- a/subpages/statistics/pages/xqwmz/xqwmz.wxml
+++ b/subpages/statistics/pages/xqwmz/xqwmz.wxml
@@ -1,6 +1,6 @@
 <view class="user-info">
     <view class="name">{{name}} {{mobile}}</view>
-    <view class="address">{{agencyName}}</view>
+    <view class="address">{{agencyName&&agencyName!=='null'?agencyName:''}}</view>
 </view>
 <view class="qz-container">
     <view class="list">