完善登录逻辑和个人资料完善

utils/utils.uts

@@ -149,28 +149,15 @@ export function responsiveState() {
   }
 }
 
-export function goToLogin(redirectUrl?: string | null) {
-  try {
-    const target = redirectUrl != null && redirectUrl.length > 0 ? redirectUrl : ''
-    uni.showModal({
-      title: '提示',
-      content: '当前操作需要登录，是否前往登录页继续？',
-      confirmText: '去登录',
-      cancelText: '先逛逛',
-      success: (res) => {
-        if (res.confirm) {
-          if (target.length > 0) {
-            const redirect = encodeURIComponent(target)
-            uni.navigateTo({ url: `/pages/user/login?redirect=${redirect}` })
-          } else {
-            uni.navigateTo({ url: '/pages/user/login' })
-          }
-        }
-      }
-    })
-  } catch (e) {
-    uni.navigateTo({ url: '/pages/user/login' })
+export function goToLogin(redirectUrl: string = ''): void {
+  let url = '/pages/user/login'
+  if (redirectUrl != null && redirectUrl !== '') {
+    url = url + '?redirect=' + encodeURIComponent(redirectUrl)
   }
+
+  uni.navigateTo({
+    url
+  })
 }
 
 /**