Merge branch 'master' of http://gitlab.oytour.com/youjie/boyuecend

src/services/UserService.ts

@@ -256,10 +256,11 @@ export interface ResetPasswordResponseDto {
  * 通用响应
  */
 export interface GeneralResponseDto {
-  /** 是否成功 */
-  success: boolean
+  /** 错误码 */
+  code?: number
   /** 消息 */
   message?: string
+  success?: boolean
 }
 
 /**
@@ -1107,7 +1108,7 @@ class UserService {
   static async updateMemberGuest(
     tenantId: string,
     data: MemberGuestInputDto
-  ): Promise<MemberGuestInputDto> {
+  ): Promise<GeneralResponseDto> {
     const response = await OtaRequest.post(
       '/member-guest/or-update',
       data,
@@ -1117,7 +1118,7 @@ class UserService {
         } : {}
       }
     )
-    return response as unknown as MemberGuestInputDto
+    return response as unknown as GeneralResponseDto
   }
 
   /**
@@ -1166,7 +1167,7 @@ class UserService {
   static async updateMemberMailingAddress(
     tenantId: string,
     data: MemberMailingAddressInputDto
-  ): Promise<MemberMailingAddressInputDto> {
+  ): Promise<GeneralResponseDto> {
     const response = await OtaRequest.post(
       '/member-mailing-address/or-update',
       data,
@@ -1176,7 +1177,7 @@ class UserService {
         } : {}
       }
     )
-    return response as unknown as MemberMailingAddressInputDto
+    return response as unknown as GeneralResponseDto
   }
 
   /**

src/views/personalCenter/accountCenter.vue

 <template>
-    <div class="w-[977px] h-full flex flex-col flex-shrink-0"
-    :class="[current<3?'overflow-hidden':'']">
-        <a-spin :loading="loading">
-            <div class="flex pl-[13px]">
-                <div v-for="(item,index) in TitleBars"
-                    class="myOrder-status mr-[42px] py-[22px] cursor-pointer relative"
-                    :class="[activeMenu==item.key?'active font-medium':'font-light',index?'ml-[42px]':null]"
-                    @click="changeStatus(item.path)">{{ item.label }}
-                    <div class="myOrder-status-border absolute left-0 bottom-0 w-full flex justify-center">
-                        <div></div>
-                    </div>
+    <div class="w-[977px] flex flex-col pt-[25px] h-full overflow-hidden"
+    :class="[current<3?'':'']">
+        <div class="flex pl-[13px]">
+            <div v-for="(item,index) in TitleBars"
+                class="myOrder-status mr-[42px] py-[22px] cursor-pointer relative"
+                :class="[activeMenu==item.key?'active font-medium':'font-light',index?'ml-[42px]':null]"
+                @click="changeStatus(item.path)">{{ item.label }}
+                <div class="myOrder-status-border absolute left-0 bottom-0 w-full flex justify-center">
+                    <div></div>
                 </div>
             </div>
-            <a-divider class="!m-[0]"/>
-            <main class="max-h-[735px] mt-[20px] overflow-hidden">
-                <router-view />
-            </main>
-        </a-spin>
+        </div>
+        <a-divider class="!m-[0]"/>
+        <!-- max-h-[735px]  -->
+        <main class="flex-1 mt-[20px] overflow-hidden">
+            <router-view />
+        </main>
     </div>
 </template>
 <script setup lang="ts">

src/views/personalCenter/accountPage/basicInfor.vue

 <template>
-    <div class="w-full h-full overflow-auto">
+    <div class="w-full h-full overflow-hidden">
+      <a-scrollbar class="overflow-auto h-[100%]">
+      <a-spin :loading="loading" class="w-full">
       <a-space direction="vertical" class="w-full">
             <!-- horizonta -->
         <a-form :model="formData" :rules="rules" layout="vertical" class="w-full"
@@ -181,12 +183,14 @@
            
         </a-form>
       </a-space>
+      </a-spin>
       <!-- 图片预览 -->
       <a-image-preview
         v-model:visible="previewVisible"
         :src="previewUrl"
         :actions-layout="['rotateLeft', 'rotateRight', 'zoomIn', 'zoomOut', 'originalSize']"
       />
+      </a-scrollbar>
     </div>
 </template>
 <script setup lang="ts">
@@ -196,7 +200,6 @@ import { useRouter } from 'vue-router'
 import { Message } from '@arco-design/web-vue'
 import { useSystemConfigStore } from '@/stores/index'
 import UserService from '@/services/UserService'
-import type { setRegisterDto } from '@/services/UserService'
 import CountryService from '@/services/CountryService'
 import { useUserStore } from '@/stores/user'
 import UploadService from '@/services/UploadService'
@@ -255,11 +258,7 @@ const rules = computed(() => ({
   ],
 }))
 
-const loading = ref(false)
-
-
-const codeValidateStatus = ref<'' | 'success' | 'error'>('')
-const emailVerified = ref(false)
+const loading = ref(true)
 
 const maxSize = 2 // 2MB
 // 预览相关
@@ -422,6 +421,8 @@ const getUserDetail = async () => {
     } 
   } catch (error) {
     
+  } finally {
+    loading.value = false
   }
 }
 
@@ -480,4 +481,8 @@ initData()
   background-color: rgb(var(--arcoblue-6));
   color: rgb(var(--arcoblue-10));
 }
+:deep(.arco-scrollbar){
+    height: 100%;
+    overflow: hidden;
+}
 </style>
\ No newline at end of file

src/views/personalCenter/index.vue

 <template>
-    <div class="h-screen flex justify-center pt-[25px] pb-[12px]">
+    <div class="h-screen flex justify-center pb-[12px] h-[797px]">
         <div class="h-full flex justify-between w-[1200px]">
             <!-- 左侧导航栏 -->
-            <LeftView 
+            <LeftView class="pt-[25px]"
             :menu-list="menuList"
             :active-menu="activeMenu"/>
             <!-- 右侧页面内容 -->
-            <main class="h-full flex-1 ml-[24px]">
+            <main class="flex-1 ml-[24px] overflow-hidden">
                 <router-view />
             </main>
         </div>

src/views/personalCenter/myOrder.vue

 <template>
-    <div class="w-[977px] h-full flex flex-col flex-shrink-0">
+    <div class="w-[977px] h-full flex flex-col flex-shrink-0 mt-[25px]">
         <a-spin :loading="loading">
             <div class="myOrderData rounded-[14px] flex justify-between pt-[22px] pb-[19px] pl-[16px] relative">
                 <div class="flex items-center p-[20px]">