Pārlūkot izejas kodu

feat: 优化微信登陆

Burt 2 gadi atpakaļ
vecāks
revīzija
2d30a05712
3 mainītis faili ar 6 papildinājumiem un 9 dzēšanām
  1. 1 1
      src/pages/login/index.vue
  2. 3 6
      src/pages/my/index.vue
  3. 2 2
      src/typings.d.ts

+ 1 - 1
src/pages/login/index.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)

+ 3 - 6
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>

+ 2 - 2
src/typings.d.ts

@@ -1,6 +1,6 @@
 export type UserInfo = {
-  nickname: string
-  avatar: string
+  nickname?: string
+  avatar?: string
   /** 微信的 openid,非微信没有这个字段 */
   openid?: string
   token?: string