diff --git a/miniprogram/app.js b/miniprogram/app.js index 74840d6..407da71 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -20,7 +20,7 @@ globalData: { // httpsUrl: "https://logapi.smartlog.work/", // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地 - // httpsUrl: "http://192.168.8.110:8083/",// 柴壮本地 + // httpsUrl: "http://192.168.8.109:8083/",// 柴壮本地 // httpsUrl: "http://139.198.18.188:8083/", // url: "http://127.0.0.1:8083/", //httpsUrl: "http://127.0.0.1:8083/", diff --git a/miniprogram/app.js b/miniprogram/app.js index 74840d6..407da71 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -20,7 +20,7 @@ globalData: { // httpsUrl: "https://logapi.smartlog.work/", // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地 - // httpsUrl: "http://192.168.8.110:8083/",// 柴壮本地 + // httpsUrl: "http://192.168.8.109:8083/",// 柴壮本地 // httpsUrl: "http://139.198.18.188:8083/", // url: "http://127.0.0.1:8083/", //httpsUrl: "http://127.0.0.1:8083/", diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml index 7233a68..fbfe84e 100644 --- a/miniprogram/pages/addDevice/addDevice.wxml +++ b/miniprogram/pages/addDevice/addDevice.wxml @@ -10,7 +10,7 @@ - + diff --git a/miniprogram/app.js b/miniprogram/app.js index 74840d6..407da71 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -20,7 +20,7 @@ globalData: { // httpsUrl: "https://logapi.smartlog.work/", // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地 - // httpsUrl: "http://192.168.8.110:8083/",// 柴壮本地 + // httpsUrl: "http://192.168.8.109:8083/",// 柴壮本地 // httpsUrl: "http://139.198.18.188:8083/", // url: "http://127.0.0.1:8083/", //httpsUrl: "http://127.0.0.1:8083/", diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml index 7233a68..fbfe84e 100644 --- a/miniprogram/pages/addDevice/addDevice.wxml +++ b/miniprogram/pages/addDevice/addDevice.wxml @@ -10,7 +10,7 @@ - + diff --git a/miniprogram/pages/applog/applog.js b/miniprogram/pages/applog/applog.js index 7cd6f20..1585d19 100644 --- a/miniprogram/pages/applog/applog.js +++ b/miniprogram/pages/applog/applog.js @@ -25,7 +25,7 @@ params: JSON.parse(options.params), isSeach: "true" }) - this.initPages() + this.initPages(true) } // else{ // this.setData({ @@ -53,7 +53,7 @@ }) //清空参数,重新加载 this.clearParams(); - this.initPages(); + this.initPages(true); }, @@ -255,11 +255,12 @@ }) }, //查询列表数据 - initPages: function () { + initPages: function (needClear = false) { var that = this that.setData({ show: false }) + var offsetValue = that.data.deviceloglist.length % 15 > 0 ? parseInt(that.data.deviceloglist.length / 15) + 2 : parseInt(that.data.deviceloglist.length / 15) + 1 wx.request({ @@ -285,9 +286,15 @@ listArr.forEach(function (v, i) { listArr[i]['isTouchMove'] = false }) - that.setData({ - deviceloglist: that.data.deviceloglist.concat(listArr) - }) + if(needClear) { + that.setData({ + deviceloglist: listArr + }) + } else { + that.setData({ + deviceloglist: that.data.deviceloglist.concat(listArr) + }) + } } else if (that.data.deviceloglist.length > 0) { that.setData({ show: true, diff --git a/miniprogram/app.js b/miniprogram/app.js index 74840d6..407da71 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -20,7 +20,7 @@ globalData: { // httpsUrl: "https://logapi.smartlog.work/", // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地 - // httpsUrl: "http://192.168.8.110:8083/",// 柴壮本地 + // httpsUrl: "http://192.168.8.109:8083/",// 柴壮本地 // httpsUrl: "http://139.198.18.188:8083/", // url: "http://127.0.0.1:8083/", //httpsUrl: "http://127.0.0.1:8083/", diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml index 7233a68..fbfe84e 100644 --- a/miniprogram/pages/addDevice/addDevice.wxml +++ b/miniprogram/pages/addDevice/addDevice.wxml @@ -10,7 +10,7 @@ - + diff --git a/miniprogram/pages/applog/applog.js b/miniprogram/pages/applog/applog.js index 7cd6f20..1585d19 100644 --- a/miniprogram/pages/applog/applog.js +++ b/miniprogram/pages/applog/applog.js @@ -25,7 +25,7 @@ params: JSON.parse(options.params), isSeach: "true" }) - this.initPages() + this.initPages(true) } // else{ // this.setData({ @@ -53,7 +53,7 @@ }) //清空参数,重新加载 this.clearParams(); - this.initPages(); + this.initPages(true); }, @@ -255,11 +255,12 @@ }) }, //查询列表数据 - initPages: function () { + initPages: function (needClear = false) { var that = this that.setData({ show: false }) + var offsetValue = that.data.deviceloglist.length % 15 > 0 ? parseInt(that.data.deviceloglist.length / 15) + 2 : parseInt(that.data.deviceloglist.length / 15) + 1 wx.request({ @@ -285,9 +286,15 @@ listArr.forEach(function (v, i) { listArr[i]['isTouchMove'] = false }) - that.setData({ - deviceloglist: that.data.deviceloglist.concat(listArr) - }) + if(needClear) { + that.setData({ + deviceloglist: listArr + }) + } else { + that.setData({ + deviceloglist: that.data.deviceloglist.concat(listArr) + }) + } } else if (that.data.deviceloglist.length > 0) { that.setData({ show: true, diff --git a/miniprogram/pages/applog/applog.wxml b/miniprogram/pages/applog/applog.wxml index 2bfd041..95443ee 100644 --- a/miniprogram/pages/applog/applog.wxml +++ b/miniprogram/pages/applog/applog.wxml @@ -1,5 +1,5 @@ - + diff --git a/miniprogram/app.js b/miniprogram/app.js index 74840d6..407da71 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -20,7 +20,7 @@ globalData: { // httpsUrl: "https://logapi.smartlog.work/", // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地 - // httpsUrl: "http://192.168.8.110:8083/",// 柴壮本地 + // httpsUrl: "http://192.168.8.109:8083/",// 柴壮本地 // httpsUrl: "http://139.198.18.188:8083/", // url: "http://127.0.0.1:8083/", //httpsUrl: "http://127.0.0.1:8083/", diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml index 7233a68..fbfe84e 100644 --- a/miniprogram/pages/addDevice/addDevice.wxml +++ b/miniprogram/pages/addDevice/addDevice.wxml @@ -10,7 +10,7 @@ - + diff --git a/miniprogram/pages/applog/applog.js b/miniprogram/pages/applog/applog.js index 7cd6f20..1585d19 100644 --- a/miniprogram/pages/applog/applog.js +++ b/miniprogram/pages/applog/applog.js @@ -25,7 +25,7 @@ params: JSON.parse(options.params), isSeach: "true" }) - this.initPages() + this.initPages(true) } // else{ // this.setData({ @@ -53,7 +53,7 @@ }) //清空参数,重新加载 this.clearParams(); - this.initPages(); + this.initPages(true); }, @@ -255,11 +255,12 @@ }) }, //查询列表数据 - initPages: function () { + initPages: function (needClear = false) { var that = this that.setData({ show: false }) + var offsetValue = that.data.deviceloglist.length % 15 > 0 ? parseInt(that.data.deviceloglist.length / 15) + 2 : parseInt(that.data.deviceloglist.length / 15) + 1 wx.request({ @@ -285,9 +286,15 @@ listArr.forEach(function (v, i) { listArr[i]['isTouchMove'] = false }) - that.setData({ - deviceloglist: that.data.deviceloglist.concat(listArr) - }) + if(needClear) { + that.setData({ + deviceloglist: listArr + }) + } else { + that.setData({ + deviceloglist: that.data.deviceloglist.concat(listArr) + }) + } } else if (that.data.deviceloglist.length > 0) { that.setData({ show: true, diff --git a/miniprogram/pages/applog/applog.wxml b/miniprogram/pages/applog/applog.wxml index 2bfd041..95443ee 100644 --- a/miniprogram/pages/applog/applog.wxml +++ b/miniprogram/pages/applog/applog.wxml @@ -1,5 +1,5 @@ - + diff --git a/miniprogram/pages/searchLog/searchLog.js b/miniprogram/pages/searchLog/searchLog.js index 1f7069b..cacf06c 100644 --- a/miniprogram/pages/searchLog/searchLog.js +++ b/miniprogram/pages/searchLog/searchLog.js @@ -16,7 +16,7 @@ installtimeFmt: '', show: false, devcode: '', - timeShow:false, + timeShow:true, project: '', devtype: '', installPerson: '', @@ -75,9 +75,9 @@ * 生命周期函数--监听页面加载 */ onLoad: async function (options) { - await this.setData({ - timeShow:true, - }) +// await this.setData({ +// timeShow:true, +// }) const {devcode,devtype,installPerson,installtimeFmt,project} = JSON.parse(options.params) this.setData({ devcode:devcode || '', diff --git a/miniprogram/app.js b/miniprogram/app.js index 74840d6..407da71 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -20,7 +20,7 @@ globalData: { // httpsUrl: "https://logapi.smartlog.work/", // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地 - // httpsUrl: "http://192.168.8.110:8083/",// 柴壮本地 + // httpsUrl: "http://192.168.8.109:8083/",// 柴壮本地 // httpsUrl: "http://139.198.18.188:8083/", // url: "http://127.0.0.1:8083/", //httpsUrl: "http://127.0.0.1:8083/", diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml index 7233a68..fbfe84e 100644 --- a/miniprogram/pages/addDevice/addDevice.wxml +++ b/miniprogram/pages/addDevice/addDevice.wxml @@ -10,7 +10,7 @@ - + diff --git a/miniprogram/pages/applog/applog.js b/miniprogram/pages/applog/applog.js index 7cd6f20..1585d19 100644 --- a/miniprogram/pages/applog/applog.js +++ b/miniprogram/pages/applog/applog.js @@ -25,7 +25,7 @@ params: JSON.parse(options.params), isSeach: "true" }) - this.initPages() + this.initPages(true) } // else{ // this.setData({ @@ -53,7 +53,7 @@ }) //清空参数,重新加载 this.clearParams(); - this.initPages(); + this.initPages(true); }, @@ -255,11 +255,12 @@ }) }, //查询列表数据 - initPages: function () { + initPages: function (needClear = false) { var that = this that.setData({ show: false }) + var offsetValue = that.data.deviceloglist.length % 15 > 0 ? parseInt(that.data.deviceloglist.length / 15) + 2 : parseInt(that.data.deviceloglist.length / 15) + 1 wx.request({ @@ -285,9 +286,15 @@ listArr.forEach(function (v, i) { listArr[i]['isTouchMove'] = false }) - that.setData({ - deviceloglist: that.data.deviceloglist.concat(listArr) - }) + if(needClear) { + that.setData({ + deviceloglist: listArr + }) + } else { + that.setData({ + deviceloglist: that.data.deviceloglist.concat(listArr) + }) + } } else if (that.data.deviceloglist.length > 0) { that.setData({ show: true, diff --git a/miniprogram/pages/applog/applog.wxml b/miniprogram/pages/applog/applog.wxml index 2bfd041..95443ee 100644 --- a/miniprogram/pages/applog/applog.wxml +++ b/miniprogram/pages/applog/applog.wxml @@ -1,5 +1,5 @@ - + diff --git a/miniprogram/pages/searchLog/searchLog.js b/miniprogram/pages/searchLog/searchLog.js index 1f7069b..cacf06c 100644 --- a/miniprogram/pages/searchLog/searchLog.js +++ b/miniprogram/pages/searchLog/searchLog.js @@ -16,7 +16,7 @@ installtimeFmt: '', show: false, devcode: '', - timeShow:false, + timeShow:true, project: '', devtype: '', installPerson: '', @@ -75,9 +75,9 @@ * 生命周期函数--监听页面加载 */ onLoad: async function (options) { - await this.setData({ - timeShow:true, - }) +// await this.setData({ +// timeShow:true, +// }) const {devcode,devtype,installPerson,installtimeFmt,project} = JSON.parse(options.params) this.setData({ devcode:devcode || '', diff --git a/miniprogram/pages/validNameKeyword/validNameKeyword.js b/miniprogram/pages/validNameKeyword/validNameKeyword.js index 3b7bbee..58dcb89 100644 --- a/miniprogram/pages/validNameKeyword/validNameKeyword.js +++ b/miniprogram/pages/validNameKeyword/validNameKeyword.js @@ -125,7 +125,7 @@ }) } else if(res.data.code === 2402) { wx.showToast({ - title: '密码错误', + title: '账号或密码错误', icon: 'error' }) } diff --git a/miniprogram/app.js b/miniprogram/app.js index 74840d6..407da71 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -20,7 +20,7 @@ globalData: { // httpsUrl: "https://logapi.smartlog.work/", // httpsUrl: "https://38ka911915.picp.vip/", // 柴壮本地 - // httpsUrl: "http://192.168.8.110:8083/",// 柴壮本地 + // httpsUrl: "http://192.168.8.109:8083/",// 柴壮本地 // httpsUrl: "http://139.198.18.188:8083/", // url: "http://127.0.0.1:8083/", //httpsUrl: "http://127.0.0.1:8083/", diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml index 7233a68..fbfe84e 100644 --- a/miniprogram/pages/addDevice/addDevice.wxml +++ b/miniprogram/pages/addDevice/addDevice.wxml @@ -10,7 +10,7 @@ - + diff --git a/miniprogram/pages/applog/applog.js b/miniprogram/pages/applog/applog.js index 7cd6f20..1585d19 100644 --- a/miniprogram/pages/applog/applog.js +++ b/miniprogram/pages/applog/applog.js @@ -25,7 +25,7 @@ params: JSON.parse(options.params), isSeach: "true" }) - this.initPages() + this.initPages(true) } // else{ // this.setData({ @@ -53,7 +53,7 @@ }) //清空参数,重新加载 this.clearParams(); - this.initPages(); + this.initPages(true); }, @@ -255,11 +255,12 @@ }) }, //查询列表数据 - initPages: function () { + initPages: function (needClear = false) { var that = this that.setData({ show: false }) + var offsetValue = that.data.deviceloglist.length % 15 > 0 ? parseInt(that.data.deviceloglist.length / 15) + 2 : parseInt(that.data.deviceloglist.length / 15) + 1 wx.request({ @@ -285,9 +286,15 @@ listArr.forEach(function (v, i) { listArr[i]['isTouchMove'] = false }) - that.setData({ - deviceloglist: that.data.deviceloglist.concat(listArr) - }) + if(needClear) { + that.setData({ + deviceloglist: listArr + }) + } else { + that.setData({ + deviceloglist: that.data.deviceloglist.concat(listArr) + }) + } } else if (that.data.deviceloglist.length > 0) { that.setData({ show: true, diff --git a/miniprogram/pages/applog/applog.wxml b/miniprogram/pages/applog/applog.wxml index 2bfd041..95443ee 100644 --- a/miniprogram/pages/applog/applog.wxml +++ b/miniprogram/pages/applog/applog.wxml @@ -1,5 +1,5 @@ - + diff --git a/miniprogram/pages/searchLog/searchLog.js b/miniprogram/pages/searchLog/searchLog.js index 1f7069b..cacf06c 100644 --- a/miniprogram/pages/searchLog/searchLog.js +++ b/miniprogram/pages/searchLog/searchLog.js @@ -16,7 +16,7 @@ installtimeFmt: '', show: false, devcode: '', - timeShow:false, + timeShow:true, project: '', devtype: '', installPerson: '', @@ -75,9 +75,9 @@ * 生命周期函数--监听页面加载 */ onLoad: async function (options) { - await this.setData({ - timeShow:true, - }) +// await this.setData({ +// timeShow:true, +// }) const {devcode,devtype,installPerson,installtimeFmt,project} = JSON.parse(options.params) this.setData({ devcode:devcode || '', diff --git a/miniprogram/pages/validNameKeyword/validNameKeyword.js b/miniprogram/pages/validNameKeyword/validNameKeyword.js index 3b7bbee..58dcb89 100644 --- a/miniprogram/pages/validNameKeyword/validNameKeyword.js +++ b/miniprogram/pages/validNameKeyword/validNameKeyword.js @@ -125,7 +125,7 @@ }) } else if(res.data.code === 2402) { wx.showToast({ - title: '密码错误', + title: '账号或密码错误', icon: 'error' }) } diff --git a/miniprogram/pages/validNameKeyword/validNameKeyword.wxml b/miniprogram/pages/validNameKeyword/validNameKeyword.wxml index 555e414..9bdea46 100644 --- a/miniprogram/pages/validNameKeyword/validNameKeyword.wxml +++ b/miniprogram/pages/validNameKeyword/validNameKeyword.wxml @@ -10,7 +10,7 @@ - + - + diff --git a/miniprogram/pages/applog/applog.js b/miniprogram/pages/applog/applog.js index 7cd6f20..1585d19 100644 --- a/miniprogram/pages/applog/applog.js +++ b/miniprogram/pages/applog/applog.js @@ -25,7 +25,7 @@ params: JSON.parse(options.params), isSeach: "true" }) - this.initPages() + this.initPages(true) } // else{ // this.setData({ @@ -53,7 +53,7 @@ }) //清空参数,重新加载 this.clearParams(); - this.initPages(); + this.initPages(true); }, @@ -255,11 +255,12 @@ }) }, //查询列表数据 - initPages: function () { + initPages: function (needClear = false) { var that = this that.setData({ show: false }) + var offsetValue = that.data.deviceloglist.length % 15 > 0 ? parseInt(that.data.deviceloglist.length / 15) + 2 : parseInt(that.data.deviceloglist.length / 15) + 1 wx.request({ @@ -285,9 +286,15 @@ listArr.forEach(function (v, i) { listArr[i]['isTouchMove'] = false }) - that.setData({ - deviceloglist: that.data.deviceloglist.concat(listArr) - }) + if(needClear) { + that.setData({ + deviceloglist: listArr + }) + } else { + that.setData({ + deviceloglist: that.data.deviceloglist.concat(listArr) + }) + } } else if (that.data.deviceloglist.length > 0) { that.setData({ show: true, diff --git a/miniprogram/pages/applog/applog.wxml b/miniprogram/pages/applog/applog.wxml index 2bfd041..95443ee 100644 --- a/miniprogram/pages/applog/applog.wxml +++ b/miniprogram/pages/applog/applog.wxml @@ -1,5 +1,5 @@ - + diff --git a/miniprogram/pages/searchLog/searchLog.js b/miniprogram/pages/searchLog/searchLog.js index 1f7069b..cacf06c 100644 --- a/miniprogram/pages/searchLog/searchLog.js +++ b/miniprogram/pages/searchLog/searchLog.js @@ -16,7 +16,7 @@ installtimeFmt: '', show: false, devcode: '', - timeShow:false, + timeShow:true, project: '', devtype: '', installPerson: '', @@ -75,9 +75,9 @@ * 生命周期函数--监听页面加载 */ onLoad: async function (options) { - await this.setData({ - timeShow:true, - }) +// await this.setData({ +// timeShow:true, +// }) const {devcode,devtype,installPerson,installtimeFmt,project} = JSON.parse(options.params) this.setData({ devcode:devcode || '', diff --git a/miniprogram/pages/validNameKeyword/validNameKeyword.js b/miniprogram/pages/validNameKeyword/validNameKeyword.js index 3b7bbee..58dcb89 100644 --- a/miniprogram/pages/validNameKeyword/validNameKeyword.js +++ b/miniprogram/pages/validNameKeyword/validNameKeyword.js @@ -125,7 +125,7 @@ }) } else if(res.data.code === 2402) { wx.showToast({ - title: '密码错误', + title: '账号或密码错误', icon: 'error' }) } diff --git a/miniprogram/pages/validNameKeyword/validNameKeyword.wxml b/miniprogram/pages/validNameKeyword/validNameKeyword.wxml index 555e414..9bdea46 100644 --- a/miniprogram/pages/validNameKeyword/validNameKeyword.wxml +++ b/miniprogram/pages/validNameKeyword/validNameKeyword.wxml @@ -10,7 +10,7 @@ - +