退出

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'
   })
 }

src/views/order/index.vue

@@ -74,6 +74,10 @@ export default {
         keyword:''
       },
       status:[
+        {
+          label:'全部',
+          value:''
+        },
         {
           label:'待处理',
           value:'pending'