Merge remote-tracking branch 'origin/master'

web/src/router/index.js

@@ -3,6 +3,13 @@ import Router from 'vue-router'
 
 Vue.use(Router)
 
+//获取原型对象上的push函数
+const originalPush = Router.prototype.push
+//修改原型对象中的push方法
+Router.prototype.push = function push(location) {
+   return originalPush.call(this, location).catch(err => err)
+}
+
 const baseRouters = [{
         path: '/',
         redirect: '/login'
@@ -23,4 +30,4 @@ const createRouter = () => new Router({
 
 const router = createRouter()
 
-export default router
+export default router