Merge remote-tracking branch 'origin/master'

279366e6 · zhangyanni · 8bd54cfa · f1c8aebd · 279366e6
Commit 279366e6 authored Oct 31, 2019 by zhangyanni
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

main.js src/main.js +6 -2

No files found.
--- a/src/main.js
+++ b/src/main.js
@@ -151,8 +151,12 @@ router.beforeEach((to, from, next) => {
            if(to.path == '/termserviceed'||to.path == '/privacypolicyed'||to.path == '/contactused'||to.path == '/aboutused'||to.path == '/casedetailsed'||to.path == '/lndustryfocused'||to.path == '/successfulcaseed'||to.path == '/usehelped'||to.path == '/useHelp'||to.path == '/reminder'||to.path == '/contactus' ||to.path == '/privacypolicy' ||to.path == '/termservice' ||to.path == '/casedetails' ||to.path == '/successfulcase' ||to.path == '/lndustryfocus' ||to.path == '/aboutus' ){

            }else{
-                if(ismobile == 1) router.push('/mobileRegister');
-                else router.push('/login');
+                if(to.path == '/projectlist'){
+                    router.push('/mobileRegister');
+                }else{
+                    if(ismobile == 1) router.replace('/mobileRegister');
+                    else router.push('/login');
+                }
            }
        }
    }else{