Merge remote-tracking branch 'origin/master'

945710c4 · anxixi · 465ecc3c · 39fce7a7 · 945710c4
Commit 945710c4 authored Mar 29, 2021 by anxixi
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

public.js src/assets/js/public.js +3 -3

No files found.
--- a/src/assets/js/public.js
+++ b/src/assets/js/public.js
@@ -1168,9 +1168,9 @@ export default {
                }
                if (to.name == "mineIndex" && !this.getUserInfoCookieType() && this.judgeBrandIsWechatOrHtml() == 1) router.replace({path: '/circleList'})
                next();
-                // if(to.path!=from.path){
-                //     cancelRequest.cancelRequest()
-                // }
+                if(to.path!=from.path){
+                    cancelRequest.cancelRequest()
+                }
            } else {
                console.log(res.msg)
            }