diff --git a/api/order.js b/api/order.js
index 8a9c16c..1b9079b 100644
--- a/api/order.js
+++ b/api/order.js
@@ -8,7 +8,9 @@ const api = {
   express: 'order/express',
   cancel: 'order/cancel',
   receipt: 'order/receipt',
-  pay: 'order/pay'
+  pay: 'order/pay',
+  
+  ordquery:'AgencyAddress/order/queryRrder' //订单查询
 }
 
 // 当前用户待处理的订单数量
@@ -45,3 +47,8 @@ export function receipt(orderId, data) {
 export function pay(orderId, payType, param) {
   return request.get(api.pay, { orderId, payType, ...param })
 }
+
+// order query
+export function ordquery(data){
+	return request.post(api.ordquery,data)
+}
\ No newline at end of file
diff --git a/pages/order/index.vue b/pages/order/index.vue
index b2555c5..95b0dbe 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -144,17 +144,17 @@
     name: `全部`,
     value: 'all'
   }, {
-    name: `待支付`,
+    name: `待付款`,
     value: 'payment'
   }, {
-    name: `待发货`,
+    name: `待交付`,
     value: 'delivery'
   }, {
-    name: `待收货`,
-    value: 'received'
+    name: `已中止`,
+    value: 'hasabort'
   }, {
-    name: `待评价`,
-    value: 'comment'
+    name: `已关闭`,
+    value: 'hasclosed'
   }]
 
   export default {
@@ -191,7 +191,7 @@
           noMoreSize: 4,
           // 空布局
           empty: {
-            tip: '亲，暂无订单记录'
+            tip: '暂无订单记录'
           }
         },
         // 控制onShow事件是否刷新订单列表
@@ -261,7 +261,9 @@
       getOrderList(pageNo = 1) {
         const app = this
         return new Promise((resolve, reject) => {
-          OrderApi.list({ dataType: app.getTabValue(), page: pageNo }, { load: false })
+			let data = {page:pageNo,limit:pageSize}
+			OrderApi.ordquery(data)
+          //OrderApi.list({ dataType: app.getTabValue(), page: pageNo }, { load: false })
             .then(result => {
               // 合并新数据
               const newList = app.initList(result.data.list)