diff --git a/app.js b/app.js index 3ac381d..76fe9e4 100644 --- a/app.js +++ b/app.js @@ -3,6 +3,7 @@ var restAjax = require('utils/restAjax.js'); var dialog = require('utils/dialog.js'); App({ loginUrl: 'https://www.tenlion.com.cn/usercenter/', + // loginUrl: 'http://192.168.0.103:7001/usercenter/', // requestUrl: 'http://192.168.0.120:8083/servicecity/', requestUrl: 'https://www.tenlion.com.cn/servicecity/', restAjax: restAjax, diff --git a/pages/caseCheck/caseCheck.js b/pages/caseCheck/caseCheck.js index c461bed..96b866e 100644 --- a/pages/caseCheck/caseCheck.js +++ b/pages/caseCheck/caseCheck.js @@ -12,7 +12,7 @@ Page({ latitude: '40.860318', markers: [], caseDetail: {}, - token: wx.getStorageSync('token'), + token: '', requestUrl: app.requestUrl, evaluateContent: '', isPass: 1, @@ -26,7 +26,6 @@ Page({ token: self.data.token } }, function (code, data) { - console.log(data) var imgArr, handleArr imgArr = data.casePhotos.split(',') handleArr = data.handlePhotos.split(',') @@ -60,7 +59,6 @@ Page({ count: 9 - self.data.photoList.length, sourceType: ['album', 'camera'], success: function (res) { - console.log(res) self.setData({ showPhotoList: self.data.photoList.concat(res.tempFiles) }) @@ -130,13 +128,11 @@ Page({ return } for (let i = 0; i < this.data.photoList.length; i++) { - if (i == this.data.photoList.length - 1) { photo += this.data.photoList[i] } else { photo += this.data.photoList[i] + ',' } - console.log(i, photo) } var info = { inspectPhotos: photo, @@ -155,7 +151,7 @@ Page({ duration: 2000, success: function () { setTimeout(function () { - wx.navigateTo({ + wx.reLaunch({ url: '../index/index', }) }, 2000) @@ -171,7 +167,17 @@ Page({ this.setData({ caseId: options.id }) - this.getDetail() + var self = this + wx.getStorage({ + key: 'token', + success: function (res) { + self.setData({ + token: res.data + }) + self.getDetail() + } + }) + var BMap = new bmap.BMapWX({ ak: 'Zk732rbyjd327q7Zj9EOtRjUn2ED1GWK' }); diff --git a/pages/caseDetail/caseDetail.js b/pages/caseDetail/caseDetail.js index 1cef167..4d5932e 100644 --- a/pages/caseDetail/caseDetail.js +++ b/pages/caseDetail/caseDetail.js @@ -51,6 +51,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { + var self = this this.setData({ caseId: options.id }) diff --git a/pages/caseReport/caseReport.js b/pages/caseReport/caseReport.js index 021c93a..56ebe5f 100644 --- a/pages/caseReport/caseReport.js +++ b/pages/caseReport/caseReport.js @@ -378,7 +378,7 @@ Page({ duration: 1500 }) setTimeout(function () { - wx.navigateTo({ + wx.reLaunch({ url: '../index/index', }) }, 1500) diff --git a/pages/index/index.js b/pages/index/index.js index 853daaf..09d20b5 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -49,11 +49,18 @@ Page({ } }, function (code, data) { if(data.rows.length == 0) { - self.setData({ - [`page.page`] : self.data.page.page - 1 - }) - app.dialog.msg('暂无更多') - return false; + if (self.data.page.page == 1) { + self.setData({ + areaList: [] + }) + } else { + self.setData({ + [`page.page`] : self.data.page.page - 1 + }) + + app.dialog.msg('暂无更多') + return false; + } } data.rows.forEach(function (i) { i.casePhotos = i.casePhotos.split(',')[0] @@ -116,7 +123,20 @@ Page({ token: self.data.token } }, function (code, data) { - if (self.data.page.page) { + if(data.rows.length == 0) { + if (self.data.page.page == 1) { + self.setData({ + areaList: [] + }) + } else { + self.setData({ + [`page.page`] : self.data.page.page - 1 + }) + app.dialog.msg('暂无更多') + return false; + } + } + if (self.data.page.page == 1) { self.setData({ areaList: data.rows }) @@ -167,7 +187,15 @@ Page({ * 页面相关事件处理函数--监听用户下拉动作 */ onPullDownRefresh: function () { - + var self = this + this.setData({ + ['page.page']: 1 + }) + if (self.data.tab == 0) { + this.getList() + } else { + this.getCheckList() + } }, /** diff --git a/pages/index/index.json b/pages/index/index.json index 8835af0..7360326 100644 --- a/pages/index/index.json +++ b/pages/index/index.json @@ -1,3 +1,4 @@ { - "usingComponents": {} + "usingComponents": {}, + "enablePullDownRefresh": true } \ No newline at end of file diff --git a/pages/index/index.wxss b/pages/index/index.wxss index d1b4dc6..c64ae99 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -81,6 +81,7 @@ page{ font-size: 28rpx; color: #888; margin-bottom: 10rpx; + line-height: 60rpx; } .case-postion{ white-space: nowrap; diff --git a/pages/process/process.js b/pages/process/process.js index 8002525..d3c734f 100644 --- a/pages/process/process.js +++ b/pages/process/process.js @@ -32,6 +32,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { + var self = this this.setData({ caseId: options.id })