diff --git a/pages/process/agent-list/index.js b/pages/process/agent-list/index.js index b3dc038..af4c40c 100644 --- a/pages/process/agent-list/index.js +++ b/pages/process/agent-list/index.js @@ -1,11 +1,9 @@ // pages/process/order-list/index.js import { getAgentOrderList } from "../../../api/payment" -const event = require('../../../utils/event') const util = require('../../../utils/util') const app = getApp() Page({ - // * 页面的初始数据 data: { height: app.globalData.fragmentHeight - 90, tabIndex: 0, @@ -24,20 +22,13 @@ Page({ pageNum: 1, pageSize: 10 }, - title: '全部', lastTime: null }, // * 生命周期函数--监听页面加载 onLoad: function (options) { - event.on('OrderMessage', this, this.onEvent) - this.setData({ height: app.globalData.fragmentHeight - 90, title: this.data.title }) + this.setData({ height: app.globalData.fragmentHeight - 90 }) this.fetchOrderList() }, - onEvent: function(message){ - if (message.what == 12) { - this.onRefreshList() - } - }, onTabChange: function ({detail}) { if (this.data.tabIndex == Number(detail.index)) { return @@ -64,66 +55,48 @@ Page({ } else { this.setData({ requesting: true }) } + console.log('getAgentOrderList======67') getAgentOrderList(this.data.form).then(result => { - this.handResult(result) - }).catch(err => { - this.setData({ requesting: false, loading: false }) - util.showToast(err) - }) - }, - handResult: function(result){ - if (result.data && result.data.records.length) { - var respList = result.data.records - // 对返回的消息列表进行处理,将同一天的消息显示在一起 - for (let i = 0; i < respList.length; i++) { - if (util.isEmpty(this.data.lastTime)) { - this.data.lastTime = respList[i].createTime - if (this.data.lastTime.length > 10) { - this.data.lastTime = this.data.lastTime.substring(0, 10) + if (result.data && result.data.records.length) { + var respList = result.data.records + // 对返回的消息列表进行处理,将同一天的消息显示在一起 + for (let i = 0; i < respList.length; i++) { + if (util.isEmpty(this.data.lastTime)) { + this.data.lastTime = respList[i].createTime + if (this.data.lastTime.length > 10) { + this.data.lastTime = this.data.lastTime.substring(0, 10) + } + respList[i].tipsTime = this.data.lastTime + } else { + var itemTime = respList[i].createTime + if (itemTime.length > 10) { + itemTime = itemTime.substring(0, 10) + } + if (this.data.lastTime !== itemTime) { + respList[i].tipsTime = itemTime + } + this.data.lastTime = itemTime } - respList[i].tipsTime = this.data.lastTime + } + let nowList = `orderList[${this.data.orderList.length}]` + var num = this.data.form.pageNum + var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total + if(this.data.form.pageNum == 1){ + this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), top: 0, finished, requesting: false, loading: false }) } else { - var itemTime = respList[i].createTime - if (itemTime.length > 10) { - itemTime = itemTime.substring(0, 10) - } - if (this.data.lastTime !== itemTime) { - respList[i].tipsTime = itemTime - } - this.data.lastTime = itemTime + this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) } - } - let nowList = `orderList[${this.data.orderList.length}]` - var num = this.data.form.pageNum - var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total - if(this.data.form.pageNum == 1){ - this.setData({ - [nowList]: respList, - ['form.pageNum']: (num + 1), - top: 0, - finished, - requesting: false, - loading: false - }) } else { - this.setData({ - [nowList]: respList, - ['form.pageNum']: (num + 1), - finished, - requesting: false, - loading: false - }) + this.setData({ finished: true, requesting: false, loading: false }) } - } else { - this.setData({ finished: true, requesting: false, loading: false }) - } + }).catch(err => { + this.setData({ requesting: false, loading: false }) + util.showToast(err) + }) }, lookItem: function (e) { var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index] wx.navigateTo({ url: `/pages/process/order-info/index?agent=1&id=${item.orderId}` }) - }, - onUnload: function(){ - event.remove('OrderMessage', this) } }) \ No newline at end of file diff --git a/pages/process/agent-list/index.json b/pages/process/agent-list/index.json index 5b2e615..b6d96ce 100644 --- a/pages/process/agent-list/index.json +++ b/pages/process/agent-list/index.json @@ -2,8 +2,6 @@ "usingComponents": { "refresh-view": "/components/refresher/index", "van-button": "/components/button/index", - "van-index-bar": "/components/index-bar/index", - "van-index-anchor": "/components/index-anchor/index", "van-tabs": "/components/tabs/index", "van-tab": "/components/tab/index", "van-cell": "/components/cell/index", diff --git a/pages/process/agent-list/index.wxml b/pages/process/agent-list/index.wxml index 0fe5ce1..10a2449 100644 --- a/pages/process/agent-list/index.wxml +++ b/pages/process/agent-list/index.wxml @@ -18,7 +18,7 @@ - {{item.tipsTime}} + {{item.tipsTime}} diff --git a/pages/process/payment-list/index.json b/pages/process/payment-list/index.json index 6bf1999..c81d0b8 100644 --- a/pages/process/payment-list/index.json +++ b/pages/process/payment-list/index.json @@ -1,10 +1,6 @@ { "usingComponents": { "refresh-view": "/components/refresher/index", - "van-button": "/components/button/index", - "van-index-bar": "/components/index-bar/index", - "van-index-anchor": "/components/index-anchor/index", - "van-checkbox": "/components/checkbox/index", "van-cell": "/components/cell/index", "van-divider": "/components/divider/index", "van-loading": "/components/loading/index" diff --git a/pages/process/payment-list/index.wxml b/pages/process/payment-list/index.wxml index 4737f3b..37841ad 100644 --- a/pages/process/payment-list/index.wxml +++ b/pages/process/payment-list/index.wxml @@ -14,16 +14,12 @@ - - {{item.tipsTime}} - + + {{item.tipsTime}} - + 客户名称:{{item.factoryCustomerName}} ({{item.factoryCustomerMobile}}) diff --git a/project.config.json b/project.config.json index 8ac0a38..a2fa6d7 100644 --- a/project.config.json +++ b/project.config.json @@ -12,7 +12,7 @@ "minified": true, "newFeature": false, "coverView": true, - "nodeModules": true, + "nodeModules": false, "autoAudits": false, "showShadowRootInWxmlPanel": false, "scopeDataCheck": false,