diff --git a/app.js b/app.js
index 2b79967..90f31a4 100644
--- a/app.js
+++ b/app.js
@@ -22,9 +22,9 @@ App({
           success: function (res) {
             if (res.data.code == 1) {
               if (res.header.hasOwnProperty('Set-Cookie')){
-                wx.setStorageSync('sessionid', res.header["Set-Cookie"])
+                that.globalData.sessionId = res.header["Set-Cookie"]
               }else{
-                wx.setStorageSync('sessionid', res.header["set-cookie"])
+                that.globalData.sessionId = res.header["set-cookie"]
               }
               that.globalData.userInfo.name = res.data.name
               that.globalData.userInfo.username = res.data.username
@@ -48,7 +48,7 @@ App({
                 url: that.globalData.serverUrl + 'api/user?a=checkaqy',
                 header: {
                   'content-type': 'application/json', // 默认值
-                  'Cookie': wx.getStorageSync("sessionid"),
+                  'Cookie': getApp().globalData.sessionId,
                 },
                 data: {},
                 success: res => {
@@ -74,7 +74,7 @@ App({
       url: that.globalData.serverUrl + 'api/check_session',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       success: res => {
         if(res.data.code!=1){
@@ -99,7 +99,8 @@ App({
     //serverUrl: 'http://10.21.28.148:8000/',
     //serverUrl: 'http://192.168.0.103:8000/',
     //serverUrl:'http://10.0.11.195:8000/',
-    timer:null //定时器
+    timer:null,//定时器
+    sessionId:null
   },
 
 })
\ No newline at end of file
diff --git a/pages/area/detail.js b/pages/area/detail.js
index 2bc8654..03f7aed 100644
--- a/pages/area/detail.js
+++ b/pages/area/detail.js
@@ -36,7 +36,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/area?a=detail&id=' + areaid,
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       success: res => {
         if (res.statusCode === 200) {
@@ -52,7 +52,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/riskact?a=listall2&area='+areaid,
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       success: res => {
         if (res.statusCode === 200) {
diff --git a/pages/area/tree.js b/pages/area/tree.js
index c820ad1..446b3d1 100644
--- a/pages/area/tree.js
+++ b/pages/area/tree.js
@@ -23,7 +23,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/area?a=tree',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
diff --git a/pages/bind/binduser.js b/pages/bind/binduser.js
index 3edd3d3..4f5b4ae 100644
--- a/pages/bind/binduser.js
+++ b/pages/bind/binduser.js
@@ -31,7 +31,6 @@ Page({
         if (res.statusCode === 200) {
           if (res.data.code == 1) {
             wx.showToast({})
-            wx.removeStorageSync('sessionid')
             getApp().globalData.userInfo = {
               userid: 0,
               username: '',
diff --git a/pages/data/detail.js b/pages/data/detail.js
index 63cf95c..061306d 100644
--- a/pages/data/detail.js
+++ b/pages/data/detail.js
@@ -60,7 +60,7 @@ Page({
       url: this.data.serverUrl + 'edu/api?a=downfile&id=' + this.data.id,
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {
       },
@@ -139,7 +139,7 @@ Page({
         url: this.data.serverUrl + 'edu/api?a=detail&id=' + id,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         data: {
         },
diff --git a/pages/data/detail.wxml b/pages/data/detail.wxml
index 0e756c4..6bac746 100644
--- a/pages/data/detail.wxml
+++ b/pages/data/detail.wxml
@@ -1,33 +1,33 @@
 <view class="page">
-    <view class="page__bd">
-        <view class="weui-article">
-            <view class="weui-article__h1">{{title}}</view>
-            <view class="weui-article__h2">分享者:
-            <span style="color:blue;font-weight:bold">{{user__ubelongpart__partname}}</span>
-            <span style="color:orange;font-weight:bold">   {{user__name}}</span>
-            </view>
-            <view class="weui-media-box__desc">下载量:
-            <span style="color:blue;font-weight:bold">{{downnum}}</span>
-            </view>
-            <view class="weui-media-box__desc">最近编辑时间:{{modifytime}}
-            </view>
-        </view>
-        <view class="weui-article">
-                    <view class="weui-article__section">
-            <span>    </span>
-            {{desciption}}
-            </view>
-            </view>
-            <view class="weui-article__p" style="text-align:center">
-          <!-- <image wx:if="{{type==1}}" src="../images/mp4.svg"></image> -->
-          <video wx:if="{{type==1}}" src="{{url}}" controls title="{{title}}" bindplay="hasRead" icon="{{poster}}"></video>
-          <image wx:elif="{{type==2}}" src="../images/word.svg"></image>
-          <image wx:elif="{{type==3}}" src="../images/ppt.svg"></image>
-          <image wx:elif="{{type==4}}" src="../images/pdf.svg"></image>
-          <image wx:elif="{{type==5}}" src="../images/excel.svg"></image>
-          <image wx:elif="{{type==6}}" src="../images/zip.svg"></image>
-          <image wx:else src="../images/file.svg"></image>
-          </view>
-          <button class="weui-btn" type="primary" bindtap="openfj" wx:if="{{isDocument}}">点击查看/下载</button>
+  <view class="page__bd">
+    <view class="weui-article">
+      <view class="weui-article__h1">{{title}}</view>
+      <view class="weui-article__h2">分享者:
+        <span style="color:blue;font-weight:bold">{{user__ubelongpart__partname}}</span>
+        <span style="color:orange;font-weight:bold"> {{user__name}}</span>
+      </view>
+      <view class="weui-media-box__desc">下载量:
+        <span style="color:blue;font-weight:bold">{{downnum}}</span>
+      </view>
+      <view class="weui-media-box__desc">最近编辑时间:{{modifytime}}
+      </view>
     </view>
-</view>
+    <view class="weui-article">
+      <view class="weui-article__section">
+        <span> </span>
+        {{desciption}}
+      </view>
+    </view>
+    <view style="text-align:center">
+      <!-- <image wx:if="{{type==1}}" src="../images/mp4.svg"></image> -->
+      <video class="videoCss" wx:if="{{type==1}}" src="{{url}}" controls title="{{title}}" bindplay="hasRead" icon="{{poster}}" ></video>
+      <image wx:elif="{{type==2}}" src="../images/word.svg"></image>
+      <image wx:elif="{{type==3}}" src="../images/ppt.svg"></image>
+      <image wx:elif="{{type==4}}" src="../images/pdf.svg"></image>
+      <image wx:elif="{{type==5}}" src="../images/excel.svg"></image>
+      <image wx:elif="{{type==6}}" src="../images/zip.svg"></image>
+      <image wx:else src="../images/file.svg"></image>
+    </view>
+    <button class="weui-btn" type="primary" bindtap="openfj" wx:if="{{isDocument}}">点击查看/下载</button>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/data/detail.wxss b/pages/data/detail.wxss
index 1068258..9db62f8 100644
--- a/pages/data/detail.wxss
+++ b/pages/data/detail.wxss
@@ -2,4 +2,7 @@
 .weui-btn{
   width:auto;
   margin: 5px;
+}
+.videoCss{
+  width:100%;
 }
\ No newline at end of file
diff --git a/pages/data/index.js b/pages/data/index.js
index 501899b..b08decf 100644
--- a/pages/data/index.js
+++ b/pages/data/index.js
@@ -29,8 +29,7 @@ Page({
    */
   onShow: function () {
     var that = this;
-    that.getDatalist(1)
-    this.data.page = 1;
+    that.onPullDownRefresh();
   },
 
   /**
@@ -83,7 +82,7 @@ Page({
         url: this.data.serverUrl + 'edu/api?a=listall&rows=10&page=' + page+'&search='+search,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
diff --git a/pages/equipment/detail.js b/pages/equipment/detail.js
index 5273f67..3c65ae6 100644
--- a/pages/equipment/detail.js
+++ b/pages/equipment/detail.js
@@ -31,7 +31,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/equipment?a=detail&id=' + equipmentid,
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
diff --git a/pages/examtest/detail.js b/pages/examtest/detail.js
index 5fece31..ba43eb1 100644
--- a/pages/examtest/detail.js
+++ b/pages/examtest/detail.js
@@ -23,7 +23,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/examtestdetail?a=detail&id='+detailid,
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       success: res => {
         if (res.statusCode === 200) {
diff --git a/pages/examtest/index.js b/pages/examtest/index.js
index 655685c..f176089 100644
--- a/pages/examtest/index.js
+++ b/pages/examtest/index.js
@@ -40,7 +40,7 @@ Page({
       url: this.data.serverUrl + 'api/examtestdetail?a=listyk&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -88,7 +88,7 @@ Page({
         url: this.data.serverUrl + 'api/examtestdetail?a=listdk&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -132,10 +132,10 @@ Page({
       title: '加载中',
     }),
       wx.request({
-        url: this.data.serverUrl + 'api/examtest?a=listall&state=open&rows=10&page=' + page,
+        url: this.data.serverUrl + 'api/examtest?a=listall&owner=yes&state=open&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -182,7 +182,7 @@ Page({
         url: this.data.serverUrl + 'api/examtest?a=listall&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -235,37 +235,23 @@ Page({
   },
   onShow: function () {
     var that = this;
-    console.log(that.data.activeIndex)
-    if (that.data.activeIndex == 0) {
-      that.getkklist(1)
-      that.data.kkpage = 1
-    }
-    else if (that.data.activeIndex == 1) {
-      that.getyklist(1)
-      that.data.page = 1
-    }
-    else if (that.data.activeIndex == 2) {
-      that.getalllist(1)
-      that.data.allpage = 1
-    }
+    that.onPullDownRefresh();
   },
   onPullDownRefresh: function () {
     var that = this;
     if (that.data.activeIndex == 0) {
       that.getkklist(1)
-      wx.stopPullDownRefresh();
       that.data.kkpage = 1
     }
     else if (that.data.activeIndex == 1) {
       that.getyklist(1)
-      wx.stopPullDownRefresh();
       that.data.page = 1
     }
     else if (that.data.activeIndex == 2) {
       that.getalllist(1)
-      wx.stopPullDownRefresh();
       that.data.allpage = 1
     }
+    wx.stopPullDownRefresh();
   },
   onReachBottom: function () {
     //上拉分页,将页码加1，然后调用分页函数
diff --git a/pages/examtest/main.js b/pages/examtest/main.js
index aa63f9f..10b960c 100644
--- a/pages/examtest/main.js
+++ b/pages/examtest/main.js
@@ -75,7 +75,7 @@ Page({
         url: getApp().globalData.serverUrl + 'api/examtest?a=detailtm&id=' + options.id,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -292,7 +292,7 @@ Page({
         url: getApp().globalData.serverUrl + 'api/examtestdetail?a=handtest&id=' + this.data.testid,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         method: 'POST',
         data: data,
diff --git a/pages/examtest/note.js b/pages/examtest/note.js
index fad3380..7765451 100644
--- a/pages/examtest/note.js
+++ b/pages/examtest/note.js
@@ -21,7 +21,7 @@ Page({
       let q = decodeURIComponent(options.q)
       if (q) {
         examtestid = util.getQueryString(q, 'id')
-        if (wx.getStorageSync('sessionid').indexOf('sessinid') != -1) {
+        if (getApp().globalData.sessionId.indexOf('sessinid') != -1) {
           this.setData({
             fromWx: true
           })
@@ -39,7 +39,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/examtest?a=detail&id='+examtestid,
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       success: res => {
         if (res.statusCode === 200) {
diff --git a/pages/examtest/note2.js b/pages/examtest/note2.js
index ddd11f0..3b275cd 100644
--- a/pages/examtest/note2.js
+++ b/pages/examtest/note2.js
@@ -31,7 +31,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/examtest?a=detail&id=' + examtestid,
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       success: res => {
         wx.hideLoading()
diff --git a/pages/examtest/rate.js b/pages/examtest/rate.js
index 157c489..04fc836 100644
--- a/pages/examtest/rate.js
+++ b/pages/examtest/rate.js
@@ -87,7 +87,7 @@ Page({
         url: this.data.serverUrl + 'api/examtestdetail?a=rate&examtestid='+this.data.examtestid + '&rows=20&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
diff --git a/pages/exercise/main.js b/pages/exercise/main.js
index b7cdbf6..7156c7a 100644
--- a/pages/exercise/main.js
+++ b/pages/exercise/main.js
@@ -93,7 +93,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/question?a=exercise',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'POST',
       data: {
diff --git a/pages/images/guanjun.svg b/pages/images/guanjun.svg
new file mode 100644
index 0000000..612f98a
--- /dev/null
+++ b/pages/images/guanjun.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="48px" height="48.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M261.6 208.5H94.7C42.4 208.5 0 251 0 303.2v115.9c0 115.3 93.5 208.2 208.2 208.2h53.4c52.2 0 94.7-42.5 94.7-94.7V303.2c0-52.2-42.5-94.7-94.7-94.7z m-16.1 323.6h-52.8c-56.2 0-101.5-45.3-101.5-101.5v-128h154.3v229.5z m422.2-228.9v229.5c0 52.2 42.5 94.7 94.7 94.7h53.4c115.3 0 208.2-93.5 208.2-208.2v-116c0-52.2-42.5-94.7-94.7-94.7H762.4c-52.2 0-94.7 42.5-94.7 94.7z m110.2-0.6h154.3v127.9c0 56.2-45.3 101.5-101.5 101.5h-52.8V302.6z m0 0" fill="#FF9600" /><path d="M469.8 683.5H557v191.6h-87.2z" fill="#FFC949" /><path d="M339 875.1h338.5v84.3H339z" fill="#FF9B01" /><path d="M277.1 953.7h461.8v56.8H277.1z" fill="#FF9B01" /><path d="M79.7 13.5h859.4v91.8H79.7z" fill="#FFC714" /><path d="M143.4 64v287.4c0 208.8 163.5 377.5 365.4 377.5 201.9 0 365.4-169.2 365.4-377.5V64H143.4z m398.4 476.2h-48.4V281.5c-19.5 18.3-43.8 31.7-72.8 39.9v-47.9c14.2-3.5 29.3-9.8 45.3-18.6 16-10.1 29-20.6 39-31.5h36.8v316.8z" fill="#FFB400" /></svg>
\ No newline at end of file
diff --git a/pages/images/jijun.svg b/pages/images/jijun.svg
new file mode 100644
index 0000000..7fe40ef
--- /dev/null
+++ b/pages/images/jijun.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="48px" height="48.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M799.786667 334.336H224.042667V16.896c0-9.301333 7.594667-16.896 16.896-16.896H782.933333c9.301333 0 16.853333 7.594667 16.853334 16.853333v317.44z" fill="#FFF7D7" /><path d="M224.042667 0h137.813333v302.592h-137.813333V0z m218.965333 0h137.813333v302.592h-137.813333V0z m218.965333 0h137.813334v302.592h-137.813334V0z" fill="#F94F46" /><path d="M85.333333 596.096c0 235.136 190.634667 425.856 425.813334 425.856a425.813333 425.813333 0 0 0 425.898666-425.813333A425.813333 425.813333 0 0 0 511.146667 170.24C275.968 170.24 85.333333 360.96 85.333333 596.096z" fill="#E8E9EA" /><path d="M213.077333 596.096a298.069333 298.069333 0 1 0 596.224 0 297.941333 297.941333 0 0 0-298.026666-297.984 298.112 298.112 0 0 0-298.197334 297.984z" fill="#A2ADB7" /><path d="M515.157333 440.746667c30.165333 0 53.888 7.04 72.362667 21.76 17.578667 14.634667 26.752 34.688 26.752 60.16 0 32.64-16.768 54.784-49.28 65.664 17.536 5.376 30.933333 13.781333 40.106667 24.661333 10.069333 11.264 15.061333 25.941333 15.061333 43.52 0 27.52-9.557333 50.176-28.458667 67.754667-20.053333 17.536-46.378667 26.752-78.122666 26.752-30.549333 0-55.210667-8.021333-73.557334-23.466667-20.864-17.578667-32.64-43.008-35.114666-76.544h45.994666c0.810667 20.053333 7.082667 35.498667 19.626667 46.378667 10.922667 10.112 25.088 15.104 42.666667 15.104 19.242667 0 34.730667-5.888 46.378666-16.768a50.346667 50.346667 0 0 0 15.488-37.248c0-17.536-5.376-30.549333-16.256-38.912-10.112-8.405333-25.088-12.586667-44.714666-12.586667h-21.76v-34.133333h21.333333c18.346667 0 32.256-4.181333 41.429333-12.074667 9.173333-7.978667 14.165333-19.626667 14.165334-34.730667 0-15.061333-4.565333-26.325333-12.970667-34.304-9.173333-8.405333-22.954667-12.074667-40.533333-12.074666-17.92 0-32.213333 4.565333-42.197334 13.738666-10.069333 9.216-16.256 22.954667-17.962666 41.429334H410.666667c2.517333-29.653333 13.397333-52.693333 33.066666-69.376 18.346667-16.853333 42.197333-24.746667 71.424-24.746667zM256.853333 354.133333a16.981333 16.981333 0 0 1-12.373333-5.376 16.938667 16.938667 0 0 1 0.682667-24.064c6.698667-6.272 13.568-12.245333 20.650666-18.048 3.413333-2.688 6.869333-5.504 10.282667-8.106666a16.896 16.896 0 0 1 23.850667 3.328 16.768 16.768 0 0 1-3.285334 23.722666c-3.2 2.432-6.314667 4.693333-9.386666 7.296-6.4 5.290667-12.8 10.666667-18.858667 16.469334a15.530667 15.530667 0 0 1-11.562667 4.778666z m613.248 216.874667a17.066667 17.066667 0 0 1-16.853333-14.677333 342.314667 342.314667 0 0 0-19.072-75.050667 347.605333 347.605333 0 0 0-168.448-188.288 347.733333 347.733333 0 0 0-306.304-4.992c-6.784 3.157333-13.354667 6.656-20.053333 10.154667a17.109333 17.109333 0 0 1-23.168-6.784 17.109333 17.109333 0 0 1 6.826666-23.168 387.925333 387.925333 0 0 1 189.44-47.488 379.946667 379.946667 0 0 1 168.832 41.6 381.824 381.824 0 0 1 185.130667 206.805333c9.856 26.538667 16.938667 54.186667 20.821333 82.218667a17.024 17.024 0 0 1-14.634666 19.2 5.845333 5.845333 0 0 1-2.517334 0.469333z" fill="#FFFFFF" /></svg>
\ No newline at end of file
diff --git a/pages/images/pdf.svg b/pages/images/pdf.svg
index d8f9cda..3afe69f 100644
--- a/pages/images/pdf.svg
+++ b/pages/images/pdf.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="32px" height="32.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#13227a" d="M163.83017 61.49775a20.478771 20.478771 0 0 0-20.478771 20.478771v860.108394a20.478771 20.478771 0 0 0 20.478771 20.478771h696.278223a20.478771 20.478771 0 0 0 20.478772-20.478771V332.698118L609.386797 61.49775H163.83017z m0-61.436314h445.556627a61.436314 61.436314 0 0 1 43.455952 18.00084L924.00216 289.242165A61.436314 61.436314 0 0 1 942.023479 332.698118v609.386797a81.915085 81.915085 0 0 1-81.915086 81.915085H163.83017a81.915085 81.915085 0 0 1-81.915085-81.915085v-860.108394a81.915085 81.915085 0 0 1 81.915085-81.915085z m472.240466 9.01066l296.942183 296.942183c19.372918 19.33196 5.652141 52.425654-21.707497 52.425655H614.363138a30.718157 30.718157 0 0 1-30.718157-30.718157v-296.942184c0-27.359638 33.093694-41.080415 52.425655-21.707497z m9.010659 95.861128v192.070396h192.070396L645.081295 104.933224zM61.436314 430.115633h901.065936a61.436314 61.436314 0 0 1 61.436314 61.436314v245.745255a61.436314 61.436314 0 0 1-61.436314 61.436314H61.436314a61.436314 61.436314 0 0 1-61.436314-61.436314v-245.745255a61.436314 61.436314 0 0 1 61.436314-61.436314z m206.937984 215.764334c29.120813 0 51.053577-6.143631 65.757334-18.471851 14.744715-12.32822 22.096594-30.431454 22.096594-54.330181 0-11.201888-1.822611-21.277443-5.447353-30.226666a59.879927 59.879927 0 0 0-15.912005-22.731436 61.927804 61.927804 0 0 0-24.881707-13.270244c-9.706938-2.764634-23.571066-4.157191-41.612863-4.157191H207.449953c-10.444173 0-18.082755 2.252665-22.874788 6.717037-4.812511 4.484851-7.208527 11.939124-7.208527 22.403776v180.786593c0 9.379277 2.191229 16.50589 6.553207 21.359358 4.382457 4.853469 10.136992 7.269964 17.284083 7.269964 6.83991 0 12.49205-2.457453 16.956422-7.372357 4.50533-4.894426 6.717037-12.082475 6.717037-21.584625V645.900446h43.517389z m197.927324-143.187569c-10.239386 0-17.652701 2.293622-22.239946 6.880868-4.587245 4.587245-6.880867 12.00056-6.880867 22.239945v171.980721c0 7.577145 0.655321 13.720777 1.986441 18.492331a18.226106 18.226106 0 0 0 8.560126 11.038058c4.382457 2.600804 10.894706 3.911445 19.516269 3.911445h61.927805a183.285003 183.285003 0 0 0 29.038897-2.088835c8.601084-1.372078 16.608284-3.768094 24.083035-7.188049 7.454273-3.419955 14.33514-7.945763 20.622123-13.597904 8.0072-7.372358 14.560406-15.707218 19.680099-25.045537 5.119693-9.33832 8.908266-19.802972 11.365718-31.434914 2.457453-11.631942 3.686179-24.472132 3.686179-38.561526 0-42.657281-12.225826-74.440334-36.657-95.349159a76.181029 76.181029 0 0 0-31.33252-16.792593c-11.529548-2.989901-25.352719-4.50533-41.449034-4.505329H466.301622z m394.216347 36.636522c7.577145 0 13.188329-1.679259 16.874507-5.037777a17.202168 17.202168 0 0 0 5.529269-13.352159c0-5.447353-1.843089-9.850289-5.529269-13.208808-3.686179-3.358518-9.317841-5.037778-16.874507-5.037778h-112.018879c-6.696558 0-12.225826 0.982981-16.546847 2.948944a18.881427 18.881427 0 0 0-9.522629 9.440713c-2.027398 4.321021-3.030858 9.891247-3.030858 16.731156v180.458933c0 9.706938 2.211707 16.956423 6.635122 21.768934 4.423415 4.792032 10.157471 7.188049 17.202168 7.188048 6.942303 0 12.614923-2.375537 17.038338-7.106133 4.423415-4.751075 6.635122-12.041518 6.635121-21.850849v-77.266404h78.228907c7.16757 0 12.553487-1.597344 16.178229-4.812512 3.624743-3.194688 5.426874-7.515709 5.426874-12.942583 0-5.447353-1.781653-9.788853-5.344959-13.044977-3.583785-3.256125-9.010659-4.873948-16.239666-4.873948h-78.228906v-60.0028h93.587985z m-375.82641 0.962503h31.352998c14.519449 0 26.888627 1.576865 37.128013 4.710117 10.239386 3.153731 18.84047 10.485131 25.82373 22.014679 7.00374 11.509069 10.485131 28.83411 10.485131 51.9956 0 32.847949-7.945763 55.988961-23.83729 69.423035a37.926684 37.926684 0 0 1-12.49205 7.208527c-4.792032 1.699738-9.420235 2.764634-13.905086 3.194689-4.484851 0.409575-10.648961 0.634842-18.553767 0.634842h-36.001679v-159.181489z m-227.826331-1.925005c21.216007 0 35.243965 3.481391 42.083875 10.403216 6.082195 6.512249 9.113053 14.929024 9.113053 25.270804 0 8.642041-1.965962 15.625302-5.938843 20.970261-3.931924 5.324481-9.66598 9.17449-17.181689 11.50907-7.515709 2.355059-16.874508 3.522349-28.076396 3.522348H224.856909v-71.675699h32.008319z"  /></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="48px" height="48.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M535.405714 0h69.485715v95.817143h373.028571a39.497143 39.497143 0 0 1 46.08 35.84 20.48 20.48 0 0 1 0 9.508571v703.634286a151.405714 151.405714 0 0 1-10.971429 73.142857 98.011429 98.011429 0 0 1-59.245714 10.971429H604.891429V1024h-73.142858c-177.005714-32.914286-354.011429-63.634286-531.748571-95.085714V95.817143C178.468571 63.634286 356.937143 32.914286 535.405714 0z" fill="#A33639" /><path d="M604.891429 130.925714h383.268571v762.148572H604.891429v-95.085715h302.08v-47.542857H604.891429v-59.977143h302.08V643.657143H604.891429V585.142857h302.08v-49.005714H604.891429v-59.977143h302.08v-46.811429H604.891429v-59.977142h302.08V321.828571H604.891429v-59.977142h302.08v597.577142H604.891429z" fill="#FFFFFF" /><path d="M645.12 529.554286H950.857143v48.274285H645.12z m0 81.92H950.857143V658.285714H645.12z m0 81.92H950.857143v47.542857H645.12z m-49.005714 81.92H950.857143v47.542857H596.114286z" fill="#A33639" /><path d="M180.662857 317.44c59.245714 0 130.925714-24.137143 180.662857 21.211429a139.702857 139.702857 0 0 1-35.108571 201.142857 166.765714 166.765714 0 0 1-80.457143 10.24v130.925714l-65.097143-5.851429c-0.731429-119.222857-1.462857-236.251429 0-357.668571z" fill="#FFFFFF" /><path d="M245.76 378.148571c21.211429 0 47.542857-5.12 62.171429 15.36a80.457143 80.457143 0 0 1 0 73.142858c-12.434286 22.674286-40.228571 21.211429-62.171429 23.405714-0.731429-37.302857-0.731429-74.605714 0-111.908572z m640 0a81.92 81.92 0 0 1-48.274286-19.748571 423.497143 423.497143 0 0 0-78.262857 24.868571c-19.748571 35.84-38.765714 54.125714-54.857143 54.125715a23.405714 23.405714 0 0 1-10.24 0 20.48 20.48 0 0 1-10.971428-18.285715c0-5.851429 0-21.942857 62.902857-49.005714A446.171429 446.171429 0 0 0 781.165714 292.571429c-8.045714-15.36-24.868571-54.125714-13.165714-73.142858a19.748571 19.748571 0 0 1 19.748571-10.24 23.405714 23.405714 0 0 1 17.554286 8.045715c8.045714 11.702857 7.314286 36.571429 0 73.142857a189.44 189.44 0 0 0 40.96 51.931428 365.714286 365.714286 0 0 1 40.96-4.388571c30.72 0 35.108571 15.36 34.377143 23.405714 0 22.674286-21.211429 22.674286-32.182857 22.674286z m-185.051429 41.691429a40.228571 40.228571 0 0 0 24.137143-16.822857 59.977143 59.977143 0 0 0-24.137143 19.017143zM793.6 219.428571a50.468571 50.468571 0 0 0 3.657143 34.377143 50.468571 50.468571 0 0 0-3.657143-34.377143z m0 95.817143a430.811429 430.811429 0 0 1-17.554286 42.422857 365.714286 365.714286 0 0 1 40.228572-12.434285 228.205714 228.205714 0 0 1-24.137143-29.988572z m94.354286 34.377143a73.142857 73.142857 0 0 0-17.554286 0 40.228571 40.228571 0 0 0 20.48 6.582857 22.674286 22.674286 0 0 0 13.897143 0s0-6.582857-16.822857-6.582857z" fill="#A33639" /></svg>
\ No newline at end of file
diff --git a/pages/images/ppt.svg b/pages/images/ppt.svg
index 9f1ad7a..ea6c816 100644
--- a/pages/images/ppt.svg
+++ b/pages/images/ppt.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="32px" height="32.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#13227a" d="M906.24 316.8v-3.84a28.16 28.16 0 0 0-7.04-12.8l-256-256a28.16 28.16 0 0 0-12.8-7.04h-428.8a84.48 84.48 0 0 0-85.12 83.84v782.08a84.48 84.48 0 0 0 84.48 84.48h621.44a84.48 84.48 0 0 0 84.48-84.48V320a27.52 27.52 0 0 0-0.64-3.2z m-95.36-24.32h-159.36v-160z m11.52 640h-620.8a28.16 28.16 0 0 1-28.16-28.16V120.96a28.16 28.16 0 0 1 28.16-28.16H595.2V320a28.16 28.16 0 0 0 28.16 28.16h227.84v554.88a28.16 28.16 0 0 1-28.8 28.16z"  /><path fill="#13227a" d="M519.68 476.8H416.64v298.88h64V672H512a123.52 123.52 0 0 0 84.48-26.24 90.88 90.88 0 0 0 33.92-73.6q0.64-95.36-110.72-95.36z m-11.52 145.92h-27.52v-96h28.16q55.68 0 55.68 48t-56.32 48z"  /></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="48px" height="48.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M583.256 289.284c93.237 0.45 186.561-0.825 279.797 0 9.396-0.916 18.767 1.843 25.372 7.47 6.609 5.625 9.707 13.48 8.381 21.266 1.535 138.581 0 277.235 0.904 415.886-0.904 15.008 1.714 31.588-8.395 45.018-12.726 7.503-29.242 6.827-44.226 7.503-87.187-0.375-174.371 0-261.741 0l-0.092-497.143z m-49.458-66.776" fill="#B2B2B2" /><path d="M589.105 201.914h321.756v608.691H589.105v-79.832h234.052v-39.864H589.105v-50.466h234.052v-39.36h-233.95v-58.639c38.656 12.213 82.658 11.911 117.176-11.812 37.345-22.706 56.822-65.902 60.051-108.998H638.058c0-43.398 0.504-86.796-0.806-130.096-16.049 3.13-31.997 6.561-47.941 10.093l-0.206-99.717zM238.688 345.736c52.988 2.624 117.079-21.396 161.481 19.174 41.988 52.283 30.888 148.264-31.387 179.45-22.103 11.606-47.535 10.091-71.558 9.181v117.078l-58.033-4.941c-1.509-106.582-1.714-213.263-0.503-319.942z m0 0" fill="#FFFFFF" /><path d="M657.534 270.444c69.717 5.189 124.714 61.39 128.381 131.206-42.793 0.503-85.585 0-128.479 0 0.098-43.902 0.098-87.401 0.098-131.206zM296.618 399.73c19.179-0.807 42.999-4.44 55.919 14.029a73.678 73.678 0 0 1 1.309 65.502c-11.104 20.185-36.231 18.47-55.713 20.892-2.018-33.407-1.818-66.814-1.515-100.423z m643.109-189.136a34.107 34.107 0 0 0-37.746-38.653c-104.259-1.109-208.616 0.605-312.875 0V82.115h-55.308c-150.583 26.242-301.064 53.393-451.545 80.036v698.415c148.766 26.748 297.635 52.075 446.401 79.432h60.554V840.68c97.699 0 195.194-0.503 292.688 0 16.756-0.908 35.226 0 49.455-10.093 11.303-18.062 8.377-40.368 9.388-60.554-1.012-186.511 0.703-373.024-1.012-559.439zM368.782 544.36c-22.103 11.606-47.535 10.091-71.558 9.181v117.078l-58.033-4.941c-1.51-106.582-1.715-213.263-0.504-319.942 52.988 2.624 117.079-21.396 161.481 19.174 41.989 52.283 30.889 148.264-31.386 179.45z m542.079 266.244H589.105v-79.832h234.052v-39.864H589.105v-50.466l0.102-39.36v-58.639l0.104-240.813-0.205-99.717h321.756v608.691z" fill="#D24625" /></svg>
\ No newline at end of file
diff --git a/pages/images/word.svg b/pages/images/word.svg
index 5eb6535..64fbba3 100644
--- a/pages/images/word.svg
+++ b/pages/images/word.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="32px" height="32.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M183.3 63.9c-11.2 0-23.2 4.5-31.4 13.4-8.2 9-13.4 20.2-13.4 31.4v806.6c0 11.2 4.5 23.2 13.4 31.4 9 9 20.2 13.4 31.4 13.4h657.2c11.2 0 23.2-4.5 31.4-13.4 9-9 13.4-20.2 13.4-31.4V317.8L631.4 63.9H183.3z m0 0" fill="#6CCBFF" /><path d="M885.3 317.8H676.2c-11.2 0-23.2-4.5-31.4-13.4-9-8.2-13.4-20.2-13.4-31.4V63.9l253.9 253.9z m0 0" fill="#C4EAFF" /><path d="M295.5 365.3H356L416.5 593h0.7l66.4-227.7h58.2L609 593l61.2-227.7h58.2l-89.6 293.3h-60.5L512 433.3h-0.7L444.1 658h-60.5l-88.1-292.7z m0 0" fill="#FFFFFF" /></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="48px" height="48.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#333333" d="M535.130353 0h69.571765v95.292235c124.536471 1.084235 248.922353-1.325176 373.157647 1.084236a40.448 40.448 0 0 1 44.935529 45.537882c2.048 234.676706 0 469.835294 1.204706 704.150588-1.204706 24.094118 2.288941 50.718118-11.324235 72.282353-16.986353 12.047059-38.881882 10.842353-58.729412 12.047059H604.702118V1024h-72.282353C354.996706 991.352471 177.513412 960.993882 0 929.189647V95.533176C178.326588 63.608471 356.773647 32.527059 535.130353 0z m52.464941 116.374588v83.968h307.2v47.947294h-307.2v60.084706h307.2v47.314824h-307.2v60.687059h307.2v46.742588h-307.2v60.656941h307.2v48.549647h-307.2v59.482353h307.2v48.549647h-307.2v59.452235h307.2v48.549647h-307.2v96.015059h389.872941v-768H587.595294z m-369.543529 212.028236c-17.016471 78.516706-34.032941 156.912941-50.386824 235.429647-10.661647-76.589176-24.485647-152.696471-36.713412-229.135059-20.660706 0.722824-40.96 1.566118-61.138823 2.56 18.462118 105.833412 41.562353 210.823529 61.138823 316.385882 22.889412 1.596235 45.628235 2.921412 68.367059 4.126118 15.781647-76.950588 33.731765-153.750588 47.585883-231.30353 14.064941 79.721412 32.286118 158.72 48.670117 238.351059 23.702588-1.204706 52.946824 9.216 72.643765-1.204706 29.214118-115.561412 52.585412-232.899765 79.36-349.184-23.612235 1.445647-47.224471 2.800941-70.806588 3.644236-14.305882 83.124706-29.123765 166.159059-42.465883 249.524705-17.106824-80.835765-33.129412-161.641412-48.880941-242.748235-22.497882 1.234824-44.875294 2.198588-67.403294 3.553883z"  /></svg>
\ No newline at end of file
diff --git a/pages/images/yajun.svg b/pages/images/yajun.svg
new file mode 100644
index 0000000..1b7c8f6
--- /dev/null
+++ b/pages/images/yajun.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="48px" height="48.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M800.9 335H224V16.9C224 7.6 231.6 0 240.9 0H784c9.3 0 16.9 7.6 16.9 16.9V335z" fill="#FFF7D7" /><path d="M224 0h138.1v303.2H224V0z m219.4 0h138.1v303.2H443.4V0z m219.4 0h138.1v303.2H662.8V0z" fill="#F94F46" /><path d="M85 597.3C85 832.9 276 1024 511.7 1024s426.7-191 426.7-426.7-191-426.7-426.7-426.7S85 361.7 85 597.3z" fill="#F3CA7E" /><path d="M213 597.3C213 704 269.9 802.6 362.4 856c92.4 53.3 206.2 53.3 298.6 0 92.4-53.3 149.4-152 149.4-258.7 0-165-133.7-298.6-298.6-298.6S213 432.3 213 597.3z" fill="#E98F36" /><path d="M517.4 441.6c28.5 0 52.4 8 70.8 24.7 18 16.8 27.2 38.1 27.2 64.5 0 26-10.1 49.4-29.3 70.8-11.7 12.1-32.3 28.1-62 48.2-32.3 21.4-51.5 40.2-57.8 56.6h149.6v40.2H409.8c0-29.7 9.6-55.7 29.7-78.3 10.9-13 33.5-31 67.4-54.5 20.1-14.2 34.4-25.6 42.7-34.4 13.4-15.1 20.5-31.4 20.5-49 0-16.8-4.6-29.3-13.8-37.7-9.2-8.4-23-12.6-40.6-12.6-18.9 0-33.1 6.3-42.7 19.3-10 12.6-15.1 30.6-15.9 54.9h-45.7c0.4-33.5 10.1-60.3 28.9-80.4 19.3-21.8 45.3-32.3 77.1-32.3zM256.8 354.9c-4.5 0-9-1.8-12.4-5.4-6.5-6.9-6.2-17.7 0.7-24.1 6.7-6.3 13.6-12.3 20.7-18.1 3.4-2.7 6.9-5.5 10.3-8.1 7.6-5.8 18.3-4.2 23.9 3.3 5.8 7.6 4.2 18.3-3.3 23.8-3.2 2.4-6.3 4.7-9.4 7.3-6.4 5.3-12.8 10.7-18.9 16.5-3.2 3.4-7.4 4.8-11.6 4.8z m614.5 217.3c-8.4 0-15.7-6.2-16.9-14.7-3.5-25.7-9.9-50.9-19.1-75.2-30.7-82-90.8-149.1-168.8-188.7-48.3-24.5-100.3-37.4-154-38.1-52.5-0.7-105.2 10.8-152.9 33.1-6.8 3.2-13.4 6.7-20.1 10.2-8.2 4.5-18.6 1.5-23.2-6.8-4.5-8.2-1.5-18.6 6.8-23.2 7.2-4 14.7-7.8 22-11.2 52.2-24.4 110.1-37 167.8-36.4 59.1 0.7 116 14.7 169.2 41.7 85.9 43.7 151.8 117.2 185.5 207.2 9.9 26.6 17 54.3 20.9 82.4 1.2 9.4-5.3 18-14.7 19.2-0.9 0.4-1.7 0.5-2.5 0.5z" fill="#FFFFFF" /></svg>
\ No newline at end of file
diff --git a/pages/inspect/add.js b/pages/inspect/add.js
index 638ef5b..315891a 100644
--- a/pages/inspect/add.js
+++ b/pages/inspect/add.js
@@ -27,7 +27,7 @@ Page({
       url: this.data.serverUrl + 'api/equipment?a=detail&id=' + id,
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       success: res => {
         if (res.statusCode === 200) {
@@ -39,7 +39,7 @@ Page({
             url: this.data.serverUrl + 'api/risk?a=steps&type=equipment',
             header: {
               'content-type': 'application/json', // 默认值
-              'Cookie': wx.getStorageSync("sessionid"),
+              'Cookie': getApp().globalData.sessionId,
             },
             method:'post',
             data:{'name':res.data.name,'id':res.data.id,'areaid':res.data.area__id},
@@ -71,7 +71,7 @@ submit:function(){
     url: this.data.serverUrl + 'api/inspect?a=add',
     header: {
       'content-type': 'application/json', // 默认值
-      'Cookie': wx.getStorageSync("sessionid"),
+      'Cookie': getApp().globalData.sessionId,
     },
     method:'POST',
     data:data,
diff --git a/pages/inspect/detail.js b/pages/inspect/detail.js
index 8dc9ef2..f5b0374 100644
--- a/pages/inspect/detail.js
+++ b/pages/inspect/detail.js
@@ -16,7 +16,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/inspect?a=detail&id='+options.id,
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'GET',
       success: res => {
diff --git a/pages/inspect/index.js b/pages/inspect/index.js
index ffe8b33..bf588cd 100644
--- a/pages/inspect/index.js
+++ b/pages/inspect/index.js
@@ -29,8 +29,7 @@ Page({
    */
   onShow: function () {
     var that = this;
-    that.getXjlist(1)
-    this.data.page = 1;
+    that.onPullDownRefresh();
   },
 
   /**
@@ -103,7 +102,7 @@ Page({
         url: this.data.serverUrl + 'api/inspect?a=listall&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
diff --git a/pages/main/main.js b/pages/main/main.js
index 42e5c3a..228bafe 100644
--- a/pages/main/main.js
+++ b/pages/main/main.js
@@ -94,7 +94,7 @@ Page({
   onShow: function () {
     var that = this
 
-      if (wx.getStorageSync('sessionid').indexOf('sessionid') != -1) {
+    if ((getApp().globalData.sessionId != null) && (getApp().globalData.sessionId.indexOf('sessionid') != -1)) {
         that.getNew()
       }
       else {
@@ -163,7 +163,7 @@ Page({
       url: this.data.serverUrl + 'api/notice?a=noreadnum',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -183,7 +183,7 @@ Page({
       url: this.data.serverUrl + 'troublehandle?a=todonum',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -203,7 +203,7 @@ Page({
       url: this.data.serverUrl + 'api/operation?a=todonum',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -223,7 +223,7 @@ Page({
       url: this.data.serverUrl + 'pxhandle?a=dqdnum',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -243,7 +243,7 @@ Page({
       url: this.data.serverUrl + 'api/examtest?a=dknum',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -263,7 +263,7 @@ Page({
       url: this.data.serverUrl + 'gchandle?a=noreadnum',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -283,7 +283,7 @@ Page({
       url: this.data.serverUrl + 'api/miss?a=noreadnum',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -303,7 +303,7 @@ Page({
       url: this.data.serverUrl + 'api/suggest?a=todonum',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -323,7 +323,7 @@ Page({
       url: this.data.serverUrl + 'api/riskacttask?a=todonum',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
diff --git a/pages/miss/addmiss.js b/pages/miss/addmiss.js
index fbf20c4..c63be30 100644
--- a/pages/miss/addmiss.js
+++ b/pages/miss/addmiss.js
@@ -51,7 +51,7 @@ Page({
       wx.uploadFile({
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         url: getApp().globalData.serverUrl + 'upfile',
         filePath: that.data.missimg[x],
@@ -87,7 +87,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/miss?a=add',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'POST',
       data: wsdata,
diff --git a/pages/miss/miss.js b/pages/miss/miss.js
index 351327e..f833262 100644
--- a/pages/miss/miss.js
+++ b/pages/miss/miss.js
@@ -29,8 +29,7 @@ Page({
    */
   onShow: function () {
     var that = this;
-    that.getWslist(1)
-    this.data.page = 1;
+    that.onPullDownRefresh();
   },
 
   /**
@@ -83,7 +82,7 @@ Page({
         url: this.data.serverUrl + 'api/miss?a=listall&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
diff --git a/pages/miss/missdetail.js b/pages/miss/missdetail.js
index 7c5cacc..674333f 100644
--- a/pages/miss/missdetail.js
+++ b/pages/miss/missdetail.js
@@ -80,7 +80,7 @@ Page({
         url: this.data.serverUrl + 'api/miss?a=detail&missid=' + missid,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         data: {
         },
diff --git a/pages/notice/detail.js b/pages/notice/detail.js
index 2a3e8c3..fcd3f8a 100644
--- a/pages/notice/detail.js
+++ b/pages/notice/detail.js
@@ -115,7 +115,7 @@ Page({
         url: this.data.serverUrl + 'api/notice?a=detail&id=' + id,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         data: {
         },
diff --git a/pages/notice/notice.js b/pages/notice/notice.js
index 3a6f9d1..73155d1 100644
--- a/pages/notice/notice.js
+++ b/pages/notice/notice.js
@@ -29,8 +29,7 @@ Page({
    */
   onShow: function () {
     var that = this;
-    that.getTzlist(1)
-    this.data.page = 1;
+    that.onPullDownRefresh();
   },
 
   /**
@@ -83,7 +82,7 @@ Page({
       url: this.data.serverUrl + 'api/notice?a=listtome&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
diff --git a/pages/observe/addobserve.js b/pages/observe/addobserve.js
index 44643cb..3fc5057 100644
--- a/pages/observe/addobserve.js
+++ b/pages/observe/addobserve.js
@@ -178,7 +178,7 @@ Page({
       url: getApp().globalData.serverUrl + 'gchandle?a=getdics',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -231,7 +231,7 @@ Page({
       wx.uploadFile({
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         url: getApp().globalData.serverUrl + 'upfile',
         filePath: that.data.lookimg[x],
@@ -270,7 +270,7 @@ Page({
       url: getApp().globalData.serverUrl + 'gchandle?a=add',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'POST',
       data: gcdata,
diff --git a/pages/observe/observe.js b/pages/observe/observe.js
index 6607ea8..fc39142 100644
--- a/pages/observe/observe.js
+++ b/pages/observe/observe.js
@@ -29,8 +29,7 @@ Page({
    */
   onShow: function () {
     var that = this;
-    that.getGclist(1)
-    this.data.page = 1;
+    that.onPullDownRefresh();
   },
 
   /**
@@ -83,7 +82,7 @@ Page({
         url: this.data.serverUrl + 'gchandle?a=listall&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
diff --git a/pages/observe/observedetail.js b/pages/observe/observedetail.js
index afb7ec6..10005aa 100644
--- a/pages/observe/observedetail.js
+++ b/pages/observe/observedetail.js
@@ -80,7 +80,7 @@ Page({
       url: this.data.serverUrl + 'gchandle?a=detail&lookid=' + lookid,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         data: {
         },
diff --git a/pages/operation/list.js b/pages/operation/list.js
index 9c56bd3..eb8c15d 100644
--- a/pages/operation/list.js
+++ b/pages/operation/list.js
@@ -12,7 +12,7 @@ Page({
       url: getApp().globalData.serverUrl + 'getdickey?dicclass=33',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'GET',
       success: res => {
diff --git a/pages/operation/operation.js b/pages/operation/operation.js
index 84cc98a..b5230da 100644
--- a/pages/operation/operation.js
+++ b/pages/operation/operation.js
@@ -39,7 +39,7 @@ Page({
         url: this.data.serverUrl + 'api/operation?a=listall&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -84,7 +84,7 @@ Page({
         url: this.data.serverUrl + 'api/operation?a=listself&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -129,7 +129,7 @@ Page({
         url: this.data.serverUrl + 'api/operation?a=listtodo&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -182,19 +182,7 @@ Page({
   },
   onShow: function () {
     var that = this;
-    console.log(that.data.activeIndex)
-    if (that.data.activeIndex == 0) {
-      that.getmyZylist(1)
-      that.data.mypage = 1
-    }
-    else if (that.data.activeIndex == 1) {
-      that.gettodoZylist(1)
-      that.data.todopage = 1
-    }
-    else if (that.data.activeIndex == 2) {
-      that.getallZylist(1)
-      that.data.page = 1
-    }
+    that.onPullDownRefresh();
   },
   onPullDownRefresh: function () {
     var that = this;
diff --git a/pages/operation/operationadd.js b/pages/operation/operationadd.js
index 416a5b6..efaa650 100644
--- a/pages/operation/operationadd.js
+++ b/pages/operation/operationadd.js
@@ -70,7 +70,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/fxcs?a=listall&zylx='+zylx,
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'GET',
       success: res => {
@@ -268,7 +268,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/operation?a=getspr12',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'POST',
       data: {'sdbm':this.data.sdbm},
@@ -328,7 +328,7 @@ Page({
       wx.uploadFile({
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         url: getApp().globalData.serverUrl + 'upfile',
         filePath: that.data.zyimg[x],
@@ -383,7 +383,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/operation?a=add',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'POST',
       data: zydata,
diff --git a/pages/operation/operationcheck.js b/pages/operation/operationcheck.js
index 8eb1384..6e51f9e 100644
--- a/pages/operation/operationcheck.js
+++ b/pages/operation/operationcheck.js
@@ -20,7 +20,7 @@ Page({
         url: this.data.serverUrl + 'api/operation?a=detail&zyid=' + zyid,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         data: {},
         success: res => {
@@ -125,7 +125,7 @@ Page({
       url: that.data.serverUrl + 'api/operation?a=qrzy',
       header: {
         'content-type': 'aapplication/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'POST',
       data: {'zyid':that.data.zyid},
@@ -148,7 +148,7 @@ Page({
       url: that.data.serverUrl + 'api/operation?a=spzy',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'POST',
       data: { 'zyid': that.data.zyid },
@@ -214,7 +214,7 @@ Page({
       wx.uploadFile({
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         url: getApp().globalData.serverUrl + 'upfile',
         filePath: that.data.zyimg2[x],
@@ -245,7 +245,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/operation?a=gbzy',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'POST',
       data: zydata,
@@ -266,7 +266,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/operation?a=spzy',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'POST',
       data: { 'zyid': that.data.zyid, 'zjsp': true, 'newsprs': that.data.spry },
@@ -297,7 +297,7 @@ Page({
               url: that.data.serverUrl + 'api/operation?a=spzy',
               header: {
                 'content-type': 'application/json', // 
-                'Cookie': wx.getStorageSync("sessionid"),
+                'Cookie': getApp().globalData.sessionId,
               },
               method: 'POST',
               data: { 'zyid': that.data.zyid ,'zzsp':true},
diff --git a/pages/operation/operationdetail.js b/pages/operation/operationdetail.js
index 77f8e9d..1986453 100644
--- a/pages/operation/operationdetail.js
+++ b/pages/operation/operationdetail.js
@@ -28,7 +28,7 @@ Page({
         url: this.data.serverUrl + 'api/operation?a=detail&zyid=' + zyid,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         data: {},
         success: res => {
diff --git a/pages/parttree/index.js b/pages/parttree/index.js
index cd95411..b99d934 100644
--- a/pages/parttree/index.js
+++ b/pages/parttree/index.js
@@ -23,7 +23,7 @@ Page({
       url: getApp().globalData.serverUrl + 'getuser?a=combobox&partid='+e.detail.id,
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -91,7 +91,7 @@ Page({
       url: getApp().globalData.serverUrl + 'parthandle?a='+strurl,
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
diff --git a/pages/public/detail.js b/pages/public/detail.js
index 3b7fe95..10074e6 100644
--- a/pages/public/detail.js
+++ b/pages/public/detail.js
@@ -118,7 +118,7 @@ Page({
         url: this.data.serverUrl + 'api/notice?a=detail&id=' + id,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         data: {
         },
diff --git a/pages/public/public.js b/pages/public/public.js
index 0699bd1..e366268 100644
--- a/pages/public/public.js
+++ b/pages/public/public.js
@@ -29,8 +29,7 @@ Page({
    */
   onShow: function () {
     var that = this;
-    that.getGglist(1)
-    this.data.page = 1;
+    that.onPullDownRefresh();
   },
 
   /**
@@ -83,7 +82,7 @@ Page({
         url: this.data.serverUrl + 'api/notice?a=listpublic&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
diff --git a/pages/questioncat/index.js b/pages/questioncat/index.js
index fe96fa0..2d49e26 100644
--- a/pages/questioncat/index.js
+++ b/pages/questioncat/index.js
@@ -28,7 +28,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/questioncat?a=tree',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -112,7 +112,7 @@ Page({
   //     url: getApp().globalData.serverUrl + 'api/partuser?a=getall&parentid=' + item.id,
   //     header: {
   //       'content-type': 'application/json', // 默认值
-  //       'Cookie': wx.getStorageSync("sessionid"),
+  //       'Cookie': getApp().globalData.sessionId,
   //     },
   //     data: {},
   //     success: res => {
diff --git a/pages/risk/detail.js b/pages/risk/detail.js
index bb92b73..0600120 100644
--- a/pages/risk/detail.js
+++ b/pages/risk/detail.js
@@ -19,7 +19,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/risk?a=detail&id=' + options.id,
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
diff --git a/pages/risk/myindex.js b/pages/risk/myindex.js
index c8699aa..d5426f6 100644
--- a/pages/risk/myindex.js
+++ b/pages/risk/myindex.js
@@ -23,7 +23,7 @@ Page({
       url: url,
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'GET',
       success: res => {
diff --git a/pages/riskact/check.js b/pages/riskact/check.js
index 49b90ea..c6b693a 100644
--- a/pages/riskact/check.js
+++ b/pages/riskact/check.js
@@ -27,7 +27,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/risk?a=listall&riskact=' + this.data.riskact,
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       success: res => {
         if (res.statusCode === 200) {
@@ -115,7 +115,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/riskcheck2?a=add',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'POST',
       data: data,
diff --git a/pages/riskact/detail.js b/pages/riskact/detail.js
index 6c6bc30..3b0d369 100644
--- a/pages/riskact/detail.js
+++ b/pages/riskact/detail.js
@@ -34,7 +34,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/riskact?a=detail&id=' + riskactid,
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'GET',
       success: res => {
diff --git a/pages/riskact/index.js b/pages/riskact/index.js
index 0d4342d..a595df6 100644
--- a/pages/riskact/index.js
+++ b/pages/riskact/index.js
@@ -165,7 +165,7 @@ Page({
         url: this.data.serverUrl + 'api/riskact?a=listall&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -210,7 +210,7 @@ Page({
         url: this.data.serverUrl + 'api/riskacttask?a=listself&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
diff --git a/pages/riskact/index2.js b/pages/riskact/index2.js
index ccab0a9..24cff2d 100644
--- a/pages/riskact/index2.js
+++ b/pages/riskact/index2.js
@@ -78,7 +78,7 @@ Page({
         url: this.data.serverUrl + 'api/riskact?a=listself&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
diff --git a/pages/risktask/detail.js b/pages/risktask/detail.js
index 57d0058..e6b7539 100644
--- a/pages/risktask/detail.js
+++ b/pages/risktask/detail.js
@@ -25,7 +25,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/riskcheck2?a=listall&riskacttask=' + this.data.id,
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       success: res => {
         if (res.statusCode === 200) {
diff --git a/pages/risktask/index.js b/pages/risktask/index.js
index dc817d5..df2c608 100644
--- a/pages/risktask/index.js
+++ b/pages/risktask/index.js
@@ -60,19 +60,7 @@ Page({
    */
   onShow: function () {
     var that = this;
-    console.log(that.data.activeIndex)
-    if (that.data.activeIndex == 0) {
-      that.getmylist(1)
-      that.data.mypage = 1
-    }
-    else if (that.data.activeIndex == 1) {
-      that.gettodolist(1)
-      that.data.todopage = 1
-    }
-    else if (that.data.activeIndex == 2) {
-      that.getalllist(1)
-      this.data.page = 1;
-    }
+    that.onPullDownRefresh();
 
   },
 
@@ -148,7 +136,7 @@ Page({
       url: this.data.serverUrl + 'api/riskacttask?a=listalltodo&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -193,7 +181,7 @@ Page({
         url: this.data.serverUrl + 'api/riskacttask?a=listself&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -250,7 +238,7 @@ Page({
         url: this.data.serverUrl + 'api/riskacttask?a=listmytodo&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
diff --git a/pages/safecert/detail.js b/pages/safecert/detail.js
index 8e75452..d28de30 100644
--- a/pages/safecert/detail.js
+++ b/pages/safecert/detail.js
@@ -70,7 +70,7 @@ Page({
         url: this.data.serverUrl + 'api/safecert?a=detail&id=' + id,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         data: {
         },
diff --git a/pages/safecert/index.js b/pages/safecert/index.js
index 80d3f01..0c7a3f3 100644
--- a/pages/safecert/index.js
+++ b/pages/safecert/index.js
@@ -67,7 +67,7 @@ Page({
         url: getApp().globalData.serverUrl + 'api/user?a=detailself',
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         method: 'GET',
         data: {},
@@ -99,7 +99,7 @@ Page({
                   url: getApp().globalData.serverUrl + 'api/safecert?a=listself',
                   header: {
                     'content-type': 'application/json', // 默认值
-                    'Cookie': wx.getStorageSync("sessionid"),
+                    'Cookie': getApp().globalData.sessionId,
                   },
                   success: res => {
                     if (res.data.total == 0) {
@@ -107,7 +107,7 @@ Page({
                         url: getApp().globalData.serverUrl + 'api/safecert?a=addspiderself',
                         header: {
                           'content-type': 'application/json', // 默认值
-                          'Cookie': wx.getStorageSync("sessionid"),
+                          'Cookie': getApp().globalData.sessionId,
                         },
                         method: 'GET',
                         data: {},
@@ -118,7 +118,7 @@ Page({
                               url: getApp().globalData.serverUrl + 'api/safecert?a=listself',
                               header: {
                                 'content-type': 'application/json', // 默认值
-                                'Cookie': wx.getStorageSync("sessionid"),
+                                'Cookie': getApp().globalData.sessionId,
                               },
                               success: res => {
                                 if (res.statusCode === 200) {
diff --git a/pages/socert/socert.js b/pages/socert/socert.js
index 767fb9a..ad9d737 100644
--- a/pages/socert/socert.js
+++ b/pages/socert/socert.js
@@ -67,7 +67,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/user?a=detailself',
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         method: 'GET',
         data: {},
@@ -98,7 +98,7 @@ Page({
                 url: getApp().globalData.serverUrl + 'api/socert?a=listself',
                 header: {
                   'content-type': 'application/json', // 默认值
-                  'Cookie': wx.getStorageSync("sessionid"),
+                  'Cookie': getApp().globalData.sessionId,
                 },
                 success: res => {
                   if (res.data.total == 0) {
@@ -106,7 +106,7 @@ Page({
                       url: getApp().globalData.serverUrl + 'api/socert?a=addspiderself',
                       header: {
                         'content-type': 'application/json', // 默认值
-                        'Cookie': wx.getStorageSync("sessionid"),
+                        'Cookie': getApp().globalData.sessionId,
                       },
                       method: 'GET',
                       data: {},
@@ -117,7 +117,7 @@ Page({
                             url: getApp().globalData.serverUrl + 'api/socert?a=listself',
                             header: {
                               'content-type': 'application/json', // 默认值
-                              'Cookie': wx.getStorageSync("sessionid"),
+                              'Cookie': getApp().globalData.sessionId,
                             },
                             success: res => {
                               if (res.statusCode === 200) {
diff --git a/pages/socert/socertdetail.js b/pages/socert/socertdetail.js
index e552928..e011c95 100644
--- a/pages/socert/socertdetail.js
+++ b/pages/socert/socertdetail.js
@@ -70,7 +70,7 @@ Page({
         url: this.data.serverUrl + 'api/socert?a=detail&id=' + id,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         data: {
         },
diff --git a/pages/suggest/add.js b/pages/suggest/add.js
index 1473f1f..23d92d0 100644
--- a/pages/suggest/add.js
+++ b/pages/suggest/add.js
@@ -79,7 +79,7 @@ Page({
       wx.uploadFile({
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         url: getApp().globalData.serverUrl + 'upfile',
         filePath: that.data.jyimg[x],
@@ -115,7 +115,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/suggest?a=add',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'POST',
       data: jydata,
@@ -146,7 +146,7 @@ Page({
       url: this.data.serverUrl + 'getdickey?dicclass=32&a=combobox',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
diff --git a/pages/suggest/detail.js b/pages/suggest/detail.js
index fb9f491..efa193b 100644
--- a/pages/suggest/detail.js
+++ b/pages/suggest/detail.js
@@ -88,7 +88,7 @@ Page({
         url: this.data.serverUrl + 'api/suggest?a=detail&jyid=' + jyid,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         data: {
         },
diff --git a/pages/suggest/suggest.js b/pages/suggest/suggest.js
index 80c98b5..289e5a2 100644
--- a/pages/suggest/suggest.js
+++ b/pages/suggest/suggest.js
@@ -60,20 +60,7 @@ Page({
    */
   onShow: function () {
     var that = this;
-    console.log(that.data.activeIndex)
-    if (that.data.activeIndex == 0) {
-      that.getmylist(1)
-      that.data.mypage = 1
-    }
-    else if (that.data.activeIndex == 1) {
-      that.gettodolist(1)
-      that.data.todopage = 1
-    }
-    else if (that.data.activeIndex == 2) {
-      that.getalllist(1)
-      this.data.page = 1;
-    }
-
+    that.onPullDownRefresh();
   },
 
   /**
@@ -148,7 +135,7 @@ Page({
         url: this.data.serverUrl + 'api/suggest?a=listall&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -193,7 +180,7 @@ Page({
         url: this.data.serverUrl + 'api/suggest?a=listself&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -238,7 +225,7 @@ Page({
         url: this.data.serverUrl + 'api/suggest?a=listtodo&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
diff --git a/pages/suggest/update.js b/pages/suggest/update.js
index 9ade9c6..1090551 100644
--- a/pages/suggest/update.js
+++ b/pages/suggest/update.js
@@ -46,7 +46,7 @@ Page({
         wx.uploadFile({
           header: {
             'content-type': 'application/json', // 默认值
-            'Cookie': wx.getStorageSync("sessionid"),
+            'Cookie': getApp().globalData.sessionId,
           },
           url: that.data.serverUrl + 'upfile',
           filePath: that.data.jyimg2[x],
@@ -157,7 +157,7 @@ Page({
         url: this.data.serverUrl + 'api/suggest?a=detail&jyid=' + jyid,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         data: {
         },
@@ -223,7 +223,7 @@ Page({
       url: this.data.serverUrl + 'api/suggest?a=update',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: jydata,
       method: 'post',
diff --git a/pages/todo/todo.js b/pages/todo/todo.js
index bc2cf50..8165d02 100644
--- a/pages/todo/todo.js
+++ b/pages/todo/todo.js
@@ -32,7 +32,7 @@ Page({
       url: getApp().globalData.serverUrl + 'troublehandle?a=todonum',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
diff --git a/pages/totalrate/index.js b/pages/totalrate/index.js
index d1327bd..90bd340 100644
--- a/pages/totalrate/index.js
+++ b/pages/totalrate/index.js
@@ -1,5 +1,6 @@
 // pages/examtest/rate.js
 var util = require('../../utils/util.js')
+var sliderWidth = 96;
 Page({
 
   /**
@@ -9,13 +10,32 @@ Page({
     page: 1,
     serverUrl: getApp().globalData.serverUrl,
     ratelist: [],
-    inputValue:''
+    inputValue:'',
+    tabs: ["个人总排名", "机构总排名"],
+    activeIndex: 0,
+    sliderOffset: 0,
+    sliderLeft: 0
+  },
+  tabClick: function (e) {
+    var that = this
+    that.setData({
+      sliderOffset: e.currentTarget.offsetLeft,
+      activeIndex: e.currentTarget.id
+    });
   },
-
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function () {
+    var that =this
+    wx.getSystemInfo({
+      success: function (res) {
+        that.setData({
+          sliderLeft: (res.windowWidth / that.data.tabs.length - sliderWidth) / 2,
+          sliderOffset: res.windowWidth / that.data.tabs.length * that.data.activeIndex
+        });
+      }
+    });
   },
 
   /**
@@ -30,8 +50,7 @@ Page({
    */
   onShow: function () {
     var that = this;
-    that.getRatelist(1)
-    this.data.page = 1;
+    that.getRatelist(that.data.page)
   },
 
   /**
@@ -53,9 +72,11 @@ Page({
    */
   onPullDownRefresh: function () {
     var that = this;
-    that.getRatelist(1);
-    wx.stopPullDownRefresh();
-    this.data.page = 1;
+    if (that.data.activeIndex == 0) {
+      that.getRatelist(1);
+      wx.stopPullDownRefresh();
+      this.data.page = 1;
+    }
   },
 
   /**
@@ -63,9 +84,13 @@ Page({
    */
   onReachBottom: function () {
     //上拉分页,将页码加1，然后调用分页函数
-    this.data.page = this.data.page + 1;
-    this.getRatelist();
-    wx.stopPullDownRefresh();
+    var that = this
+    if (that.data.activeIndex == 0) {
+      this.data.page = this.data.page + 1;
+      this.getRatelist();
+      wx.stopPullDownRefresh();
+    }
+    
   },
 
   /**
@@ -84,7 +109,7 @@ Page({
       url: this.data.serverUrl + 'api/examtestdetail?a=totalrate&rows=20&page=' + page + '&companyid=' + getApp().globalData.userInfo.companyid + '&search=' + that.data.inputValue,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -120,6 +145,9 @@ Page({
               })
             }
           }
+          this.setData({
+            orglist:res.data.rows2
+          })
           wx.hideLoading();
         }
       });
diff --git a/pages/totalrate/index.wxml b/pages/totalrate/index.wxml
index a0f8f50..47a43ff 100644
--- a/pages/totalrate/index.wxml
+++ b/pages/totalrate/index.wxml
@@ -1,44 +1,92 @@
 <view class="page">
-<view class="head" style="font-weight:bold;font-size:22px">知识竞赛总排名</view>
-<view class="head">已有
-<span style="font-weight:bold;color:orange">{{total}}</span>
-人参与   更新时间:{{updatetime}}
-</view>
-    <view class='search'>
-        <input type='text' placeholder='输入姓名/部门查询' confirm-type='search' value="{{inputValue}}" bindinput='inputBind' bindconfirm='query' style="flex: 1;"></input>
-        <view style="padding:2rpx">
-      <button type="primary" bindtap="query" >查询</button>
+  <view class="head">
+    <view style="font-weight:bold;font-size:22px">知识竞赛总排名</view>
+    <view>已有
+      <span style="font-weight:bold;color:orange">{{total}}</span>
+      人参与 更新时间:{{updatetime}}
     </view>
-    <view style="padding:2rpx">
-      <button type="primary" bindtap="reset" >重置</button>
-    </view>
-    </view>
-  <block wx:for="{{ratelist}}" wx:key="unique">
-    <view class="weui-panel__bd">
-      <view class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
-      <span style="color:darkblue">{{item.rate}}</span>
-        <view class="weui-media-box__hd weui-media-box__hd_in-appmsg">
-          <!-- <image class="weui-media-box__thumb" src="{{userInfo.avatarUrl}}" /> -->
-          <image class="weui-media-box__thumb" src="{{item.user__headimgurl}}"></image>
-        </view>
-        <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
-          <view class="weui-media-box__title">{{item.user__name}}
+  </view>
+  <view class="weui-tab">
+  <view class="weui-navbar">
+    <block wx:for="{{tabs}}" wx:key="*this">
+      <view id="{{index}}" class="weui-navbar__item {{activeIndex == index ? 'weui-bar__item_on' : ''}}" bindtap="tabClick">
+        <view class="weui-navbar__title">{{item}}</view>
+      </view>
+    </block>
+    <view class="weui-navbar__slider" style="left: {{sliderLeft}}px; transform: translateX({{sliderOffset}}px); -webkit-transform: translateX({{sliderOffset}}px);"></view>
+  </view>
+    <view class="weui-tab__panel">
+      <view class="weui-tab__content" hidden="{{activeIndex != 0}}">
+        <view class='search'>
+          <input type='text' placeholder='输入姓名/部门查询' confirm-type='search' value="{{inputValue}}" bindinput='inputBind' bindconfirm='query' style="flex: 1;"></input>
+          <view style="padding:2rpx">
+            <button type="primary" bindtap="query">查询</button>
           </view>
-          <view class="weui-media-box__desc">部门: {{item.user__ubelongpart__partname}}
-          </view>
-          <view class="weui-media-box__desc">已参加
-          <span style="font-weight:bold;color:darkblue">{{item.testnum}}</span>
-          场答题
+          <view style="padding:2rpx">
+            <button type="primary" bindtap="reset">重置</button>
           </view>
         </view>
-        <view class="weui-panel__ft">
+        <block wx:for="{{ratelist}}" wx:key="unique">
+          <view class="weui-panel__bd">
+            <view class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+              <view class="weui-media-box__hd weui-media-box__hd_in-appmsg" style="width:30px;" wx:if="{{item.rate==1||item.rate==2||item.rate==3}}">
+              <image class="weui-media-box__thumb" src="../images/guanjun.svg" wx:if="{{item.rate==1}}"></image>
+              <image class="weui-media-box__thumb" src="../images/yajun.svg" wx:if="{{item.rate==2}}"></image>
+              <image class="weui-media-box__thumb" src="../images/jijun.svg" wx:if="{{item.rate==3}}"></image>
               
-        <view class="weui-media-box__title" style="background-color:orange;color:white;font-weight:bold">{{item.totalscore}}分</view>
-              
-        <view class="weui-media-box__desc" style="background-color:green;color:white">{{item.totaltookformat}}</view>
+              </view>
+              <span class="index" style="width:auto" wx:else>{{item.rate}}</span>
+              <view class="weui-media-box__hd weui-media-box__hd_in-appmsg">
+                <!-- <image class="weui-media-box__thumb" src="{{userInfo.avatarUrl}}" /> -->
+                <image class="weui-media-box__thumb" src="{{item.user__headimgurl}}"></image>
+              </view>
+              <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
+                <view class="weui-media-box__title">{{item.user__name}}
+                </view>
+                <view class="weui-media-box__desc">部门: {{item.user__ubelongpart__partname}}
+                </view>
+                <view class="weui-media-box__desc">已参加
+                  <span style="font-weight:bold;color:darkblue">{{item.testnum}}</span>
+                  场答题
+                </view>
+              </view>
+              <view class="weui-panel__ft">
+
+                <view class="weui-media-box__title" style="background-color:orange;color:white;font-weight:bold">{{item.totalscore}}分</view>
+
+                <view class="weui-media-box__desc" style="background-color:green;color:white">{{item.totaltookformat}}</view>
+                <view class="weui-media-box__desc" style="background-color:green;color:white">场均{{item.avgscore}}分</view>
+              </view>
+            </view>
+
+          </view>
+        </block>
       </view>
+      <view class="weui-tab__content" hidden="{{activeIndex != 1}}">
+        <block wx:for="{{orglist}}" wx:key="unique">
+          <view class="weui-panel__bd">
+            <view class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+              <span class="index">{{index+1}}</span>
+              <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
+                <view class="weui-media-box__title">{{item.user__ubelongpart__partname}}
+                </view>
+                <view class="weui-media-box__desc">共
+                  <span style="font-weight:bold;color:darkblue">{{item.totaluser}}</span>
+                  名大神
+                  参加了
+                  <span style="font-weight:bold;color:darkblue">{{item.totaltest}}</span>
+                  场答题
+                </view>
+              </view>
+              <view class="weui-panel__ft">
+
+                <view class="weui-media-box__title" style="background-color:orange;color:white;font-weight:bold">场均:{{item.avgscore}}分</view>
+              </view>
+            </view>
+
+          </view>
+        </block>
       </view>
-      
     </view>
-  </block>
+  </view>
 </view>
\ No newline at end of file
diff --git a/pages/totalrate/index.wxss b/pages/totalrate/index.wxss
index 370e418..3b6c237 100644
--- a/pages/totalrate/index.wxss
+++ b/pages/totalrate/index.wxss
@@ -2,6 +2,8 @@
   color:#fff;
   background-color: cornflowerblue;
   text-align: center;
+  height:60px;
+  width:100%
 }
 .search
 {
@@ -20,4 +22,13 @@
 .search input
 {
   padding-left:30rpx; 
+}
+.index{
+  color:#fff;
+  background-color: darkslateblue;
+  border-radius: 6px;
+  width:30px;
+  justify-content: center;
+  align-items: center;
+  text-align: center
 }
\ No newline at end of file
diff --git a/pages/train/add.js b/pages/train/add.js
index dc72c3e..b9681f4 100644
--- a/pages/train/add.js
+++ b/pages/train/add.js
@@ -49,7 +49,7 @@ Page({
       url: getApp().globalData.serverUrl + 'getdickey?dicclass=' + this.data.pxjb + '&a=combobox',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'GET',
       success: res => {
@@ -77,7 +77,7 @@ Page({
       url: getApp().globalData.serverUrl + 'getdickey?dicclass=8&a=combobox',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'GET',
       success: res => {
@@ -94,7 +94,7 @@ Page({
       url: getApp().globalData.serverUrl + 'getdickey?dicclass=9&a=combobox',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'GET',
       success: res => {
@@ -111,7 +111,7 @@ Page({
       url: getApp().globalData.serverUrl + 'getdicclass?dicid=4',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'GET',
       success: res => {
@@ -300,7 +300,7 @@ Page({
             url: getApp().globalData.serverUrl + 'addtrain',
             header: {
               'content-type': 'application/x-www-form-urlencoded', // 
-              'Cookie': wx.getStorageSync("sessionid"),
+              'Cookie': getApp().globalData.sessionId,
             },
             method: 'POST',
             data: pxdata,
diff --git a/pages/train/check.js b/pages/train/check.js
index f7f20b7..6509b51 100644
--- a/pages/train/check.js
+++ b/pages/train/check.js
@@ -49,7 +49,7 @@ Page({
       url: getApp().globalData.serverUrl + 'pxhandle?a=detail&trainid=' + id,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         data: {},
         success: res => {
@@ -73,7 +73,7 @@ Page({
       url: getApp().globalData.serverUrl + 'pxhandle?a=check&trainid=' + this.data.pxid,
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
diff --git a/pages/train/detail.js b/pages/train/detail.js
index 01ad89f..b5fb959 100644
--- a/pages/train/detail.js
+++ b/pages/train/detail.js
@@ -114,7 +114,7 @@ Page({
       url: this.data.serverUrl + 'pxhandle?a=detail&trainid=' + id,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         data: {},
         success: res => {
diff --git a/pages/train/qrcode.js b/pages/train/qrcode.js
index 21b88be..f8506b4 100644
--- a/pages/train/qrcode.js
+++ b/pages/train/qrcode.js
@@ -46,7 +46,7 @@ Page({
         url: getApp().globalData.serverUrl + 'pxhandle?a=detail&trainid=' + id,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         data: {},
         success: res => {
diff --git a/pages/train/train.js b/pages/train/train.js
index a0aacac..ea66719 100644
--- a/pages/train/train.js
+++ b/pages/train/train.js
@@ -40,7 +40,7 @@ Page({
       url: this.data.serverUrl + 'pxhandle?a=listall&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -85,7 +85,7 @@ Page({
       url: this.data.serverUrl + 'pxhandle?a=listtodo&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -130,7 +130,7 @@ Page({
         url: this.data.serverUrl + 'pxhandle?a=listcj&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -183,37 +183,23 @@ Page({
   },
   onShow: function () {
     var that = this;
-    console.log(that.data.activeIndex)
-    if (that.data.activeIndex == 0) {
-      that.getfqpxlist(1)
-      that.data.fqpage = 1
-    }
-    else if (that.data.activeIndex == 1) {
-      that.getcjpxlist(1)
-      that.data.cjpage = 1
-    }
-    else if (that.data.activeIndex == 2) {
-      that.getallpxlist(1)
-      that.data.page = 1
-    }
+    that.onPullDownRefresh()
   },
   onPullDownRefresh: function () {
     var that = this;
     if (that.data.activeIndex == 0) {
       that.getfqpxlist(1)
-      wx.stopPullDownRefresh();
       that.data.fqpage = 1
     }
     else if (that.data.activeIndex == 1) {
       that.getcjpxlist(1)
-      wx.stopPullDownRefresh();
       that.data.cjpage = 1
     }
     else if (that.data.activeIndex == 2) {
       that.getallpxlist(1)
-      wx.stopPullDownRefresh();
       that.data.page = 1
     }
+    wx.stopPullDownRefresh();
   },
   onReachBottom: function () {
     //上拉分页,将页码加1，然后调用分页函数
diff --git a/pages/trouble/accesstrouble.js b/pages/trouble/accesstrouble.js
index db02710..601eb6e 100644
--- a/pages/trouble/accesstrouble.js
+++ b/pages/trouble/accesstrouble.js
@@ -107,7 +107,7 @@ Page({
         url: this.data.serverUrl + 'getyh?troubleid=' + troubleid,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         data: {},
         success: res => {
@@ -131,7 +131,7 @@ Page({
                   url: this.data.serverUrl + 'getdickey?dicclass=19&a=combobox',
                   header: {
                     'content-type': 'application/json', // 默认值
-                    'Cookie': wx.getStorageSync("sessionid"),
+                    'Cookie': getApp().globalData.sessionId,
                   },
                   data: {},
                   success: res => {
@@ -148,7 +148,7 @@ Page({
                   url: this.data.serverUrl + 'getdicclass?dicid=15',
                   header: {
                     'content-type': 'application/json', // 默认值
-                    'Cookie': wx.getStorageSync("sessionid"),
+                    'Cookie': getApp().globalData.sessionId,
                   },
                   data: {},
                   success: res => {
@@ -165,7 +165,7 @@ Page({
                   url: this.data.serverUrl + 'getdickey?dicclass=16&a=combobox',
                   header: {
                     'content-type': 'application/json', // 默认值
-                    'Cookie': wx.getStorageSync("sessionid"),
+                    'Cookie': getApp().globalData.sessionId,
                   },
                   data: {},
                   success: res => {
@@ -179,7 +179,7 @@ Page({
                   url: this.data.serverUrl + 'getdickey?dicclass=17&a=combobox',
                   header: {
                     'content-type': 'application/json', // 默认值
-                    'Cookie': wx.getStorageSync("sessionid"),
+                    'Cookie': getApp().globalData.sessionId,
                   },
                   data: {},
                   success: res => {
@@ -299,7 +299,7 @@ Page({
         wx.uploadFile({
           header: {
             'content-type': 'application/json', // 默认值
-            'Cookie': wx.getStorageSync("sessionid"),
+            'Cookie': getApp().globalData.sessionId,
           },
           url: that.data.serverUrl + 'upfile',
           filePath: that.data.zghtp[x],
@@ -342,7 +342,7 @@ Page({
         wx.uploadFile({
           header: {
             'content-type': 'application/json', // 默认值
-            'Cookie': wx.getStorageSync("sessionid"),
+            'Cookie': getApp().globalData.sessionId,
           },
           url: that.data.serverUrl + 'upfile',
           filePath: that.data.yhtp[x],
@@ -378,7 +378,7 @@ Page({
       url: that.data.serverUrl + 'addyh',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'POST',
       data: that.data,
@@ -398,7 +398,7 @@ Page({
       url: that.data.serverUrl + 'accessyh',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'POST',
       data: that.data,
diff --git a/pages/trouble/addtrouble.js b/pages/trouble/addtrouble.js
index b2ef146..a42a023 100644
--- a/pages/trouble/addtrouble.js
+++ b/pages/trouble/addtrouble.js
@@ -109,7 +109,7 @@ Page({
       wx.uploadFile({
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         url: that.data.serverUrl + 'upfile',
         filePath: that.data.yhtp[x],
@@ -230,7 +230,7 @@ Page({
       url: this.data.serverUrl + 'addyh',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method:'POST',
       data: this.yhdata,
@@ -244,7 +244,7 @@ Page({
               url: this.data.serverUrl + 'api/inspect?a=add',
               header: {
                 'content-type': 'application/json', // 
-                'Cookie': wx.getStorageSync("sessionid"),
+                'Cookie': getApp().globalData.sessionId,
               },
               method: 'POST',
               data: inspectdata,
@@ -267,7 +267,7 @@ Page({
               url: this.data.serverUrl + 'api/risktask?a=checktrouble',
               header: {
                 'content-type': 'application/json', // 
-                'Cookie': wx.getStorageSync("sessionid"),
+                'Cookie': getApp().globalData.sessionId,
               },
               method: 'POST',
               data: data,
@@ -323,7 +323,7 @@ Page({
       url: this.data.serverUrl + 'getdickey?dicclass=18&a=combobox',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -343,7 +343,7 @@ Page({
       url: this.data.serverUrl + 'getdickey?dicclass=14&a=combobox',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
diff --git a/pages/trouble/addtroublezg.js b/pages/trouble/addtroublezg.js
index d430077..cd5f248 100644
--- a/pages/trouble/addtroublezg.js
+++ b/pages/trouble/addtroublezg.js
@@ -105,7 +105,7 @@ Page({
       wx.uploadFile({
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         url: that.data.serverUrl + 'upfile',
         filePath: that.data.yhtp[x], //全局变量取值
@@ -137,7 +137,7 @@ Page({
       wx.uploadFile({
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         url: that.data.serverUrl + 'upfile',
         filePath: that.data.zghtp[x],
@@ -181,7 +181,7 @@ Page({
       url: this.data.serverUrl + 'addyh',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'POST',
       data: this.yhdata,
@@ -195,7 +195,7 @@ Page({
               url: this.data.serverUrl + 'api/inspect?a=add',
               header: {
                 'content-type': 'application/json', // 
-                'Cookie': wx.getStorageSync("sessionid"),
+                'Cookie': getApp().globalData.sessionId,
               },
               method: 'POST',
               data: inspectdata,
@@ -218,7 +218,7 @@ Page({
               url: this.data.serverUrl + 'api/risktask?a=checktrouble',
               header: {
                 'content-type': 'application/json', // 
-                'Cookie': wx.getStorageSync("sessionid"),
+                'Cookie': getApp().globalData.sessionId,
               },
               method: 'POST',
               data: data,
@@ -294,7 +294,7 @@ Page({
       url: this.data.serverUrl + 'getdickey?dicclass=19&a=combobox',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -312,7 +312,7 @@ Page({
       url: this.data.serverUrl + 'getdicclass?dicid=15',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -330,7 +330,7 @@ Page({
       url: this.data.serverUrl + 'getdickey?dicclass=16&a=combobox',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -344,7 +344,7 @@ Page({
       url: this.data.serverUrl + 'getdickey?dicclass=17&a=combobox',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
diff --git a/pages/trouble/addtroublezp.js b/pages/trouble/addtroublezp.js
index d8e8312..db0b7d1 100644
--- a/pages/trouble/addtroublezp.js
+++ b/pages/trouble/addtroublezp.js
@@ -96,7 +96,7 @@ Page({
       wx.uploadFile({
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         url: that.data.serverUrl + 'upfile',
         filePath: that.data.yhtp[x], //全局变量取值
@@ -141,7 +141,7 @@ Page({
       url: this.data.serverUrl + 'addyh',
       header: {
         'content-type': 'application/json', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'POST',
       data: this.yhdata,
@@ -155,7 +155,7 @@ Page({
               url: this.data.serverUrl + 'api/inspect?a=add',
               header: {
                 'content-type': 'application/json', // 
-                'Cookie': wx.getStorageSync("sessionid"),
+                'Cookie': getApp().globalData.sessionId,
               },
               method: 'POST',
               data: inspectdata,
@@ -178,7 +178,7 @@ Page({
               url: this.data.serverUrl + 'api/risktask?a=checktrouble',
               header: {
                 'content-type': 'application/json', // 
-                'Cookie': wx.getStorageSync("sessionid"),
+                'Cookie': getApp().globalData.sessionId,
               },
               method: 'POST',
               data: data,
@@ -249,7 +249,7 @@ Page({
       url: this.data.serverUrl + 'getdickey?dicclass=19&a=combobox',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -267,7 +267,7 @@ Page({
       url: this.data.serverUrl + 'getdicclass?dicid=15',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -285,7 +285,7 @@ Page({
       url: this.data.serverUrl + 'getdickey?dicclass=16&a=combobox',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -299,7 +299,7 @@ Page({
       url: this.data.serverUrl + 'getdickey?dicclass=17&a=combobox',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
diff --git a/pages/trouble/trouble.js b/pages/trouble/trouble.js
index 9e90cc1..6a5410d 100644
--- a/pages/trouble/trouble.js
+++ b/pages/trouble/trouble.js
@@ -39,7 +39,7 @@ Page({
       url: this.data.serverUrl +'troublehandle?a=listall&rows=10&page=' + page, 
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -84,7 +84,7 @@ Page({
         url: this.data.serverUrl + 'troublehandle?a=listself&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -129,7 +129,7 @@ Page({
         url: this.data.serverUrl + 'troublehandle?a=listtodo&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         success: res => {
           if (res.statusCode === 200) {
@@ -180,19 +180,7 @@ Page({
   },
   onShow:function(){
     var that = this;
-    console.log(that.data.activeIndex)
-    if(that.data.activeIndex==0){
-      that.getmyYhlist(1)
-      that.data.mypage=1
-    }
-    else if (that.data.activeIndex == 1){
-      that.gettodoYhlist(1)
-      that.data.todopage=1
-    }
-    else if (that.data.activeIndex == 2){
-      that.getallYhlist(1)
-      that.data.page=1
-    }
+    that.onPullDownRefresh();
   },
   onPullDownRefresh: function () {
     var that = this;
diff --git a/pages/trouble/troubledetail.js b/pages/trouble/troubledetail.js
index cecf5b5..b9ab2b1 100644
--- a/pages/trouble/troubledetail.js
+++ b/pages/trouble/troubledetail.js
@@ -16,7 +16,7 @@ Page({
       url: this.data.serverUrl+'troublehandle?a=detail&troubleid=' + troubleid,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         data: {
         },
diff --git a/pages/trouble/troubletodo.js b/pages/trouble/troubletodo.js
index 12a32cb..e1cee70 100644
--- a/pages/trouble/troubletodo.js
+++ b/pages/trouble/troubletodo.js
@@ -15,7 +15,7 @@ Page({
         url: this.data.serverUrl + 'troublehandle?a=listtodo&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         data: {},
         success: res => {
diff --git a/pages/user/userdetail.js b/pages/user/userdetail.js
index 7378cb9..8905111 100644
--- a/pages/user/userdetail.js
+++ b/pages/user/userdetail.js
@@ -87,7 +87,7 @@ Page({
         url: this.data.serverUrl + 'api/user?a=detailself',
         header: {
           'content-type': 'application/x-www-form-urlencoded', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
+          'Cookie': getApp().globalData.sessionId,
         },
         method:'GET',
         data: {
@@ -121,7 +121,7 @@ Page({
             url: getApp().globalData.serverUrl + 'unbindmp',
             header: {
               'content-type': 'application/json', // 
-              'Cookie': wx.getStorageSync("sessionid"),
+              'Cookie': getApp().globalData.sessionId,
             },
             method: 'POST',
             success: res => {
@@ -153,7 +153,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/user?a=editself',
       header: {
         'content-type': 'application/x-www-form-urlencoded', // 
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       method: 'POST',
       data: userdata,
@@ -166,7 +166,7 @@ Page({
               url: getApp().globalData.serverUrl + 'api/socert?a=addspiderself',
               header: {
                 'content-type': 'application/json', // 默认值
-                'Cookie': wx.getStorageSync("sessionid"),
+                'Cookie': getApp().globalData.sessionId,
               },
               method: 'GET',
               data: {},
diff --git a/pages/userSelect/userSelect.js b/pages/userSelect/userSelect.js
index aec9252..2f07103 100644
--- a/pages/userSelect/userSelect.js
+++ b/pages/userSelect/userSelect.js
@@ -28,7 +28,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/partuser?a=getall&parentid=company',
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
@@ -120,7 +120,7 @@ Page({
       url: getApp().globalData.serverUrl + 'api/partuser?a=getall&parentid='+item.id,
       header: {
         'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
+        'Cookie': getApp().globalData.sessionId,
       },
       data: {},
       success: res => {
diff --git a/utils/dict.js b/utils/dict.js
index 315483c..b276e8a 100644
--- a/utils/dict.js
+++ b/utils/dict.js
@@ -1,5 +1,5 @@
 var serverUrl = getApp().globalData.serverUrl
-var cookie = wx.getStorageSync("sessionid")
+var cookie = getApp().globalData.sessionId
 function getyhdj(){
   wx.request({
     url: serverUrl + 'getdickey?dicclass=18&a=combobox',