From 9bc983793fe62ffdf2819276632475e2efa50b78 Mon Sep 17 00:00:00 2001
From: wangqiao <wangqiao@58hn.cn>
Date: Sun, 24 Aug 2025 16:46:10 +0800
Subject: [PATCH] Refactor API requests and update global methods

---
 api/common/index.ts             |  2 +-
 components/kl-login/index.vue   | 10 +++++-----
 components/kl-nav-tab/index.vue |  7 +++----
 plugins/global.ts               | 28 ++++++++++++++++------------
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/api/common/index.ts b/api/common/index.ts
index 35e4ba6..d3111d9 100644
--- a/api/common/index.ts
+++ b/api/common/index.ts
@@ -36,7 +36,7 @@ export const creatFile = (params: fileCreateReqVO) => {
  * @return {Promise}
  */
 export const getUserInfo = () => {
-  return useFetchRequest.get<IResponse<AppMemberUserInfoRespVO>>('/prod-api/app-api/member/user/get')
+  return useDollarFetchRequest.get<IResponse<AppMemberUserInfoRespVO>>('/prod-api/app-api/member/user/get')
 }
 
 /**
diff --git a/components/kl-login/index.vue b/components/kl-login/index.vue
index 15194ad..e3ae1be 100644
--- a/components/kl-login/index.vue
+++ b/components/kl-login/index.vue
@@ -23,7 +23,7 @@
             <el-form ref="formRef" :model="loginForm" :rules="rules" class="login-form">
               <template v-if="activeTab === 'account'">
                 <el-form-item prop="mobile">
-                  <el-input v-model="loginForm.mobile" placeholder="请输入用户名" :prefix-icon="User" class="w-322px!" />
+                  <el-input v-model="loginForm.mobile" placeholder="请输入用户名" :prefix-icon="User" class="w-[322px]!" />
                 </el-form-item>
                 <el-form-item prop="password">
                   <el-input v-model="loginForm.password" placeholder="请输入密码" :prefix-icon="Lock" type="password" />
@@ -33,7 +33,7 @@
               <!-- 验证码登录 -->
               <template v-else>
                 <el-form-item prop="phone">
-                  <el-input v-model="loginForm.phone" placeholder="请输入手机号" class="w-322px!" />
+                  <el-input v-model="loginForm.phone" placeholder="请输入手机号" class="w-[322px]!" />
                 </el-form-item>
                 <el-form-item prop="code">
                   <div class="verify-code-input">
@@ -89,7 +89,7 @@
   import REFRESHTOKEN from '~/utils/RefreshToken'
   import { handleLoginQQ, handleLoginWechat } from '~/utils/login'
   import useUserStore from '~/store/user'
-  const { $openRegister, $openLogin, $openLoginEmail } = useNuxtApp()
+  const app = useNuxtApp()
   const userStore = useUserStore()
 
   const props = defineProps({
@@ -157,7 +157,7 @@
   const handleRegister = () => {
     props.onClose()
     nextTick(() => {
-      // $openRegister()
+      app.$openRegister()
     })
   }
   // 发送验证码
@@ -262,7 +262,7 @@
   const handleLoginEmail = () => {
     props.onClose()
     nextTick(() => {
-        // $openLoginEmail()
+        app.$openLoginEmail()
     })
   }
 </script>
diff --git a/components/kl-nav-tab/index.vue b/components/kl-nav-tab/index.vue
index b3aa1ee..fabd8c5 100644
--- a/components/kl-nav-tab/index.vue
+++ b/components/kl-nav-tab/index.vue
@@ -37,7 +37,7 @@
       </div>
       <div class="absolute right-[10px] flex items-center">
         <div class="h-[36px] w-[36px] border-rd-[50%] bg-[#F5F5F5] text-center line-height-[44px]">
-          <img v-if="!isLogin" src="~/assets/images/user.png" alt="" srcset="" class="h-[19px] w-[17px]" />
+          <img v-if="!isLogin" src="~/assets/images/user.png" alt="" srcset="" class="h-[19px] w-[17px] relative top-[7px] left-[10px]" />
           <img v-else :src="userStore.userInfoRes.avatar" alt="" srcset="" class="h-[19px] w-[17px] rd-[50%]" />
         </div>
         <span v-if="!isLogin" class="ml-[14px] cursor-pointer text-[14px] text-[#1A65FF] font-normal" @click="handleLogin">立即登录</span>
@@ -69,8 +69,7 @@
   import { Search } from '@element-plus/icons-vue'
   import useUserStore from '~/store/user'
   const userStore = useUserStore()
-  const { $openLogin } = useNuxtApp()
-
+  const app = useNuxtApp()
 
   const props = defineProps({
     active: {
@@ -174,7 +173,7 @@
     }
   }
   const handleLogin = () => {
-      // $openLogin()
+    app?.$openLogin() // 调用全局方法
   }
   const handleCommand = (command: string) => {
     if (command === '退出') {
diff --git a/plugins/global.ts b/plugins/global.ts
index 6dcdd44..dff6af3 100644
--- a/plugins/global.ts
+++ b/plugins/global.ts
@@ -1,16 +1,20 @@
-import { openLogin } from "~/components/kl-login";
-import { closeLogin } from "~/components/kl-login";
-import { openRegister } from "~/components/kl-register";
-import { closeRegister } from "~/components/kl-register";
-import { openLoginEmail } from "~/components/kl-email";
-import { closeLoginEmail } from "~/components/kl-email";
+import { openLogin } from "~/components/kl-login/index";
+import { closeLogin } from "~/components/kl-login/index";
+import { openRegister } from "~/components/kl-register/index";
+import { closeRegister } from "~/components/kl-register/index";
+import { openLoginEmail } from "~/components/kl-email/index";
+import { closeLoginEmail } from "~/components/kl-email/index";
 
 // plugins/global.ts
 export default defineNuxtPlugin((nuxtApp) => {
-  nuxtApp.vueApp.config.globalProperties.$openLogin = openLogin;
-  nuxtApp.vueApp.config.globalProperties.$closeLogin = closeLogin;
-  nuxtApp.vueApp.config.globalProperties.$openRegister = openRegister;
-  nuxtApp.vueApp.config.globalProperties.$closeRegister = closeRegister;
-  nuxtApp.vueApp.config.globalProperties.$openLoginEmail = openLoginEmail;
-  nuxtApp.vueApp.config.globalProperties.$closeLoginEmail = closeLoginEmail;
+  return {
+    provide: {
+      openLogin,
+      closeLogin,
+      openRegister,
+      closeRegister,
+      openLoginEmail,
+      closeLoginEmail,
+    },
+  };
 });