Merge branch 'master' of git.quantgroup.cn:ui/cauchy-ui

src/views/orderDetail/index.vue

@@ -168,7 +168,7 @@ export default {
     }
   },
   beforeRouteLeave(from, to, next) {
-    if (isBack() || from.path.indexOf('pay') > -1) {
+    if (isBack() || ['/payFail', '/paySuccess', '/payWaiting'].indexOf(from.path) > -1) {
       window.location.href = window.location.origin;
     } else {
       next();