merge master

src/views/shop/order-list.vue

@@ -194,7 +194,7 @@
             })
           }).catch(err => {
             this.$message({
-                message: response,
+                message: err,
                 type: 'error'
             })
           })