diff --git a/pages/agent/ability-list/index.js b/pages/agent/ability-list/index.js index 3e730fc..fee1492 100644 --- a/pages/agent/ability-list/index.js +++ b/pages/agent/ability-list/index.js @@ -43,7 +43,7 @@ Scene({ var respList = result.data.records let nowList = `orderList[${this.data.orderList.length}]` var num = result.data.current - var finished = result.data.current >= result.data.pages + var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) } else { this.setData({ requesting: false, finished: true, loading: false }) diff --git a/pages/agent/factory-fragment/index.js b/pages/agent/factory-fragment/index.js index 317a9d4..f998d72 100644 --- a/pages/agent/factory-fragment/index.js +++ b/pages/agent/factory-fragment/index.js @@ -90,7 +90,7 @@ Component({ var respList = result.data.records let nowList = `orderList[${this.data.orderList.length}]` var num = result.data.current - var finished = result.data.current >= result.data.pages + var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total this.setData({[nowList]: respList, total: result.data.total, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) } else { this.setData({ requesting: false, finished: true, loading: false, }) diff --git a/pages/agent/focus-fragment/index.js b/pages/agent/focus-fragment/index.js index 491c459..d1b027b 100644 --- a/pages/agent/focus-fragment/index.js +++ b/pages/agent/focus-fragment/index.js @@ -67,7 +67,7 @@ Component({ var respList = result.data.records let nowList = `orderList[${this.data.orderList.length}]` var num = result.data.current - var finished = result.data.current >= result.data.pages + var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total this.setData({[nowList]: respList, total: result.data.total, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) } else { this.setData({ requesting: false, finished: true, loading: false, }) diff --git a/pages/home/customer-list/index.js b/pages/home/customer-list/index.js index 0c6063e..7258e3a 100644 --- a/pages/home/customer-list/index.js +++ b/pages/home/customer-list/index.js @@ -141,7 +141,7 @@ Scene({ }) // 利用filter方法,剔除之前存在的空元素 orderList = orderList.filter(function (item) { - return item != ''; // 注:IE9(不包含IE9)以下的版本没有trim()方法 + return item != '' // 注:IE9(不包含IE9)以下的版本没有trim()方法 }) // 利用sort方法进行排序 orderList.sort(this.listSort('sign')) @@ -156,8 +156,8 @@ Scene({ // 排序 listSort(sign) { return function (a, b) { - var value1 = a[sign].charCodeAt(); - var value2 = b[sign].charCodeAt(); + var value1 = a[sign].charCodeAt() + var value2 = b[sign].charCodeAt() return value1 - value2 } }, @@ -166,7 +166,8 @@ Scene({ let result = [] this.data.orderList.forEach(item => { item.data.forEach(element => { - if (element.name.indexOf(detail.toLocaleUpperCase()) !== -1 || element.mobile.indexOf(detail.toLocaleUpperCase()) !== -1) { + var keyword = detail.toLocaleUpperCase() + if (element.name.indexOf(keyword) !== -1 || element.mobile.indexOf(keyword) !== -1) { result.push(element) } }) @@ -214,10 +215,10 @@ Scene({ wx.navigateTo({ url: `/pages/home/customer-info/index?` }) }, rpx2px: function(rpx) { - return rpx / 750 * app.globalData.windowWidth; + return rpx / 750 * app.globalData.windowWidth }, px2rpx: function(px) { - return px * 750 / app.globalData.windowWidth; + return px * 750 / app.globalData.windowWidth }, touchStart: function(e) { this.setData({ touchmove: true }) diff --git a/pages/home/customer-list/index.wxml b/pages/home/customer-list/index.wxml index 094efef..9e5efbd 100644 --- a/pages/home/customer-list/index.wxml +++ b/pages/home/customer-list/index.wxml @@ -96,7 +96,7 @@ - {{item.sign}} diff --git a/pages/home/user-info/index.wxml b/pages/home/user-info/index.wxml index 03bbcd5..ef07a31 100644 --- a/pages/home/user-info/index.wxml +++ b/pages/home/user-info/index.wxml @@ -65,7 +65,7 @@ 退出当前账号 - + 当前版本:{{version}} diff --git a/pages/setting/vehicle-list/index.js b/pages/setting/vehicle-list/index.js index ed81773..b3dd9fd 100644 --- a/pages/setting/vehicle-list/index.js +++ b/pages/setting/vehicle-list/index.js @@ -63,7 +63,7 @@ Scene({ var respList = result.data.records let nowList = `orderList[${this.data.orderList.length}]` var num = this.data.form.pageNum - var finished = result.data.current >= result.data.total + var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) } else { this.setData({ finished: true, requesting: false, loading: false }) diff --git a/pages/ztbvip/member/index.wxss b/pages/ztbvip/member/index.wxss index 74bbed8..711f681 100644 --- a/pages/ztbvip/member/index.wxss +++ b/pages/ztbvip/member/index.wxss @@ -115,11 +115,13 @@ .openVip21{ border-radius: 6%; border: 2rpx solid #DBDBDB; + padding: 12rpx 0rpx; } .openVip22{ border-radius: 6%; border: 2rpx solid #d0a45c; background-color: #fefaf1; + padding: 12rpx 0rpx; } .openVipBtn{ background-color: #f2d48e;