|
|
@ -122,11 +122,11 @@ |
|
|
|
|
|
|
|
|
// tab栏数据 |
|
|
// tab栏数据 |
|
|
const tabs = [ |
|
|
const tabs = [ |
|
|
{name: `全部`,value: 'all'}, |
|
|
{name: `全部`,value: 'all',key: ''}, |
|
|
{name: `待付款`,value: 'payment'}, |
|
|
{name: `待付款`,value: 'payment',key: 1}, |
|
|
{name: `待交付`,value: 'delivery'}, |
|
|
{name: `待交付`,value: 'delivery',key: 2}, |
|
|
{name: `已中止`,value: 'hasabort'}, |
|
|
{name: `已中止`,value: 'hasabort',key: 4}, |
|
|
{name: `已关闭`,value: 'hasclosed'}, |
|
|
{name: `已关闭`,value: 'hasclosed',key: 5}, |
|
|
] |
|
|
] |
|
|
|
|
|
|
|
|
export default { |
|
|
export default { |
|
|
@ -241,18 +241,26 @@ |
|
|
getOrderList(pageNo = 1) { |
|
|
getOrderList(pageNo = 1) { |
|
|
const app = this |
|
|
const app = this |
|
|
return new Promise((resolve, reject) => { |
|
|
return new Promise((resolve, reject) => { |
|
|
let data = {pagination:true,sidePagination:"server",queryParamsType:"limit",pageNumber:pageNo,pageSize:pageSize} |
|
|
let status = app.tabs[app.curTab].key |
|
|
OrderApi.ordquery(data) |
|
|
let data = { |
|
|
|
|
|
pagination:true, |
|
|
|
|
|
sidePagination:"server", |
|
|
|
|
|
queryParamsType:"limit", |
|
|
|
|
|
pageNumber:pageNo, |
|
|
|
|
|
pageSize:pageSize, |
|
|
|
|
|
order_status: status |
|
|
|
|
|
} |
|
|
|
|
|
OrderApi.ordquery(data) |
|
|
//OrderApi.list({ dataType: app.getTabValue(), page: pageNo }, { load: false }) |
|
|
//OrderApi.list({ dataType: app.getTabValue(), page: pageNo }, { load: false }) |
|
|
.then(result => { |
|
|
.then(result => { |
|
|
// 按格式封装 |
|
|
// 按格式封装 |
|
|
let nlist = {data:result.data,total:result.count,current_page:pageNo} |
|
|
let nlist = {data:result.data,total:result.count,current_page:pageNo} |
|
|
// 合并新数据 |
|
|
// 合并新数据 |
|
|
const newList = app.initList(nlist) |
|
|
const newList = app.initList(nlist) |
|
|
console.log(newList,"newlist") |
|
|
console.log(newList,"newlist") |
|
|
app.list.data = getMoreListData(newList, app.list, pageNo) |
|
|
app.list.data = getMoreListData(newList, app.list, pageNo) |
|
|
resolve(newList) |
|
|
resolve(newList) |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|