diff --git a/app.js b/app.js index 9830a9e..485f0f5 100644 --- a/app.js +++ b/app.js @@ -24,6 +24,7 @@ App({ }, globalData: { userInfo: null, + selected:0, deviceInfo: { statusHeight: 20, navigationHeight: 40 diff --git a/app.json b/app.json index b431063..3f88e2c 100644 --- a/app.json +++ b/app.json @@ -3,7 +3,6 @@ "pages/index/index", "pages/logs/logs", "pages/login/login", - "pages/message/message", "pages/work/work", "pages/information/information", "pages/mine/mine", diff --git a/pages/index/index.js b/pages/index/index.js index d393095..aaf85aa 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -27,6 +27,15 @@ Page({ }, onShow(){ }, + onPullDownRefresh() { + this.setData({ + pageNo:1, + tableData:[] + }) + this.getIntelligentMessage() + this.getStaffbasicinfo() +}, + onScrollToLower(e){ if (this.data.loadMoreType === 'more') { this.setData({ diff --git a/pages/index/index.json b/pages/index/index.json index 9e077c1..ae7b1fa 100644 --- a/pages/index/index.json +++ b/pages/index/index.json @@ -1,8 +1,11 @@ { "navigationStyle": "custom", - "usingComponents": { - "load-more": "../../components/loadMore/loadMore", - "no-data": "../../components/noData/nodata", - "custom-tab-bar":"../../components/custom-tab-bar" - } + "usingComponents": { + "load-more": "../../components/loadMore/loadMore", + "no-data": "../../components/noData/nodata", + "custom-tab-bar":"../../components/custom-tab-bar" + }, + "enablePullDownRefresh": true, + "backgroundColor": "#f8f8f8", + "backgroundTextStyle": "dark" } \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 45f61c6..dd51f49 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -98,7 +98,7 @@ page { box-sizing: border-box; } .content .scroll { - height: calc(100vh - 560rpx); + height: calc(100vh - 670rpx); overflow-y: scroll; } .content .card{ diff --git a/pages/message/message.js b/pages/message/message.js deleted file mode 100644 index f916eb2..0000000 --- a/pages/message/message.js +++ /dev/null @@ -1,66 +0,0 @@ -// pages/message/message.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } -}) \ No newline at end of file diff --git a/pages/message/message.json b/pages/message/message.json deleted file mode 100644 index 3928faa..0000000 --- a/pages/message/message.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/message/message.wxml b/pages/message/message.wxml deleted file mode 100644 index 324a389..0000000 --- a/pages/message/message.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -pages/message/message.wxml diff --git a/pages/message/message.wxss b/pages/message/message.wxss deleted file mode 100644 index 2251458..0000000 --- a/pages/message/message.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/message/message.wxss */ \ No newline at end of file diff --git a/pages/work/work.js b/pages/work/work.js index f1b8ea0..cd2fe06 100644 --- a/pages/work/work.js +++ b/pages/work/work.js @@ -98,14 +98,15 @@ Page({ * 页面相关事件处理函数--监听用户下拉动作 */ onPullDownRefresh() { - + this.getSituation() + this.getInspRecord() }, /** * 页面上拉触底事件的处理函数 */ onReachBottom() { - + }, /** diff --git a/pages/work/work.json b/pages/work/work.json index 384c87d..652519d 100644 --- a/pages/work/work.json +++ b/pages/work/work.json @@ -2,5 +2,8 @@ "navigationStyle": "custom", "usingComponents": { "custom-tab-bar":"../../components/custom-tab-bar" - } + }, + "enablePullDownRefresh": true, + "backgroundColor": "#f8f8f8", + "backgroundTextStyle": "dark" } \ No newline at end of file diff --git a/utils/config.js b/utils/config.js index f262e68..1ae6ec5 100644 --- a/utils/config.js +++ b/utils/config.js @@ -7,8 +7,8 @@ module.exports = { function BASEURL() { // return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 正式环境 - return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境 - // return 'http://192.168.1.144/api/' //测试环境 + // return 'https://epmet-preview.elinkservice.cn/api/' // 演示环境 + return 'http://192.168.1.144/api/' //测试环境 } function WEBROOT() {