diff --git a/src/api/user.js b/src/api/user.js
index 70ace67..7b60824 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -18,7 +18,7 @@ export function getInfo(token) {
 
 export function logout() {
   return request({
-    url: '/api/admin/auth/logout',
+    url: '/api/merchant/logout',
     method: 'post'
   })
 }
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 693f574..72eb3e5 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -74,6 +74,10 @@ export default {
         keyword:''
       },
       status:[
+        {
+          label:'全部',
+          value:''
+        },
         {
           label:'待处理',
           value:'pending'