|
@@ -32,8 +32,10 @@ Page({
|
|
|
}
|
|
|
let pages = getCurrentPages();
|
|
|
let prePage = pages[pages.length - 2];
|
|
|
- this.data.param.content.sa_serviceorderid = prePage.data.sa_serviceorderid
|
|
|
- this.data.param.content.sa_orderid = prePage.data.sa_orderid
|
|
|
+ if (prePage) {
|
|
|
+ this.data.param.content.sa_serviceorderid = prePage.data.sa_serviceorderid
|
|
|
+ this.data.param.content.sa_orderid = prePage.data.sa_orderid
|
|
|
+ }
|
|
|
this.listData();
|
|
|
},
|
|
|
tabChange(e) {
|
|
@@ -54,21 +56,15 @@ Page({
|
|
|
this.data.param.content.where.condition = ''
|
|
|
this.data.list = []
|
|
|
this.data.param.content.pageNumber = 1
|
|
|
+ this.listData();
|
|
|
},
|
|
|
async listData() {
|
|
|
+ console.log(this.data.param)
|
|
|
const res = await api._post(this.data.param)
|
|
|
- console.log(res)
|
|
|
- if (res.data.length > 0) {
|
|
|
- this.setData({
|
|
|
- list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data)
|
|
|
- })
|
|
|
- } else {
|
|
|
- wx.showToast({
|
|
|
- title: '没有更多了!',
|
|
|
- duration: 2000,
|
|
|
- icon: 'none'
|
|
|
- })
|
|
|
- }
|
|
|
+ console.log("产品列表", res)
|
|
|
+ this.setData({
|
|
|
+ list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data)
|
|
|
+ })
|
|
|
},
|
|
|
handleGroupChange(event) {
|
|
|
this.setData({
|