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