diff --git a/.travis.yml b/.travis.yml index 9e4803ca..ecdbef72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,12 @@ script: - yarn run build:travis before_install: - - ./qshell account $AK $SK + - ./qshell account $AK $SK $NAME - curl -o- -L https://yarnpkg.com/install.sh | bash - export PATH=$HOME/.yarn/bin:$PATH after_success: + - ./qshell listbucket d2-admin -o cdn-files.txt + - ./qshell batchdelete --force d2-admin -i cdn-files.txt - ./qshell qupload qiniu-config - ./qshell cdnrefresh -dirs cdnrefresh-dirs.txt \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 5b49b934..50da5de0 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,12 +6,21 @@ import NProgress from 'nprogress' import 'nprogress/nprogress.css' import store from '@/store/index' - import util from '@/libs/util.js' // 路由数据 import routes from './routes' +// fix vue-router NavigationDuplicated +const VueRouterPush = VueRouter.prototype.push +VueRouter.prototype.push = function push (location) { + return VueRouterPush.call(this, location).catch(err => err) +} +const VueRouterReplace = VueRouter.prototype.replace +VueRouter.prototype.replace = function replace (location) { + return VueRouterReplace.call(this, location).catch(err => err) +} + Vue.use(VueRouter) // 导出路由 在 main.js 里使用