From 206eb49893a3db214710c4397c5f209230725c67 Mon Sep 17 00:00:00 2001 From: Dawn_Ocean Date: Thu, 9 May 2024 17:33:53 +0800 Subject: [PATCH] add member/checklogin in getInfo --- src/service/getInfo.ts | 2 +- src/service/pingAte.ts | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/service/getInfo.ts b/src/service/getInfo.ts index 62cecfd..d1278e5 100644 --- a/src/service/getInfo.ts +++ b/src/service/getInfo.ts @@ -6,7 +6,7 @@ import { getLocaleData } from './localeData'; export function getInfo() { Taro.request({ - url: getUrl('/member/login'), + url: getUrl('/member/checklogin'), method: 'POST', data: { token: wechatUser.getToken(), diff --git a/src/service/pingAte.ts b/src/service/pingAte.ts index bf9ac19..83346b3 100644 --- a/src/service/pingAte.ts +++ b/src/service/pingAte.ts @@ -13,15 +13,14 @@ export function pingAte() { }) .then((res) => { console.log(res.data); - // checkLogin((success) => { - // if (success) { - // wechatUser.setToken(checkToken()); - // getInfo(); - // } else { - // loginAte(); - // } - // }); - loginAte(); + checkLogin((success) => { + if (success) { + wechatUser.setToken(checkToken()); + getInfo(); + } else { + loginAte(); + } + }); }) .catch((err) => { console.log(err.errMsg);