diff --git a/app.js b/app.js index 6a15227..7a0efc4 100644 --- a/app.js +++ b/app.js @@ -3,7 +3,7 @@ App({ onLaunch: function () { var that = this that.mplogin() - setInterval(that.reflesh,10*1000) + setInterval(that.reflesh,10*60*1000) }, mplogin: function () { var that = this; @@ -21,8 +21,6 @@ App({ }, success: function (res) { if (res.data.code == 1) { - //console.log(res.header["Set-Cookie"]) - console.log(res) wx.setStorageSync('userid', res.data.userid) wx.setStorageSync('username', res.data.username) if (res.header.hasOwnProperty('Set-Cookie')){ @@ -31,8 +29,6 @@ App({ wx.setStorageSync('sessionid', res.header["set-cookie"]) } wx.setStorageSync('mpopenid', res.data.mpopenid) - //console.log(res.header["Set-Cookie"]) - //console.log(wx.getStorageSync("sessionid")) if (that.callback) { //这个函数名字和你定义的一样即可 that.callback() //执行定义的回调函数 } @@ -47,10 +43,8 @@ App({ data: {}, success: res => { if (res.data.code == 1) { - //console.log(res.data) that.globalData.isaqy = 1 } - console.log(that.globalData.isaqy) } }); //拉取权限 @@ -82,22 +76,18 @@ App({ }, reflesh: function(){//刷新session var that = this - console.log(wx.getStorageSync("sessionid")) wx.request({ url: that.globalData.serverUrl + 'api/check_session', header: { 'content-type': 'application/json', // 默认值 'Cookie': wx.getStorageSync("sessionid"), }, - data: {}, success: res => { - if (res.header.hasOwnProperty('Set-Cookie')) { - wx.setStorageSync('sessionid', res.header["Set-Cookie"]) - } else { - wx.setStorageSync('sessionid', res.header["set-cookie"]) + if(res.data.code!=1){ + that.mplogin() } } - }); + }) }, globalData: { userInfo: null, diff --git a/pages/miss/miss.wxml b/pages/miss/miss.wxml index 6adbb12..9c2cd91 100644 --- a/pages/miss/miss.wxml +++ b/pages/miss/miss.wxml @@ -10,7 +10,7 @@ {{item.misstime}} - 未读 + 未读 已读 {{item.readtime}} diff --git a/pages/observe/observe.wxml b/pages/observe/observe.wxml index 1feeebb..c7da75d 100644 --- a/pages/observe/observe.wxml +++ b/pages/observe/observe.wxml @@ -10,8 +10,8 @@ {{item.looktime}} - 未读 - 已读 + 未读 + 已读 {{item.readtime}} diff --git a/pages/observe/observedetail.wxml b/pages/observe/observedetail.wxml index 63fe4eb..4faa1fa 100644 --- a/pages/observe/observedetail.wxml +++ b/pages/observe/observedetail.wxml @@ -27,7 +27,7 @@ - 记录人 + 观察人 {{looker__name}} diff --git a/pages/operation/operationadd.wxml b/pages/operation/operationadd.wxml index b41f0bc..a215cca 100644 --- a/pages/operation/operationadd.wxml +++ b/pages/operation/operationadd.wxml @@ -21,7 +21,7 @@ - 结束时间 + 预计结束 diff --git a/pages/trouble/addtrouble.wxml b/pages/trouble/addtrouble.wxml index abb5a13..7ab3cd0 100644 --- a/pages/trouble/addtrouble.wxml +++ b/pages/trouble/addtrouble.wxml @@ -90,9 +90,6 @@ - - - - + \ No newline at end of file diff --git a/pages/trouble/addtrouble.wxss b/pages/trouble/addtrouble.wxss index 52d7b2e..1e22af7 100644 --- a/pages/trouble/addtrouble.wxss +++ b/pages/trouble/addtrouble.wxss @@ -1,4 +1,4 @@ -.btn-area{ +.weui-btn{ width:auto; margin: 5px; } diff --git a/pages/trouble/trouble.wxml b/pages/trouble/trouble.wxml index 144a9c6..057529c 100644 --- a/pages/trouble/trouble.wxml +++ b/pages/trouble/trouble.wxml @@ -16,17 +16,18 @@ {{item.yhdj__dickeyname}} - {{item.yhlb__dickeyname}} + {{item.yhlb__dickeyname}} - {{item.yhnum}} {{item.fxr__name}}填报 - {{item.tbsj}} + {{item.tbsj}} {{item.fxr__name}}填报 措施/方案待提交 待复查 待评估 待整改 - 已归档 + 已归档 措施/方案待确认 待审核 待新增 @@ -45,7 +46,8 @@ {{item.yhdj__dickeyname}} - {{item.yhlb__dickeyname}} + {{item.yhlb__dickeyname}} {{item.yhnum}} {{item.fxr__name}}填报 {{item.tbsj}} @@ -55,7 +57,8 @@ 待复查 待评估 待整改 - 已归档 + 已归档 措施/方案待确认 待审核 待新增 @@ -75,7 +78,8 @@ {{item.yhdj__dickeyname}} - {{item.yhlb__dickeyname}} + {{item.yhlb__dickeyname}} {{item.yhnum}} {{item.fxr__name}}填报 {{item.tbsj}} @@ -85,7 +89,8 @@ 待复查 待评估 待整改 - 已归档 + 已归档 措施/方案待确认 待审核 待新增