Prechádzať zdrojové kódy

fix: bug修复阶段v1.9

chenpeng 15 hodín pred
rodič
commit
04cbd33776

+ 1 - 1
api/model/user.ts

@@ -2,7 +2,7 @@ import { useMyRequest } from '~/composables/useFetchRequest'
 
 enum Api {
   Login = '/client-s003/s003Customer/login',
-  Logout = 'client-s003/s003Customer/logout',
+  Logout = '/client-s003/s003Customer/logout',
   Register = '/client/user/preRegister',
   ValidateRegister = '/client/user/register',
   ValidateEmail = '/client/user/forgetPassword',

+ 8 - 3
components/common/loginAndDownload/comp/info/submitRequest.vue

@@ -1,7 +1,12 @@
 <script lang='ts' setup>
 import useLoginAndDownload from '../../useLoginAndDownload'
+import { useUserStore } from '@/stores/modules/user'
 
 const { onSubmitRequest } = useLoginAndDownload()
+const { userInfo } = storeToRefs(useUserStore())
+const userName = computed(() => {
+  return (userInfo.value?.firstName || userInfo.value?.lastName) ? `${userInfo.value?.firstName} ${userInfo.value?.lastName}` : 'EJET Spark'
+})
 </script>
 
 <template>
@@ -16,14 +21,14 @@ const { onSubmitRequest } = useLoginAndDownload()
       <div class="flex py-15px px-35px b-rd-10px b-#D8D8D b-1px b-solid cursor-pointer hover:b-#9B6CFF">
         <!-- 获取首字母 -->
         <div class="w-50px h-50px bg-#F2E5F2 text-#9B6CFF text-24px flex justify-center b-rd-50% items-center mr-28px">
-          E
+          {{ userName.charAt(0) }}
         </div>
         <div>
           <div class="text-18px fw-bold text-#333 custom-title-font">
-            EJET Spark
+            {{ userName }}
           </div>
           <div class="text-#9B6CFF mt-8px">
-            spark@ejet.com
+            {{ userInfo?.email }}
           </div>
         </div>
       </div>