解决merge

pages/order/index.vue

@@ -47,12 +47,12 @@
                         type: "paid",
                     },
                     {
-                        name: "待签收",
+                        name: "待收货",
                         type: "delivered",
                     },
                     {
-                        name: "已完成",
-                        type: "completed",
+                        name: " 已签收",
+                        type: "signed",
                     },
                 ],
                 index: '0',
@@ -187,7 +187,7 @@
                         this.$Router.push({
                             name: 'OrderLogistics',
                             params: {
-                                orderNo
+                                orderNo: orderNo,
                             },
                         });
                         break;
@@ -259,7 +259,7 @@
                         })
                     break;
                     case 'shopsDetail':
-                        this.$Router.push({ name: 'ShopDetail', params: {shopId: shopId}})
+                        this.$Router.push({ name: 'ShopDetail', params: {ShopId: shopId}})
                     break;
                     case 'goodsDetail':
                         this.$Router.push({ name: 'StoreGoods', params: {id: goodsId}})
@@ -325,4 +325,5 @@
     .pages-load {
         padding-bottom: $padding;
     }
+
 </style>