修复登录后未跳转的问题

pagesA/pages/popAct/index.vue

@@ -150,19 +150,15 @@ export default {
                 url: '/pages/main'
             })
         },
-        checkLogin() {
-            let token = uni.getStorageSync('userToken')
-            if(!token) { 
-                uni.setStorageSync('routerLoginPageType', 'switchTab')
-                //跳转到登录页
-                let returnPage = '/pages/main';
-                let pageType = "reLaunch"
-                uni.navigateTo({
-                	url: "/pages/login/index/index?returnPage=" + returnPage + '&pageType=' + pageType
-                })
-                return null
-            }
-            return 1
+        goToLogin() {
+            uni.setStorageSync('routerLogin', '/pagesA/pages/popAct/index')
+            uni.setStorageSync('routerLoginPageType', 'switchTab')
+            //跳转到登录页
+            let returnPage = '/pages/main';
+            let pageType = "reLaunch"
+            uni.navigateTo({
+                url: "/pages/login/index/index?returnPage=" + returnPage + '&pageType=' + pageType
+            })
         },
         // 选择爱车
         radioChange(item){
@@ -173,18 +169,21 @@ export default {
         },
         // 获取爱车列表
         getCarList(){
-            let v = this.checkLogin()
-            if(v) {
-                this.$http.request({
-                    url:'/app/vehicleAdmin/list',
-                    method:'get',
-                    data:{},
-                    isFactory:false,
-                }).then(res => {
-                    this.carList = res.data || []
-                    this.selectCar = true
-                })
+            let token = uni.getStorageSync('userToken')
+            if(!token) {  
+                this.goToLogin()
+                return
             }
+            
+            this.$http.request({
+                url:'/app/vehicleAdmin/list',
+                method:'get',
+                data:{},
+                isFactory:false,
+            }).then(res => {
+                this.carList = res.data || []
+                this.selectCar = true
+            })
         },
         // 添加车辆
         addCar() {
@@ -235,10 +234,11 @@ export default {
         //活动检查信息
         submitAct() {
             let that = this
-            let v = that.checkLogin()
-            if(!v) {
-                return
-            }
+           let token = uni.getStorageSync('userToken')
+           if(!token) {  
+               that.goToLogin()
+               return
+           }
             that.$refs.form1.validate().then(res => {
                 let opts = {
                 	url: '/app/pop/act',