优化没登陆就入住办理

pages/index/index.js

@@ -77,6 +77,9 @@ Page({
     this.login()
   },
   login() {
+    wx.showLoading({
+      title:'加载中...'
+    })
     const that = this
     wx.removeStorageSync('token')
     wx.login({
@@ -91,11 +94,10 @@ Page({
           })
           this.getPolicyList()
           this.getMessage()
+          wx.hideLoading()
         }).catch(err => {
           console.log(err);
-          wx.redirectTo({
+          wx.hideLoading()
-            url: '/pages/register/register',
-          })
         })
       },
     })
@@ -185,33 +187,34 @@ Page({
     })
   },
   navigateTo(e){
-
+    if(wx.getStorageSync('token')){
-    if(e.currentTarget.dataset.url && e.currentTarget.dataset.url != '/subpages/OCRCard/pages/index/index'){
+      if(e.currentTarget.dataset.url && e.currentTarget.dataset.url != '/subpages/OCRCard/pages/index/index'){
-      if(e.currentTarget.dataset.url === '/pages/serve/serve'){
+        if(e.currentTarget.dataset.url === '/pages/serve/serve'){
-        wx.switchTab({
+          wx.switchTab({
-          url: '/pages/serve/serve',
+            url: '/pages/serve/serve',
-        })
+          })
-      }
+        }
-        wx.navigateTo({
-          url: e.currentTarget.dataset.url,
-        })
-    }else if(e.currentTarget.dataset.url){
-      if(!this.data.bindPhone){
-        if(this.data.userInfo.idCard){
           wx.navigateTo({
-            url: `/subpages/index/checkInUser/checkInUser?idCard=${this.data.userInfo.idCard}&name=${this.data.userInfo.name}&phone=${this.data.userInfo.phone}`,
+            url: e.currentTarget.dataset.url,
           })
+      }else if(e.currentTarget.dataset.url){
+        if(!this.data.bindPhone){
+          if(this.data.userInfo.idCard){
+            wx.navigateTo({
+              url: `/subpages/index/checkInUser/checkInUser?idCard=${this.data.userInfo.idCard}&name=${this.data.userInfo.name}&phone=${this.data.userInfo.phone}`,
+            })
+          }else{
+            wx.navigateTo({
+              url: `/subpages/OCRCard/pages/index/index`,
+            })
+          }
         }else{
           wx.navigateTo({
-            url: `/subpages/OCRCard/pages/index/index`,
+            url: '/pages/register/register',
           })
         }
-      }else{
+          
-        wx.navigateTo({
-          url: '/pages/register/register',
-        })
       }
-        
     }
   }
 });