Merge remote-tracking branch 'yudao/dev' into dev

apps/web-ele/src/views/_core/authentication/forget-password.vue

@@ -197,7 +197,7 @@ async function handleSubmit(values: Recordable<any>) {
     await smsResetPassword({ mobile, code, password });
     ElMessage.success($t('authentication.resetPasswordSuccess'));
     // 重置成功后跳转到首页
-    router.push('/');
+    await router.push('/');
   } catch (error) {
     console.error('重置密码失败:', error);
   } finally {

apps/web-ele/src/views/_core/profile/modules/base-info.vue

@@ -23,11 +23,7 @@ const emit = defineEmits<{
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
-    componentProps: {
-      class: 'w-full',
-    },
-    formItemClass: 'col-span-2',
-    labelWidth: 80,
+    labelWidth: 70,
   },
   schema: [
     {
@@ -104,7 +100,7 @@ watch(
 </script>
 
 <template>
-  <div class="mt-16px md:w-full lg:w-1/2 2xl:w-2/5">
+  <div class="mt-4 md:w-full lg:w-1/2 2xl:w-2/5">
     <Form />
   </div>
 </template>

apps/web-ele/src/views/_core/profile/modules/profile-user.vue

@@ -36,9 +36,9 @@ async function handelUpload({
   const { httpRequest } = useUpload();
   // 将 Blob 转换为 File
   const fileObj = new File([file], filename, { type: file.type });
-  const res = await httpRequest(fileObj);
-  // 2. 更新用户头像（httpRequest 返回 { url: string }）
-  await updateUserProfile({ avatar: res.url });
+  const avatar = await httpRequest(fileObj);
+  // 2. 更新用户头像
+  await updateUserProfile({ avatar });
 }
 </script>
 

apps/web-ele/src/views/_core/profile/modules/reset-pwd.vue

@@ -100,7 +100,7 @@ async function handleSubmit(values: Recordable<any>) {
 </script>
 
 <template>
-  <div class="mt-[16px] md:w-full lg:w-1/2 2xl:w-2/5">
+  <div class="mt-4 md:w-full lg:w-1/2 2xl:w-2/5">
     <Form />
   </div>
 </template>

apps/web-ele/src/views/mall/product/spu/form/index.vue

@@ -320,6 +320,7 @@ onMounted(async () => {
       <ElCard class="h-full w-full" v-loading="formLoading">
         <template #header>
           <div class="flex items-center justify-between">
+            <!-- @puhui999：idea 这边会有告警 -->
             <ElTabs v-model="activeTabName" @tab-change="handleTabChange">
               <ElTabPane label="基础设置" name="info" />
               <ElTabPane label="价格库存" name="sku" />