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="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"
@@ -13,10 +12,10 @@
             </div>
         </div>
         <a-divider class="!m-[0]"/>
-            <main class="max-h-[735px] mt-[20px] overflow-hidden">
+        <!-- max-h-[735px]  -->
+        <main class="flex-1 mt-[20px] overflow-hidden">
             <router-view />
         </main>
-        </a-spin>
     </div>
 </template>
 <script setup lang="ts">

src/views/personalCenter/accountPage/account.vue

 <template>
-    <div class="h-full overflow-auto">
+    <div class="w-full h-full overflow-hidden"  >
+        <a-scrollbar class="overflow-auto h-[100%]">
             <div class="accountCenter rounded-[14px] border-[1px] mb-[28px] flex items-center py-[30px] pl-[43px] pr-[35px]">
                 <div class="w-[102px] mr-[43px]">
                     <div class="customPrimary-bg-7 rounded-full w-[50px] h-[50px] flex justify-center items-center">
@@ -131,6 +132,7 @@
                     </a-button>
                 </div>
             </div>
+        </a-scrollbar>
     </div>
 </template>
 <script setup lang="ts">
@@ -453,4 +455,8 @@ inData()
     background: url('../../../../assets/images/personal/sc_1.png')no-repeat;
     background-size: 100% 100%;
 }
+:deep(.arco-scrollbar){
+    height: 100%;
+    overflow: hidden;
+}
 </style>
\ No newline at end of file

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/accountPage/mailingAddressList.vue

 <template>
-    <a-spin :loading="loading" class="w-full">
-    <div v-show="!showType">
-        <a-scrollbar class="max-h-[692px] overflow-auto"
+    <div class="w-full h-full overflow-hidden">
+        <div v-show="!showType" class="flex flex-col h-full overflow-hidden">
+            <a-scrollbar class="overflow-auto h-full"
             @scroll="handleDivScroll"
             ref="scrollContainer">
+                <a-spin :loading="loading" class="w-full">
                     <div class="accountCenter rounded-[14px] 
                     border-[1px] mb-[18px] flex items-center 
                     justify-between py-[15px] pl-[36px] pr-[22px]"
@@ -12,10 +13,10 @@
                             {{ item.name }}
                         </div>
                         <div class="flex-1 mr-[20px]">
-                    {{ item.cityName }}{{ item.address }}
+                            {{ item.cityName }} {{ item?.address || '-' }}
                         </div>
                         <div class="w-[200px] mr-[20px]">
-                    {{item.phoneCode}} {{ item.phone }}
+                            {{item.phoneCode}} {{ item?.phone ||'-' }}
                         </div>
                         <div class="w-[100px]"
                         :class="[item.isDefault?'customColor-text-5':'']">
@@ -27,6 +28,7 @@
                             <div class="w-[14px] h-[16px] deleteIcon ml-[17px] cursor-pointer" @click="clickItem(item,0)">&nbsp;</div>
                         </div>
                     </div>
+                </a-spin>
             </a-scrollbar>
             <div class="rounded-[8px] addGuestButton py-[10px] text-center text-base cursor-pointer" @click="showType = 1">{{ t('personal.addPostAddress') }}</div>
         </div>
@@ -145,12 +147,10 @@
                             </a-form-item>
                             </a-col>
                         </a-row>
-                    
-                
                     </a-form>
             </a-space>
         </div>
-    </a-spin>
+    </div>
 </template>
 <script setup lang="ts">
 import { ref,reactive, computed } from 'vue'
@@ -450,4 +450,9 @@ initData()
 :deep(.arco-scrollbar-track-direction-vertical){
     display: none;
 }
+:deep(.arco-scrollbar){
+    max-height: calc(100vh - 106px);
+    padding-bottom: 15px;
+    overflow: hidden;
+}
 </style>
\ No newline at end of file

src/views/personalCenter/accountPage/passengerList.vue

 <template>
-    <a-spin :loading="loading" class="w-full">
-    <div v-show="!showType">
-        <a-scrollbar class="max-h-[692px]"
+    <div class="w-full h-full overflow-hidden">
+        <div v-show="!showType" class="flex flex-col h-full overflow-hidden">
+            <a-scrollbar class="overflow-auto h-full"
             @scroll="handleDivScroll"
             ref="scrollContainer">
+                <a-spin :loading="loading" class="w-full">
                     <div class="accountCenter rounded-[14px] 
                     border-[1px] mb-[18px] flex items-center 
                     justify-between py-[15px] pl-[36px] pr-[22px]"
@@ -18,19 +19,21 @@
                         {{ item.sex === 1 ? t('ORDER.GENDER_MALE') : t('ORDER.GENDER_FEMALE') }}
                         </div>
                         <div class="w-[200px]">
-                    {{ item.email }}
+                            {{ item?.email||'-' }}
                         </div>
                         <div class="w-[150px]">
-                    {{item.phoneCode}} {{ item.phone }}
+                            {{ item.phoneCode }} {{ item?.phone || '-' }}
                         </div>
                         <div class="flex items-center justify-between"> 
                             <div class="w-[16px] h-[16px] editIcon cursor-pointer" @click="clickItem(item,1)">&nbsp;</div>
                             <div class="w-[14px] h-[16px] deleteIcon ml-[17px] cursor-pointer" @click="clickItem(item,0)">&nbsp;</div>
                         </div>
                     </div>
+                </a-spin>
             </a-scrollbar>
             <div class="rounded-[8px] addGuestButton py-[10px] text-center text-base cursor-pointer" @click="showType = 1">{{ t('personal.addPassenger') }}</div>
         </div>
+    
         <div v-if="showType" class="addPassenger h-[581px] bg-[#FFFFFF] rounded-b-[12px] shadow-lg shadow-[#E3E6DA]">
             <div class="addPassengerHeader py-[20px] px-[31px] rounded-t-[12px] text-base">{{ showType === 1 ? t('personal.addPassenger') : t('personal.editPassenger') }}</div>
             <a-space direction="vertical" class="w-full p-[40px]">
@@ -169,7 +172,7 @@
                     </a-form>
             </a-space>
         </div>
-    </a-spin>
+    </div>
 </template>
 <script setup lang="ts">
 import { ref,reactive, computed } from 'vue'
@@ -295,7 +298,7 @@ const loadData = async () => {
                 totalCount.value = response.totalCount || 0
                 pageCount.value = Math.ceil(totalCount.value/queryParams.MaxResultCount) || 0
             }
-            noMoreData.value = pageCount.value >= queryParams.SkipCount
+            noMoreData.value = pageCount.value <= queryParams.SkipCount
         }
     } catch (error: any) {
         console.error('加载失败:', error)
@@ -319,6 +322,7 @@ const clickItem = (item: any,type: number) => {
         formData.countryId = item.countryId || null
         formData.sex = item.sex || null
         formData.idCard = item.idCard || null
+        formData.email = item.email || null
     }else{
         deleteItem(item)
     }
@@ -375,9 +379,9 @@ const handleSubmit = async () => {
   try { 
       const registerData = formData
       const response = await UserService.updateMemberGuest(systemConfig.tenantId || 'default',registerData)
-      console.log('提交成功:', response)
       showType.value = null
       resetQuery()
+      cancel()
   } catch (error: any) {
     console.error('提交失败:', error)
     Message.error(error.message)
@@ -479,4 +483,9 @@ initData()
 :deep(.arco-scrollbar-track-direction-vertical){
     display: none;
 }
+:deep(.arco-scrollbar){
+    max-height: calc(100vh - 106px);
+    padding-bottom: 15px;
+    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]">