From 183a95f48b7f40a74676d7ec3843b26feb442986 Mon Sep 17 00:00:00 2001
From: Waiting <waitinghc@foxmail.com>
Date: Tue, 4 Jun 2024 10:21:16 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/common/login/index.vue    | 13 +++----------
 src/pages/common/register/index.vue |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/pages/common/login/index.vue b/src/pages/common/login/index.vue
index af1fa10..cb0265d 100644
--- a/src/pages/common/login/index.vue
+++ b/src/pages/common/login/index.vue
@@ -26,29 +26,22 @@
 <script setup lang='ts'>
 import { useUserStore } from '@/store';
 import { assetsUrl } from '@/utils/assets';
-import { getRegisterStoreId, showToast } from '@/utils';
+import { showToast } from '@/utils';
 
 const userStore = useUserStore();
 const isAgreePrivacy = ref(false);
 
-async function wechatLogin() {
+function wechatLogin() {
   if(!isAgreePrivacy.value) {
     showToast('请先阅读并同意小程序隐私保护协议');
     return;
   }
 
+  uni.showLoading();
   userStore.login().then(() => {
     uni.hideLoading();
     uni.reLaunch({ url: '/pages/home/index' });
   });
-  // await uni.showLoading();
-  // const result = await userStore.login();
-  // uni.hideLoading();
-  // if(result) {
-  //   await uni.reLaunch({ url: '/pages/home/index' });
-  // } else {
-  //   await uni.navigateTo({ url: '/pages/common/register/index' });
-  // }
 }
 
 const bindCheck = () => {
diff --git a/src/pages/common/register/index.vue b/src/pages/common/register/index.vue
index e5551ff..4335374 100644
--- a/src/pages/common/register/index.vue
+++ b/src/pages/common/register/index.vue
@@ -120,7 +120,7 @@ const save = async () => {
     avatarUrl: avatarUrl.value,
     nickName: nickName.value,
     telephone: telephone.value,
-    birthday: dayjs(birthday.value).format('YYYY-MM-DD HH:mm:ss'),
+    birthday: dayjs(birthday.value).isValid() ? dayjs(birthday.value).format('YYYY-MM-DD HH:mm:ss') : dayjs().format('YYYY-MM-DD HH:mm:ss'),
     gender: gender.value
   };