From 2d30a05712375d690e1502c354ff430cb7f1019d Mon Sep 17 00:00:00 2001
From: Burt <1020103647@qq.com>
Date: Sat, 20 Jan 2024 18:41:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E7=99=BB=E9=99=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{login/index.vue => my/components/wx-login.vue}      | 2 +-
 src/pages/my/index.vue                                   | 9 +++------
 src/typings.d.ts                                         | 4 ++--
 3 files changed, 6 insertions(+), 9 deletions(-)
 rename src/pages/{login/index.vue => my/components/wx-login.vue} (96%)

diff --git a/src/pages/login/index.vue b/src/pages/my/components/wx-login.vue
similarity index 96%
rename from src/pages/login/index.vue
rename to src/pages/my/components/wx-login.vue
index bbb38c9..30e5ff9 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/my/components/wx-login.vue
@@ -20,7 +20,7 @@
   </view>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="WxLogin">
 import { useUserStore } from '@/store'
 
 const show = ref(false)
diff --git a/src/pages/my/index.vue b/src/pages/my/index.vue
index 124fde9..dbc467c 100644
--- a/src/pages/my/index.vue
+++ b/src/pages/my/index.vue
@@ -6,19 +6,16 @@
 <template>
   <view>我的</view>
   <view>wx的openid:{{ openId }} </view>
-  <view @click="goLoginPage">去登录</view>
+  <wx-login />
 </template>
 
 <script lang="ts" setup>
 import { useUserStore } from '@/store'
 import { http } from '@/utils/http'
+import WxLogin from './components/wx-login.vue'
 
 const userStore = useUserStore()
-
 const openId = ref('')
-const goLoginPage = () => {
-  uni.navigateTo({ url: '/pages/login/index' })
-}
 
 // 用户登录，获取openId
 uni.login({
@@ -32,7 +29,7 @@ uni.login({
       },
     })
     openId.value = res.result.openid
-    userStore.setUserInfo({ nickname: '微信用户', avatar: '', openid: res.result.openid })
+    userStore.setUserInfo({ openid: res.result.openid })
   },
 })
 </script>
diff --git a/src/typings.d.ts b/src/typings.d.ts
index c4cfe16..c1e9c5c 100644
--- a/src/typings.d.ts
+++ b/src/typings.d.ts
@@ -1,6 +1,6 @@
 export type UserInfo = {
-  nickname: string
-  avatar: string
+  nickname?: string
+  avatar?: string
   /** 微信的 openid，非微信没有这个字段 */
   openid?: string
   token?: string