From c023ebbdb9f70a4599389fb0df81ca87f93ac021 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sun, 28 Dec 2025 15:44:21 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat=EF=BC=9A=E3=80=90ele=E3=80=91cropper?=
 =?UTF-8?q?=E3=80=81form-create\rules=20todo=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/cropper/cropper-avatar.vue |  80 +++---------
 .../src/components/cropper/cropper-modal.vue  | 117 ++++++------------
 .../src/components/cropper/cropper.vue        |   6 +-
 .../src/components/form-create/rules/data.ts  |   4 +-
 .../form-create/rules/use-dict-select.ts      |   2 +-
 5 files changed, 58 insertions(+), 151 deletions(-)

diff --git a/apps/web-ele/src/components/cropper/cropper-avatar.vue b/apps/web-ele/src/components/cropper/cropper-avatar.vue
index e50085f3c..894169844 100644
--- a/apps/web-ele/src/components/cropper/cropper-avatar.vue
+++ b/apps/web-ele/src/components/cropper/cropper-avatar.vue
@@ -18,7 +18,7 @@ const props = withDefaults(defineProps<CropperAvatarProps>(), {
   width: 200,
   value: '',
   showBtn: true,
-  btnProps: () => ({}),
+  btnProps: () => ({}) as any,
   btnText: '',
   uploadApi: () => Promise.resolve(),
   size: 5,
@@ -27,14 +27,10 @@ const props = withDefaults(defineProps<CropperAvatarProps>(), {
 const emit = defineEmits(['update:value', 'change']);
 
 const sourceValue = ref(props.value || '');
-// TODO @puhui999：这个有办法去掉么？
-const prefixCls = 'cropper-avatar';
 const [CropperModal, modalApi] = useVbenModal({
   connectedComponent: cropperModal,
 });
 
-const getClass = computed(() => [prefixCls]);
-
 const getWidth = computed(() => `${`${props.width}`.replace(/px/, '')}px`);
 
 const getIconWidth = computed(
@@ -74,34 +70,41 @@ defineExpose({
 </script>
 
 <template>
-  <!-- TODO @puhui999：html 部分，看看有没办法和 web-antd/src/components/cropper/cropper-avatar.vue 风格更接近 -->
   <!-- 头像容器 -->
-  <div :class="getClass" :style="getStyle">
+  <div class="inline-block text-center" :style="getStyle">
     <!-- 图片包装器 -->
     <div
-      :class="`${prefixCls}-image-wrapper`"
+      class="group relative cursor-pointer overflow-hidden rounded-full border border-gray-200 bg-white"
       :style="getImageWrapperStyle"
       @click="openModal"
     >
       <!-- 遮罩层 -->
-      <div :class="`${prefixCls}-image-mask`" :style="getImageWrapperStyle">
+      <div
+        class="duration-400 absolute inset-0 flex cursor-pointer items-center justify-center rounded-full bg-black bg-opacity-40 opacity-0 transition-opacity group-hover:opacity-100"
+        :style="getImageWrapperStyle"
+      >
         <span
           :style="{
             ...getImageWrapperStyle,
-            width: `${getIconWidth}`,
-            height: `${getIconWidth}`,
-            lineHeight: `${getIconWidth}`,
+            width: getIconWidth,
+            height: getIconWidth,
+            lineHeight: getIconWidth,
           }"
-          class="icon-[ant-design--cloud-upload-outlined] text-[#d6d6d6]"
+          class="icon-[ant-design--cloud-upload-outlined] text-gray-400"
         ></span>
       </div>
       <!-- 头像图片 -->
-      <img v-if="sourceValue" :src="sourceValue" alt="avatar" />
+      <img
+        v-if="sourceValue"
+        :src="sourceValue"
+        alt="avatar"
+        class="h-full w-full object-cover"
+      />
     </div>
     <!-- 上传按钮 -->
     <ElButton
       v-if="showBtn"
-      :class="`${prefixCls}-upload-btn`"
+      class="mx-auto mt-2"
       @click="openModal"
       v-bind="btnProps"
     >
@@ -116,50 +119,3 @@ defineExpose({
     />
   </div>
 </template>
-
-<style lang="scss" scoped>
-/* TODO @puhui999：要类似 web-antd/src/components/cropper/cropper-avatar.vue 减少 scss，通过 tindwind 么？ */
-.cropper-avatar {
-  display: inline-block;
-  text-align: center;
-
-  &-image-wrapper {
-    overflow: hidden;
-    cursor: pointer;
-    background: #fff;
-    border: 1px solid #eee;
-    border-radius: 50%;
-
-    img {
-      width: 100%;
-    }
-  }
-
-  &-image-mask {
-    position: absolute;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: inherit;
-    height: inherit;
-    cursor: pointer;
-    background: rgb(0 0 0 / 40%);
-    border: inherit;
-    border-radius: inherit;
-    opacity: 0;
-    transition: opacity 0.4s;
-
-    ::v-deep(svg) {
-      margin: auto;
-    }
-  }
-
-  &-image-mask:hover {
-    opacity: 40;
-  }
-
-  &-upload-btn {
-    margin: 10px auto;
-  }
-}
-</style>
diff --git a/apps/web-ele/src/components/cropper/cropper-modal.vue b/apps/web-ele/src/components/cropper/cropper-modal.vue
index 1d949c0aa..2c631185c 100644
--- a/apps/web-ele/src/components/cropper/cropper-modal.vue
+++ b/apps/web-ele/src/components/cropper/cropper-modal.vue
@@ -36,7 +36,6 @@ const cropper = ref<CropperType>();
 let scaleX = 1;
 let scaleY = 1;
 
-const prefixCls = 'cropper-am';
 const [Modal, modalApi] = useVbenModal({
   onConfirm: handleOk,
   onOpenChange(isOpen) {
@@ -120,11 +119,34 @@ async function handleOk() {
     :title="$t('ui.cropper.modalTitle')"
     class="w-[800px]"
   >
-    <div :class="prefixCls">
+    <div class="flex">
       <!-- 左侧区域 -->
-      <div :class="`${prefixCls}-left`" class="w-full">
+      <div class="h-[340px] w-[55%]">
         <!-- 裁剪器容器 -->
-        <div :class="`${prefixCls}-cropper`">
+        <div
+          class="h-[300px] bg-[#eee]"
+          style="
+            background-image:
+              linear-gradient(
+                45deg,
+                rgb(0 0 0 / 25%) 25%,
+                transparent 0,
+                transparent 75%,
+                rgb(0 0 0 / 25%) 0
+              ),
+              linear-gradient(
+                45deg,
+                rgb(0 0 0 / 25%) 25%,
+                transparent 0,
+                transparent 75%,
+                rgb(0 0 0 / 25%) 0
+              );
+            background-position:
+              0 0,
+              12px 12px;
+            background-size: 24px 24px;
+          "
+        >
           <CropperImage
             v-if="src"
             :circled="circled"
@@ -136,7 +158,7 @@ async function handleOk() {
         </div>
 
         <!-- 工具栏 -->
-        <div :class="`${prefixCls}-toolbar`">
+        <div class="mt-2.5 flex items-center justify-between">
           <ElUpload
             :before-upload="handleBeforeUpload"
             :file-list="[]"
@@ -281,18 +303,23 @@ async function handleOk() {
       </div>
 
       <!-- 右侧区域 -->
-      <div :class="`${prefixCls}-right`">
+      <div class="h-[340px] w-[45%]">
         <!-- 预览区域 -->
-        <div :class="`${prefixCls}-preview`">
+        <div
+          class="mx-auto h-[220px] w-[220px] overflow-hidden rounded-full border border-gray-200"
+        >
           <img
             v-if="previewSource"
             :alt="$t('ui.cropper.preview')"
             :src="previewSource"
+            class="h-full w-full"
           />
         </div>
         <!-- 头像组合预览 -->
         <template v-if="previewSource">
-          <div :class="`${prefixCls}-group`">
+          <div
+            class="mt-2 flex items-center justify-around border-t border-gray-200 pt-2"
+          >
             <ElAvatar :src="previewSource" size="large" />
             <ElAvatar :size="48" :src="previewSource" />
             <ElAvatar :size="64" :src="previewSource" />
@@ -303,77 +330,3 @@ async function handleOk() {
     </div>
   </Modal>
 </template>
-
-<style lang="scss">
-/* TODO @puhui999：要类似 web-antd/src/components/cropper/cropper-avatar.vue 减少 scss，通过 tindwind 么？ */
-.cropper-am {
-  display: flex;
-
-  &-left,
-  &-right {
-    height: 340px;
-  }
-
-  &-left {
-    width: 55%;
-  }
-
-  &-right {
-    width: 45%;
-  }
-
-  &-cropper {
-    height: 300px;
-    background: #eee;
-    background-image:
-      linear-gradient(
-        45deg,
-        rgb(0 0 0 / 25%) 25%,
-        transparent 0,
-        transparent 75%,
-        rgb(0 0 0 / 25%) 0
-      ),
-      linear-gradient(
-        45deg,
-        rgb(0 0 0 / 25%) 25%,
-        transparent 0,
-        transparent 75%,
-        rgb(0 0 0 / 25%) 0
-      );
-    background-position:
-      0 0,
-      12px 12px;
-    background-size: 24px 24px;
-  }
-
-  &-toolbar {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-top: 10px;
-  }
-
-  &-preview {
-    width: 220px;
-    height: 220px;
-    margin: 0 auto;
-    overflow: hidden;
-    border: 1px solid #eee;
-    border-radius: 50%;
-
-    img {
-      width: 100%;
-      height: 100%;
-    }
-  }
-
-  &-group {
-    display: flex;
-    align-items: center;
-    justify-content: space-around;
-    padding-top: 8px;
-    margin-top: 8px;
-    border-top: 1px solid #eee;
-  }
-}
-</style>
diff --git a/apps/web-ele/src/components/cropper/cropper.vue b/apps/web-ele/src/components/cropper/cropper.vue
index d371e4a45..5cdf1bc36 100644
--- a/apps/web-ele/src/components/cropper/cropper.vue
+++ b/apps/web-ele/src/components/cropper/cropper.vue
@@ -33,8 +33,6 @@ const imgElRef = ref<ElRef<HTMLImageElement>>();
 const cropper = ref<Cropper | null>();
 const isReady = ref(false);
 
-// TODO @puhui999：这个有办法去掉么？
-const prefixCls = 'cropper-image';
 const debounceRealTimeCropped = useDebounceFn(realTimeCropped, 80);
 
 const getImageStyle = computed((): CSSProperties => {
@@ -47,10 +45,9 @@ const getImageStyle = computed((): CSSProperties => {
 
 const getClass = computed(() => {
   return [
-    prefixCls,
     attrs.class,
     {
-      [`${prefixCls}--circled`]: props.circled,
+      'cropper-image--circled': props.circled,
     },
   ];
 });
@@ -158,6 +155,7 @@ function getRoundedCanvas() {
       :crossorigin="crossorigin"
       :src="src"
       :style="getImageStyle"
+      class="h-auto max-w-full"
     />
   </div>
 </template>
diff --git a/apps/web-ele/src/components/form-create/rules/data.ts b/apps/web-ele/src/components/form-create/rules/data.ts
index fa89ec654..2c6cee2ce 100644
--- a/apps/web-ele/src/components/form-create/rules/data.ts
+++ b/apps/web-ele/src/components/form-create/rules/data.ts
@@ -121,7 +121,7 @@ const apiSelectRule = [
             field: 'data',
             title: '请求参数 JSON 格式',
             props: {
-              autosize: true, // TODO @puhui999：这里时 autoSize 还是 autosize 哈？和 antd 不同
+              autosize: true,
               type: 'textarea',
               placeholder: '{"type": 1}',
             },
@@ -155,7 +155,7 @@ const apiSelectRule = [
     info: `data 为接口返回值,需要写一个匿名函数解析返回值为选择器 options 列表
     (data: any)=>{ label: string; value: any }[]`,
     props: {
-      autosize: true, // TODO @puhui999：这里时 autoSize 还是 autosize 哈？和 antd 不同
+      autosize: true,
       rows: { minRows: 2, maxRows: 6 },
       type: 'textarea',
       placeholder: `
diff --git a/apps/web-ele/src/components/form-create/rules/use-dict-select.ts b/apps/web-ele/src/components/form-create/rules/use-dict-select.ts
index b77af4464..e9eb46e9d 100644
--- a/apps/web-ele/src/components/form-create/rules/use-dict-select.ts
+++ b/apps/web-ele/src/components/form-create/rules/use-dict-select.ts
@@ -39,7 +39,7 @@ export function useDictSelectRule() {
         title: label,
         info: '',
         $required: false,
-        // TODO @puhui999：vben 版本里，这里有个 modelField: 'value', 需要添加么？
+        modelField: 'model-value',
       };
     },
     props(_: any, { t }: any) {

From 4395353c223c5f47258e41ae4b62b846cf36231c Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sun, 28 Dec 2025 17:35:43 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat=EF=BC=9A=E3=80=90ele/antd=E3=80=91rewa?=
 =?UTF-8?q?rdActivity=20todo=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/promotion/rewardActivity/data.ts     |  7 ++++--
 .../promotion/rewardActivity/modules/form.vue | 20 +++++++++++-----
 .../mall/promotion/rewardActivity/data.ts     |  6 ++++-
 .../promotion/rewardActivity/modules/form.vue | 24 ++++++++++++++-----
 4 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts b/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts
index 613a4a7e7..c1232e43f 100644
--- a/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts
+++ b/apps/web-antd/src/views/mall/promotion/rewardActivity/data.ts
@@ -138,6 +138,7 @@ export function useFormSchema(): VbenFormSchema[] {
       componentProps: {
         showTime: true,
         format: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
         placeholder: [
           $t('utils.rangePicker.beginTime'),
           $t('utils.rangePicker.endTime'),
@@ -217,13 +218,15 @@ export function useFormSchema(): VbenFormSchema[] {
       },
       rules: 'required',
     },
-    // TODO @puhui999：1）新增时：一直报：“请输入优惠设置”；2）修改老数据，出现报“请求参数类型错误:50.00”；
     {
       fieldName: 'rules',
       label: '优惠设置',
       component: 'Input',
       formItemClass: 'items-start',
-      rules: 'required',
+      rules: z
+        .array(z.any())
+        .min(1, { message: '请添加至少一条优惠规则' })
+        .default([]),
     },
     {
       fieldName: 'productScopeValues', // 隐藏字段：用于自动同步 productScopeValues
diff --git a/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue
index 99e323193..de911c629 100644
--- a/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/rewardActivity/modules/form.vue
@@ -8,10 +8,9 @@ import {
   PromotionConditionTypeEnum,
   PromotionProductScopeEnum,
 } from '@vben/constants';
-import { convertToInteger, formatToFraction } from '@vben/utils';
+import { cloneDeep, convertToInteger, formatToFraction } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
-import dayjs from 'dayjs';
 
 import { useVbenForm } from '#/adapter/form';
 import {
@@ -53,6 +52,8 @@ const [Form, formApi] = useVbenForm({
 
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
+    // 在验证前同步 formData.rules 到表单中
+    await formApi.setFieldValue('rules', formData.value.rules || []);
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
@@ -61,18 +62,24 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     try {
       const values = await formApi.getValues();
-      const data = { ...formData.value, ...values };
+      // 使用 formData.value 作为基础，确保 rules 来自 formData
+      const data = { ...values, ...formData.value };
       if (data.startAndEndTime && Array.isArray(data.startAndEndTime)) {
         data.startTime = data.startAndEndTime[0];
         data.endTime = data.startAndEndTime[1];
         delete data.startAndEndTime;
       }
-      data.rules?.forEach((item: any) => {
+      // 深拷贝 rules 避免修改原始数据
+      const rules = cloneDeep(
+        data.rules,
+      ) as unknown as MallRewardActivityApi.RewardRule[];
+      rules.forEach((item: any) => {
         item.discountPrice = convertToInteger(item.discountPrice || 0);
         if (data.conditionType === PromotionConditionTypeEnum.PRICE.type) {
           item.limit = convertToInteger(item.limit || 0);
         }
       });
+      data.rules = rules;
       await (data.id
         ? updateRewardActivity(data as MallRewardActivityApi.RewardActivity)
         : createRewardActivity(data as MallRewardActivityApi.RewardActivity));
@@ -97,9 +104,10 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       const result = await getReward(data.id);
+      // valueFormat: 'x' 配置下，直接使用时间戳
       result.startAndEndTime = [
-        result.startTime ? dayjs(result.startTime) : undefined,
-        result.endTime ? dayjs(result.endTime) : undefined,
+        result.startTime ? String(result.startTime) : undefined,
+        result.endTime ? String(result.endTime) : undefined,
       ] as any[];
       result.rules?.forEach((item: any) => {
         item.discountPrice = formatToFraction(item.discountPrice || 0);
diff --git a/apps/web-ele/src/views/mall/promotion/rewardActivity/data.ts b/apps/web-ele/src/views/mall/promotion/rewardActivity/data.ts
index 57ebd0acb..c1232e43f 100644
--- a/apps/web-ele/src/views/mall/promotion/rewardActivity/data.ts
+++ b/apps/web-ele/src/views/mall/promotion/rewardActivity/data.ts
@@ -138,6 +138,7 @@ export function useFormSchema(): VbenFormSchema[] {
       componentProps: {
         showTime: true,
         format: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
         placeholder: [
           $t('utils.rangePicker.beginTime'),
           $t('utils.rangePicker.endTime'),
@@ -222,7 +223,10 @@ export function useFormSchema(): VbenFormSchema[] {
       label: '优惠设置',
       component: 'Input',
       formItemClass: 'items-start',
-      rules: 'required',
+      rules: z
+        .array(z.any())
+        .min(1, { message: '请添加至少一条优惠规则' })
+        .default([]),
     },
     {
       fieldName: 'productScopeValues', // 隐藏字段：用于自动同步 productScopeValues
diff --git a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue
index b2f3bec94..199242efb 100644
--- a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue
@@ -8,7 +8,7 @@ import {
   PromotionConditionTypeEnum,
   PromotionProductScopeEnum,
 } from '@vben/constants';
-import { convertToInteger, formatToFraction } from '@vben/utils';
+import { cloneDeep, convertToInteger, formatToFraction } from '@vben/utils';
 
 import { ElMessage } from 'element-plus';
 
@@ -52,6 +52,8 @@ const [Form, formApi] = useVbenForm({
 
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
+    // 在验证前同步 formData.rules 到表单中
+    await formApi.setFieldValue('rules', formData.value.rules || []);
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
@@ -60,18 +62,24 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     try {
       const values = await formApi.getValues();
-      const data = { ...formData.value, ...values };
+      // 使用 formData.value 作为基础，确保 rules 来自 formData
+      const data = { ...values, ...formData.value };
       if (data.startAndEndTime && Array.isArray(data.startAndEndTime)) {
-        data.startTime = data.startAndEndTime[0];
-        data.endTime = data.startAndEndTime[1];
+        data.startTime = Number(data.startAndEndTime[0]);
+        data.endTime = Number(data.startAndEndTime[1]);
         delete data.startAndEndTime;
       }
-      data.rules?.forEach((item: any) => {
+      // 深拷贝 rules 避免修改原始数据
+      const rules = cloneDeep(
+        data.rules,
+      ) as unknown as MallRewardActivityApi.RewardRule[];
+      rules.forEach((item: any) => {
         item.discountPrice = convertToInteger(item.discountPrice || 0);
         if (data.conditionType === PromotionConditionTypeEnum.PRICE.type) {
           item.limit = convertToInteger(item.limit || 0);
         }
       });
+      data.rules = rules;
       await (data.id
         ? updateRewardActivity(data as MallRewardActivityApi.RewardActivity)
         : createRewardActivity(data as MallRewardActivityApi.RewardActivity));
@@ -96,7 +104,11 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       const result = await getReward(data.id);
-      result.startAndEndTime = [result.startTime, result.endTime] as any[];
+      // valueFormat: 'x' 配置下，直接使用时间戳字符串
+      result.startAndEndTime = [
+        result.startTime ? String(result.startTime) : undefined,
+        result.endTime ? String(result.endTime) : undefined,
+      ] as any[];
       result.rules?.forEach((item: any) => {
         item.discountPrice = formatToFraction(item.discountPrice || 0);
         if (result.conditionType === PromotionConditionTypeEnum.PRICE.type) {

From e6327ae9da5da7d6ac1bed214a50a44085ee8a9d Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sun, 28 Dec 2025 17:57:10 +0800
Subject: [PATCH 3/5] =?UTF-8?q?feat=EF=BC=9A=E3=80=90ele=E3=80=91spu=20tod?=
 =?UTF-8?q?o=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/product/spu/components/sku-list.vue  | 52 +++++++++++++------
 .../spu/components/spu-and-sku-list.vue       |  3 +-
 .../src/views/mall/product/spu/form/index.vue |  1 -
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/apps/web-ele/src/views/mall/product/spu/components/sku-list.vue b/apps/web-ele/src/views/mall/product/spu/components/sku-list.vue
index d92eeb16a..06dc595b9 100644
--- a/apps/web-ele/src/views/mall/product/spu/components/sku-list.vue
+++ b/apps/web-ele/src/views/mall/product/spu/components/sku-list.vue
@@ -490,16 +490,25 @@ defineExpose({
       @checkbox-all="handleSelectionChange"
     >
       <VxeColumn v-if="isComponent" type="checkbox" width="45" fixed="left" />
-      <!-- TODO @puhui999：这里的宽度貌似有点问题，图片会寄出来； -->
-      <VxeColumn align="center" title="图片" max-width="140" fixed="left">
+      <VxeColumn
+        align="center"
+        title="图片"
+        width="80"
+        min-width="80"
+        fixed="left"
+      >
         <template #default="{ row }">
-          <ElImage
-            v-if="row.picUrl"
-            :src="row.picUrl"
-            class="h-[50px] w-[50px] cursor-pointer"
-            :preview-src-list="[row.picUrl]"
-            fit="cover"
-          />
+          <div class="flex items-center justify-center overflow-hidden">
+            <ElImage
+              v-if="row.picUrl"
+              :src="row.picUrl"
+              class="h-[50px] w-[50px] cursor-pointer"
+              :preview-src-list="[row.picUrl]"
+              :preview-teleported="true"
+              :z-index="3000"
+              fit="cover"
+            />
+          </div>
         </template>
       </VxeColumn>
       <template v-if="formData?.specType && !isBatch">
@@ -583,15 +592,24 @@ defineExpose({
       }"
     >
       <VxeColumn v-if="isComponent" type="checkbox" width="45" fixed="left" />
-      <!-- TODO @puhui999：这里的宽度貌似有点问题，图片会寄出来； -->
-      <VxeColumn align="center" title="图片" max-width="140" fixed="left">
+      <VxeColumn
+        align="center"
+        title="图片"
+        width="80"
+        min-width="80"
+        fixed="left"
+      >
         <template #default="{ row }">
-          <ElImage
-            :src="row.picUrl"
-            class="h-[60px] w-[60px] cursor-pointer"
-            :preview-src-list="[row.picUrl]"
-            fit="cover"
-          />
+          <div class="flex items-center justify-center overflow-hidden">
+            <ElImage
+              :src="row.picUrl"
+              class="h-[60px] w-[60px] cursor-pointer"
+              :preview-src-list="[row.picUrl]"
+              :preview-teleported="true"
+              :z-index="3000"
+              fit="cover"
+            />
+          </div>
         </template>
       </VxeColumn>
       <template v-if="formData?.specType">
diff --git a/apps/web-ele/src/views/mall/product/spu/components/spu-and-sku-list.vue b/apps/web-ele/src/views/mall/product/spu/components/spu-and-sku-list.vue
index a46770be7..06cf9959e 100644
--- a/apps/web-ele/src/views/mall/product/spu/components/spu-and-sku-list.vue
+++ b/apps/web-ele/src/views/mall/product/spu/components/spu-and-sku-list.vue
@@ -130,12 +130,13 @@ watch(
     <VxeColumn field="id" align="center" title="商品编号" min-width="30" />
     <VxeColumn title="商品图" min-width="80">
       <template #default="{ row }">
-        <!-- TODO @puhui999：它的 preview 貌似展示有点奇怪，不像 antd 是全屏的。。。 -->
         <ElImage
           v-if="row.picUrl"
           :src="row.picUrl"
           class="h-[30px] w-[30px] cursor-pointer"
           :preview-src-list="[row.picUrl]"
+          :preview-teleported="true"
+          :z-index="3000"
           fit="cover"
         />
       </template>
diff --git a/apps/web-ele/src/views/mall/product/spu/form/index.vue b/apps/web-ele/src/views/mall/product/spu/form/index.vue
index 3b5bb6ea7..5f584c9a8 100644
--- a/apps/web-ele/src/views/mall/product/spu/form/index.vue
+++ b/apps/web-ele/src/views/mall/product/spu/form/index.vue
@@ -320,7 +320,6 @@ onMounted(async () => {
       <ElCard class="h-full w-full" v-loading="formLoading">
         <template #header>
           <div class="flex items-center justify-between">
-            <!-- TODO @puhui999：这里有告警，需要修复下。 -->
             <ElTabs v-model="activeTabName" @tab-change="handleTabChange">
               <ElTabPane label="基础设置" name="info" />
               <ElTabPane label="价格库存" name="sku" />

From 6353f0a8e9be0e297ae39fc51fb41ea0399f6d1d Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sun, 28 Dec 2025 18:34:28 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat=EF=BC=9A=E3=80=90ele/antd=E3=80=91disc?=
 =?UTF-8?q?ountActivity=20todo=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/promotion/discountActivity/data.ts   |   1 -
 .../discountActivity/modules/form.vue         | 315 +++++++++++++++--
 .../mall/promotion/discountActivity/data.ts   |   1 -
 .../discountActivity/modules/form.vue         | 316 ++++++++++++++++--
 4 files changed, 586 insertions(+), 47 deletions(-)

diff --git a/apps/web-antd/src/views/mall/promotion/discountActivity/data.ts b/apps/web-antd/src/views/mall/promotion/discountActivity/data.ts
index f9f170845..db639dcb2 100644
--- a/apps/web-antd/src/views/mall/promotion/discountActivity/data.ts
+++ b/apps/web-antd/src/views/mall/promotion/discountActivity/data.ts
@@ -73,7 +73,6 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'spuIds',
       label: '活动商品',
       component: 'Input',
-      rules: 'required',
       formItemClass: 'col-span-2',
     },
   ];
diff --git a/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue b/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue
index 6f8bc9a47..62ed7a326 100644
--- a/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue
+++ b/apps/web-antd/src/views/mall/promotion/discountActivity/modules/form.vue
@@ -1,30 +1,52 @@
 <script lang="ts" setup>
+import type { MallSpuApi } from '#/api/mall/product/spu';
 import type { MallDiscountActivityApi } from '#/api/mall/promotion/discount/discountActivity';
+import type {
+  PropertyAndValues,
+  RuleConfig,
+  SpuProperty,
+} from '#/views/mall/product/spu/components';
 
-import { computed, ref } from 'vue';
+import { computed, nextTick, ref } from 'vue';
 
 import { useVbenForm, useVbenModal } from '@vben/common-ui';
+import {
+  convertToInteger,
+  erpCalculatePercentage,
+  formatToFraction,
+  yuanToFen,
+} from '@vben/utils';
 
-import { message } from 'ant-design-vue';
+import { Button, InputNumber, message } from 'ant-design-vue';
 
+import { VxeColumn } from '#/adapter/vxe-table';
+import { getSpuDetailList } from '#/api/mall/product/spu';
 import {
   createDiscountActivity,
   getDiscountActivity,
   updateDiscountActivity,
 } from '#/api/mall/promotion/discount/discountActivity';
 import { $t } from '#/locales';
-import { SpuShowcase } from '#/views/mall/product/spu/components';
+import {
+  getPropertyList,
+  SpuAndSkuList,
+  SpuSkuSelect,
+} from '#/views/mall/product/spu/components';
 
 import { useFormSchema } from '../data';
 
 defineOptions({ name: 'DiscountActivityForm' });
 
 const emit = defineEmits(['success']);
-const formData = ref<
-  Partial<MallDiscountActivityApi.DiscountActivity> & {
-    spuIds?: number[];
-  }
->({});
+
+/** 折扣类型枚举 */
+const PromotionDiscountTypeEnum = {
+  PRICE: { type: 1 }, // 满减
+  PERCENT: { type: 2 }, // 折扣
+};
+
+// ================= 表单相关 =================
+const formData = ref<Partial<MallDiscountActivityApi.DiscountActivity>>({});
 const getTitle = computed(() => {
   return formData.value?.id
     ? $t('ui.actionTitle.edit', ['限时折扣活动'])
@@ -44,27 +66,203 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
+// ================= 商品选择相关 =================
+/** SKU 扩展类型 */
+interface SkuExtension extends MallSpuApi.Sku {
+  productConfig: MallDiscountActivityApi.DiscountProduct;
+}
+
+/** SPU 扩展类型 */
+interface SpuExtension extends MallSpuApi.Spu {
+  skus?: SkuExtension[];
+}
+
+const spuSelectRef = ref(); // 商品选择组件 Ref
+const spuAndSkuListRef = ref(); // SKU 列表组件 Ref
+const spuList = ref<SpuExtension[]>([]); // 选择的 SPU 列表
+const spuPropertyList = ref<SpuProperty<SpuExtension>[]>([]); // SPU 属性列表
+const spuIdList = ref<number[]>([]); // 已选择的 SPU ID 列表
+
+/** SKU 校验规则配置 */
+const ruleConfig: RuleConfig[] = [
+  {
+    name: 'productConfig.discountPrice',
+    rule: (arg) => arg > 0,
+    message: '商品优惠金额不能为 0 ！！！',
+  },
+];
+
+/** 打开商品选择弹窗 */
+function openSpuSelect() {
+  spuSelectRef.value?.open();
+}
+
+/** 选择商品后的回调 */
+function handleSpuSelected(spuId: number, skuIds?: number[]) {
+  getSpuDetails(spuId, skuIds);
+}
+
+/** 获取 SPU 详情 */
+async function getSpuDetails(
+  spuId: number,
+  skuIdArr?: number[],
+  products?: MallDiscountActivityApi.DiscountProduct[],
+  type?: string,
+) {
+  // 如果已经包含该 SPU 则跳过
+  if (spuIdList.value.includes(spuId)) {
+    if (type !== 'load') {
+      message.error('数据重复选择！');
+    }
+    return;
+  }
+  spuIdList.value.push(spuId);
+
+  const res = (await getSpuDetailList([spuId])) as SpuExtension[];
+  if (res.length === 0) {
+    return;
+  }
+
+  const spu = res[0]!;
+  // 筛选 SKU
+  const selectSkus =
+    skuIdArr === undefined
+      ? spu.skus
+      : spu.skus?.filter((sku) => skuIdArr.includes(sku.id!));
+
+  // 为每个 SKU 添加折扣配置
+  selectSkus?.forEach((sku) => {
+    let config: MallDiscountActivityApi.DiscountProduct = {
+      skuId: sku.id!,
+      spuId: spu.id!,
+      discountType: 1,
+      discountPercent: 0,
+      discountPrice: 0,
+    };
+
+    // 编辑时，使用已有的配置
+    if (products !== undefined) {
+      const product = products.find((item) => item.skuId === sku.id);
+      if (product) {
+        // 转换为元显示
+        config = {
+          ...product,
+          discountPercent: Number(formatToFraction(product.discountPercent)),
+          discountPrice: Number(formatToFraction(product.discountPrice)),
+        };
+      }
+    }
+    (sku as SkuExtension).productConfig = config;
+  });
+
+  spu.skus = selectSkus as SkuExtension[];
+  spuPropertyList.value.push({
+    spuId: spu.id!,
+    spuDetail: spu,
+    propertyList: getPropertyList(spu) as PropertyAndValues[],
+  });
+  spuList.value.push(spu);
+}
+
+/** 删除 SPU */
+function handleDeleteSpu(spuId: number) {
+  const spuIndex = spuIdList.value.indexOf(spuId);
+  if (spuIndex !== -1) {
+    spuIdList.value.splice(spuIndex, 1);
+  }
+  const propertyIndex = spuPropertyList.value.findIndex(
+    (item) => item.spuId === spuId,
+  );
+  if (propertyIndex !== -1) {
+    spuPropertyList.value.splice(propertyIndex, 1);
+  }
+  const listIndex = spuList.value.findIndex((item) => item.id === spuId);
+  if (listIndex !== -1) {
+    spuList.value.splice(listIndex, 1);
+  }
+}
+
+/** 处理 SKU 优惠金额变动 */
+function handleSkuDiscountPriceChange(row: SkuExtension) {
+  if (row.productConfig.discountPrice <= 0) {
+    return;
+  }
+  // 设置优惠类型：满减
+  row.productConfig.discountType = PromotionDiscountTypeEnum.PRICE.type;
+  // 计算折扣百分比
+  const price = typeof row.price === 'number' ? row.price : Number(row.price);
+  const percent = erpCalculatePercentage(
+    price - yuanToFen(row.productConfig.discountPrice),
+    price,
+  );
+  row.productConfig.discountPercent =
+    typeof percent === 'number' ? percent : Number(percent);
+}
+
+/** 处理 SKU 折扣百分比变动 */
+function handleSkuDiscountPercentChange(row: SkuExtension) {
+  if (
+    row.productConfig.discountPercent <= 0 ||
+    row.productConfig.discountPercent >= 100
+  ) {
+    return;
+  }
+  // 设置优惠类型：折扣
+  row.productConfig.discountType = PromotionDiscountTypeEnum.PERCENT.type;
+  // 计算优惠金额
+  const price = typeof row.price === 'number' ? row.price : Number(row.price);
+  row.productConfig.discountPrice = Number(
+    formatToFraction(price - price * (row.productConfig.discountPercent / 100)),
+  );
+}
+
+/** 重置表单 */
+async function resetForm() {
+  spuList.value = [];
+  spuPropertyList.value = [];
+  spuIdList.value = [];
+  formData.value = {};
+  await nextTick();
+  await formApi.resetForm();
+}
+
+// ================= 弹窗相关 =================
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
     }
-    modalApi.lock();
-    // 提交表单
-    const data =
-      (await formApi.getValues()) as MallDiscountActivityApi.DiscountActivity;
 
-    // 确保必要的默认值
-    if (!data.products) {
-      data.products = [];
+    // 校验是否选择了商品
+    if (spuList.value.length === 0) {
+      message.warning('请选择活动商品');
+      return;
     }
 
+    modalApi.lock();
     try {
+      // 获取折扣商品配置
+      const products = structuredClone(
+        spuAndSkuListRef.value?.getSkuConfigs('productConfig') || [],
+      ) as MallDiscountActivityApi.DiscountProduct[];
+
+      // 转换金额为分
+      products.forEach((item) => {
+        item.discountPercent = convertToInteger(item.discountPercent);
+        item.discountPrice = convertToInteger(item.discountPrice);
+      });
+
+      const data = structuredClone(
+        await formApi.getValues(),
+      ) as MallDiscountActivityApi.DiscountActivity;
+      data.products = products;
+
+      // 提交请求
       await (formData.value?.id
         ? updateDiscountActivity(data)
         : createDiscountActivity(data));
-      // 关闭并提示
+
       await modalApi.close();
       emit('success');
       message.success($t('ui.actionMessage.operationSuccess'));
@@ -74,19 +272,45 @@ const [Modal, modalApi] = useVbenModal({
   },
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      formData.value = {};
+      await resetForm();
       return;
     }
+
     // 加载数据
     const data = modalApi.getData<MallDiscountActivityApi.DiscountActivity>();
     if (!data || !data.id) {
       return;
     }
+
     modalApi.lock();
     try {
-      formData.value = await getDiscountActivity(data.id);
-      // 设置到 values
-      await formApi.setValues(formData.value);
+      const activityData = await getDiscountActivity(data.id);
+      formData.value = activityData;
+
+      // 加载商品详情
+      if (activityData.products && activityData.products.length > 0) {
+        // 按 spuId 分组
+        const spuProductsMap = new Map<
+          number,
+          MallDiscountActivityApi.DiscountProduct[]
+        >();
+        for (const product of activityData.products) {
+          const spuId = product.spuId;
+          if (!spuProductsMap.has(spuId)) {
+            spuProductsMap.set(spuId, []);
+          }
+          spuProductsMap.get(spuId)!.push(product);
+        }
+
+        // 加载每个 SPU 的详情
+        for (const [spuId, products] of spuProductsMap) {
+          const skuIdArr = products.map((p) => p.skuId);
+          await getSpuDetails(spuId, skuIdArr, products, 'load');
+        }
+      }
+
+      // 设置表单值
+      await formApi.setValues(activityData);
     } finally {
       modalApi.unlock();
     }
@@ -95,12 +319,59 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-3/5" :title="getTitle">
+  <Modal class="w-[70%]" :title="getTitle">
     <Form>
       <!-- 自定义插槽：商品选择 -->
       <template #spuIds>
-        <SpuShowcase v-model="formData.spuIds" />
+        <div class="w-full">
+          <Button class="mb-4" @click="openSpuSelect">选择商品</Button>
+          <SpuAndSkuList
+            ref="spuAndSkuListRef"
+            :deletable="true"
+            :rule-config="ruleConfig"
+            :spu-list="spuList"
+            :spu-property-list-p="spuPropertyList"
+            @delete="handleDeleteSpu"
+          >
+            <!-- 扩展列：限时折扣活动特有配置 -->
+            <template #default>
+              <VxeColumn align="center" min-width="168" title="优惠金额(元)">
+                <template #default="{ row }">
+                  <InputNumber
+                    v-model:value="row.productConfig.discountPrice"
+                    :max="Number(formatToFraction(row.price))"
+                    :min="0"
+                    :precision="2"
+                    :step="0.1"
+                    class="w-full"
+                    @change="handleSkuDiscountPriceChange(row)"
+                  />
+                </template>
+              </VxeColumn>
+              <VxeColumn align="center" min-width="168" title="折扣百分比(%)">
+                <template #default="{ row }">
+                  <InputNumber
+                    v-model:value="row.productConfig.discountPercent"
+                    :max="100"
+                    :min="0"
+                    :precision="2"
+                    :step="0.1"
+                    class="w-full"
+                    @change="handleSkuDiscountPercentChange(row)"
+                  />
+                </template>
+              </VxeColumn>
+            </template>
+          </SpuAndSkuList>
+        </div>
       </template>
     </Form>
   </Modal>
+
+  <!-- 商品选择弹窗 -->
+  <SpuSkuSelect
+    ref="spuSelectRef"
+    :is-select-sku="true"
+    @select="handleSpuSelected"
+  />
 </template>
diff --git a/apps/web-ele/src/views/mall/promotion/discountActivity/data.ts b/apps/web-ele/src/views/mall/promotion/discountActivity/data.ts
index 9e6368fd2..559f744eb 100644
--- a/apps/web-ele/src/views/mall/promotion/discountActivity/data.ts
+++ b/apps/web-ele/src/views/mall/promotion/discountActivity/data.ts
@@ -75,7 +75,6 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'spuIds',
       label: '活动商品',
       component: 'Input',
-      rules: 'required',
       formItemClass: 'col-span-2',
     },
   ];
diff --git a/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue
index 07d640864..e51dfe8f7 100644
--- a/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/discountActivity/modules/form.vue
@@ -1,30 +1,52 @@
 <script lang="ts" setup>
+import type { MallSpuApi } from '#/api/mall/product/spu';
 import type { MallDiscountActivityApi } from '#/api/mall/promotion/discount/discountActivity';
+import type {
+  PropertyAndValues,
+  RuleConfig,
+  SpuProperty,
+} from '#/views/mall/product/spu/components';
 
-import { computed, ref } from 'vue';
+import { computed, nextTick, ref } from 'vue';
 
 import { useVbenForm, useVbenModal } from '@vben/common-ui';
+import {
+  convertToInteger,
+  erpCalculatePercentage,
+  formatToFraction,
+  yuanToFen,
+} from '@vben/utils';
 
-import { ElMessage } from 'element-plus';
+import { ElButton, ElInputNumber, ElMessage } from 'element-plus';
 
+import { VxeColumn } from '#/adapter/vxe-table';
+import { getSpuDetailList } from '#/api/mall/product/spu';
 import {
   createDiscountActivity,
   getDiscountActivity,
   updateDiscountActivity,
 } from '#/api/mall/promotion/discount/discountActivity';
 import { $t } from '#/locales';
-import { SpuShowcase } from '#/views/mall/product/spu/components';
+import {
+  getPropertyList,
+  SpuAndSkuList,
+  SpuSkuSelect,
+} from '#/views/mall/product/spu/components';
 
 import { useFormSchema } from '../data';
 
 defineOptions({ name: 'DiscountActivityForm' });
 
+/** 折扣类型枚举 */
+const PromotionDiscountTypeEnum = {
+  PRICE: { type: 1 }, // 满减
+  PERCENT: { type: 2 }, // 折扣
+};
+
 const emit = defineEmits(['success']);
-const formData = ref<
-  Partial<MallDiscountActivityApi.DiscountActivity> & {
-    spuIds?: number[];
-  }
->({});
+
+// ================= 表单相关 =================
+const formData = ref<Partial<MallDiscountActivityApi.DiscountActivity>>({});
 const getTitle = computed(() => {
   return formData.value?.id
     ? $t('ui.actionTitle.edit', ['限时折扣活动'])
@@ -44,28 +66,203 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-// TODO @puhui999：antd 和 ele 里，修改时，商品都没展示。
+// ================= 商品选择相关 =================
+/** SKU 扩展类型 */
+interface SkuExtension extends MallSpuApi.Sku {
+  productConfig: MallDiscountActivityApi.DiscountProduct;
+}
+
+/** SPU 扩展类型 */
+interface SpuExtension extends MallSpuApi.Spu {
+  skus?: SkuExtension[];
+}
+
+const spuSelectRef = ref(); // 商品选择组件 Ref
+const spuAndSkuListRef = ref(); // SKU 列表组件 Ref
+const spuList = ref<SpuExtension[]>([]); // 选择的 SPU 列表
+const spuPropertyList = ref<SpuProperty<SpuExtension>[]>([]); // SPU 属性列表
+const spuIdList = ref<number[]>([]); // 已选择的 SPU ID 列表
+
+/** SKU 校验规则配置 */
+const ruleConfig: RuleConfig[] = [
+  {
+    name: 'productConfig.discountPrice',
+    rule: (arg) => arg > 0,
+    message: '商品优惠金额不能为 0 ！！！',
+  },
+];
+
+/** 打开商品选择弹窗 */
+function openSpuSelect() {
+  spuSelectRef.value?.open();
+}
+
+/** 选择商品后的回调 */
+function handleSpuSelected(spuId: number, skuIds?: number[]) {
+  getSpuDetails(spuId, skuIds);
+}
+
+/** 获取 SPU 详情 */
+async function getSpuDetails(
+  spuId: number,
+  skuIdArr?: number[],
+  products?: MallDiscountActivityApi.DiscountProduct[],
+  type?: string,
+) {
+  // 如果已经包含该 SPU 则跳过
+  if (spuIdList.value.includes(spuId)) {
+    if (type !== 'load') {
+      ElMessage.error('数据重复选择！');
+    }
+    return;
+  }
+  spuIdList.value.push(spuId);
+
+  const res = (await getSpuDetailList([spuId])) as SpuExtension[];
+  if (res.length === 0) {
+    return;
+  }
+
+  const spu = res[0]!;
+  // 筛选 SKU
+  const selectSkus =
+    skuIdArr === undefined
+      ? spu.skus
+      : spu.skus?.filter((sku) => skuIdArr.includes(sku.id!));
+
+  // 为每个 SKU 添加折扣配置
+  selectSkus?.forEach((sku) => {
+    let config: MallDiscountActivityApi.DiscountProduct = {
+      skuId: sku.id!,
+      spuId: spu.id!,
+      discountType: 1,
+      discountPercent: 0,
+      discountPrice: 0,
+    };
+
+    // 编辑时，使用已有的配置
+    if (products !== undefined) {
+      const product = products.find((item) => item.skuId === sku.id);
+      if (product) {
+        // 转换为元显示
+        config = {
+          ...product,
+          discountPercent: Number(formatToFraction(product.discountPercent)),
+          discountPrice: Number(formatToFraction(product.discountPrice)),
+        };
+      }
+    }
+    (sku as SkuExtension).productConfig = config;
+  });
+
+  spu.skus = selectSkus as SkuExtension[];
+  spuPropertyList.value.push({
+    spuId: spu.id!,
+    spuDetail: spu,
+    propertyList: getPropertyList(spu) as PropertyAndValues[],
+  });
+  spuList.value.push(spu);
+}
+
+/** 删除 SPU */
+function handleDeleteSpu(spuId: number) {
+  const spuIndex = spuIdList.value.indexOf(spuId);
+  if (spuIndex !== -1) {
+    spuIdList.value.splice(spuIndex, 1);
+  }
+  const propertyIndex = spuPropertyList.value.findIndex(
+    (item) => item.spuId === spuId,
+  );
+  if (propertyIndex !== -1) {
+    spuPropertyList.value.splice(propertyIndex, 1);
+  }
+  const listIndex = spuList.value.findIndex((item) => item.id === spuId);
+  if (listIndex !== -1) {
+    spuList.value.splice(listIndex, 1);
+  }
+}
+
+/** 处理 SKU 优惠金额变动 */
+function handleSkuDiscountPriceChange(row: SkuExtension) {
+  if (row.productConfig.discountPrice <= 0) {
+    return;
+  }
+  // 设置优惠类型：满减
+  row.productConfig.discountType = PromotionDiscountTypeEnum.PRICE.type;
+  // 计算折扣百分比
+  const price = typeof row.price === 'number' ? row.price : Number(row.price);
+  const percent = erpCalculatePercentage(
+    price - yuanToFen(row.productConfig.discountPrice),
+    price,
+  );
+  row.productConfig.discountPercent =
+    typeof percent === 'number' ? percent : Number(percent);
+}
+
+/** 处理 SKU 折扣百分比变动 */
+function handleSkuDiscountPercentChange(row: SkuExtension) {
+  if (
+    row.productConfig.discountPercent <= 0 ||
+    row.productConfig.discountPercent >= 100
+  ) {
+    return;
+  }
+  // 设置优惠类型：折扣
+  row.productConfig.discountType = PromotionDiscountTypeEnum.PERCENT.type;
+  // 计算优惠金额
+  const price = typeof row.price === 'number' ? row.price : Number(row.price);
+  row.productConfig.discountPrice = Number(
+    formatToFraction(price - price * (row.productConfig.discountPercent / 100)),
+  );
+}
+
+/** 重置表单 */
+async function resetForm() {
+  spuList.value = [];
+  spuPropertyList.value = [];
+  spuIdList.value = [];
+  formData.value = {};
+  await nextTick();
+  await formApi.resetForm();
+}
+
+// ================= 弹窗相关 =================
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
     }
-    modalApi.lock();
-    // 提交表单
-    const data =
-      (await formApi.getValues()) as MallDiscountActivityApi.DiscountActivity;
 
-    // 确保必要的默认值
-    if (!data.products) {
-      data.products = [];
+    // 校验是否选择了商品
+    if (spuList.value.length === 0) {
+      ElMessage.warning('请选择活动商品');
+      return;
     }
 
+    modalApi.lock();
     try {
+      // 获取折扣商品配置
+      const products = structuredClone(
+        spuAndSkuListRef.value?.getSkuConfigs('productConfig') || [],
+      ) as MallDiscountActivityApi.DiscountProduct[];
+
+      // 转换金额为分
+      products.forEach((item) => {
+        item.discountPercent = convertToInteger(item.discountPercent);
+        item.discountPrice = convertToInteger(item.discountPrice);
+      });
+
+      const data = structuredClone(
+        await formApi.getValues(),
+      ) as MallDiscountActivityApi.DiscountActivity;
+      data.products = products;
+
+      // 提交请求
       await (formData.value?.id
         ? updateDiscountActivity(data)
         : createDiscountActivity(data));
-      // 关闭并提示
+
       await modalApi.close();
       emit('success');
       ElMessage.success($t('ui.actionMessage.operationSuccess'));
@@ -75,19 +272,45 @@ const [Modal, modalApi] = useVbenModal({
   },
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
-      formData.value = {};
+      await resetForm();
       return;
     }
+
     // 加载数据
     const data = modalApi.getData<MallDiscountActivityApi.DiscountActivity>();
     if (!data || !data.id) {
       return;
     }
+
     modalApi.lock();
     try {
-      formData.value = await getDiscountActivity(data.id);
-      // 设置到 values
-      await formApi.setValues(formData.value);
+      const activityData = await getDiscountActivity(data.id);
+      formData.value = activityData;
+
+      // 加载商品详情
+      if (activityData.products && activityData.products.length > 0) {
+        // 按 spuId 分组
+        const spuProductsMap = new Map<
+          number,
+          MallDiscountActivityApi.DiscountProduct[]
+        >();
+        for (const product of activityData.products) {
+          const spuId = product.spuId;
+          if (!spuProductsMap.has(spuId)) {
+            spuProductsMap.set(spuId, []);
+          }
+          spuProductsMap.get(spuId)!.push(product);
+        }
+
+        // 加载每个 SPU 的详情
+        for (const [spuId, products] of spuProductsMap) {
+          const skuIdArr = products.map((p) => p.skuId);
+          await getSpuDetails(spuId, skuIdArr, products, 'load');
+        }
+      }
+
+      // 设置表单值
+      await formApi.setValues(activityData);
     } finally {
       modalApi.unlock();
     }
@@ -96,12 +319,59 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-3/5" :title="getTitle">
+  <Modal class="w-[70%]" :title="getTitle">
     <Form>
       <!-- 自定义插槽：商品选择 -->
       <template #spuIds>
-        <SpuShowcase v-model="formData.spuIds" />
+        <div class="w-full">
+          <ElButton class="mb-4" @click="openSpuSelect">选择商品</ElButton>
+          <SpuAndSkuList
+            ref="spuAndSkuListRef"
+            :deletable="true"
+            :rule-config="ruleConfig"
+            :spu-list="spuList"
+            :spu-property-list-p="spuPropertyList"
+            @delete="handleDeleteSpu"
+          >
+            <!-- 扩展列：限时折扣活动特有配置 -->
+            <template #default>
+              <VxeColumn align="center" min-width="168" title="优惠金额(元)">
+                <template #default="{ row }">
+                  <ElInputNumber
+                    v-model="row.productConfig.discountPrice"
+                    :max="Number(formatToFraction(row.price))"
+                    :min="0"
+                    :precision="2"
+                    :step="0.1"
+                    class="w-full"
+                    @change="handleSkuDiscountPriceChange(row)"
+                  />
+                </template>
+              </VxeColumn>
+              <VxeColumn align="center" min-width="168" title="折扣百分比(%)">
+                <template #default="{ row }">
+                  <ElInputNumber
+                    v-model="row.productConfig.discountPercent"
+                    :max="100"
+                    :min="0"
+                    :precision="2"
+                    :step="0.1"
+                    class="w-full"
+                    @change="handleSkuDiscountPercentChange(row)"
+                  />
+                </template>
+              </VxeColumn>
+            </template>
+          </SpuAndSkuList>
+        </div>
       </template>
     </Form>
   </Modal>
+
+  <!-- 商品选择弹窗 -->
+  <SpuSkuSelect
+    ref="spuSelectRef"
+    :is-select-sku="true"
+    @select="handleSpuSelected"
+  />
 </template>

From aa95d0e87cf2a7e9b05219329bed17c8c6899430 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Sun, 28 Dec 2025 18:55:07 +0800
Subject: [PATCH 5/5] =?UTF-8?q?feat=EF=BC=9A=E3=80=90ele/antd=E3=80=91prof?=
 =?UTF-8?q?ile=20todo=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/_core/profile/modules/user-social.vue |  2 +-
 .../views/_core/profile/modules/base-info.vue   |  7 +++++--
 .../_core/profile/modules/profile-user.vue      | 17 ++++++++++-------
 .../views/_core/profile/modules/user-social.vue |  9 ++++-----
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/apps/web-antd/src/views/_core/profile/modules/user-social.vue b/apps/web-antd/src/views/_core/profile/modules/user-social.vue
index 8a34b1779..ddb806567 100644
--- a/apps/web-antd/src/views/_core/profile/modules/user-social.vue
+++ b/apps/web-antd/src/views/_core/profile/modules/user-social.vue
@@ -100,7 +100,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     toolbarConfig: {
       enabled: false,
     },
-  } as VxeTableGridOptions<SystemSocialUserApi.SocialUser>,
+  },
 });
 
 /** 解绑账号 */
diff --git a/apps/web-ele/src/views/_core/profile/modules/base-info.vue b/apps/web-ele/src/views/_core/profile/modules/base-info.vue
index c97d12646..39b5b4856 100644
--- a/apps/web-ele/src/views/_core/profile/modules/base-info.vue
+++ b/apps/web-ele/src/views/_core/profile/modules/base-info.vue
@@ -21,10 +21,13 @@ const emit = defineEmits<{
   (e: 'success'): void;
 }>();
 
-// TODO @puhui999：展示貌似不太对；应该是左右，不是上下哈
 const [Form, formApi] = useVbenForm({
   commonConfig: {
-    labelWidth: 70,
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 80,
   },
   schema: [
     {
diff --git a/apps/web-ele/src/views/_core/profile/modules/profile-user.vue b/apps/web-ele/src/views/_core/profile/modules/profile-user.vue
index 675bb131c..fbf7c6fc4 100644
--- a/apps/web-ele/src/views/_core/profile/modules/profile-user.vue
+++ b/apps/web-ele/src/views/_core/profile/modules/profile-user.vue
@@ -25,7 +25,6 @@ const avatar = computed(
   () => props.profile?.avatar || preferences.app.defaultAvatar,
 );
 
-// TODO @puhui999：头像上传没跑通
 async function handelUpload({
   file,
   filename,
@@ -37,9 +36,9 @@ async function handelUpload({
   const { httpRequest } = useUpload();
   // 将 Blob 转换为 File
   const fileObj = new File([file], filename, { type: file.type });
-  const avatar = await httpRequest(fileObj);
-  // 2. 更新用户头像
-  await updateUserProfile({ avatar });
+  const res = await httpRequest(fileObj);
+  // 2. 更新用户头像（httpRequest 返回 { url: string }）
+  await updateUserProfile({ avatar: res.url });
 }
 </script>
 
@@ -57,8 +56,8 @@ async function handelUpload({
       </ElTooltip>
     </div>
     <div class="mt-8">
-      <ElDescriptions :column="2">
-        <ElDescriptionsItem>
+      <ElDescriptions :column="2" border>
+        <ElDescriptionsItem label="用户账号">
           <template #label>
             <div class="flex items-center">
               <IconifyIcon icon="ant-design:user-outlined" class="mr-1" />
@@ -116,7 +115,11 @@ async function handelUpload({
               所属岗位
             </div>
           </template>
-          {{ profile.posts.map((post) => post.name).join(',') }}
+          {{
+            profile.posts && profile.posts.length > 0
+              ? profile.posts.map((post) => post.name).join(',')
+              : '-'
+          }}
         </ElDescriptionsItem>
         <ElDescriptionsItem>
           <template #label>
diff --git a/apps/web-ele/src/views/_core/profile/modules/user-social.vue b/apps/web-ele/src/views/_core/profile/modules/user-social.vue
index 5c4da5d01..04a537007 100644
--- a/apps/web-ele/src/views/_core/profile/modules/user-social.vue
+++ b/apps/web-ele/src/views/_core/profile/modules/user-social.vue
@@ -100,7 +100,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     toolbarConfig: {
       enabled: false,
     },
-  } as VxeTableGridOptions<SystemSocialUserApi.SocialUser>,
+  },
 });
 
 /** 解绑账号 */
@@ -167,13 +167,12 @@ onMounted(() => {
       >
         <ElCard v-for="item in allBindList" :key="item.type" class="!mb-2">
           <div class="flex w-full items-center gap-4">
-            <!-- TODO @puhui999：图片大小不太对 -->
             <ElImage
               :src="item.img"
-              :width="40"
-              :height="40"
+              style="width: 40px; height: 40px"
               :alt="item.title"
-              :preview="false"
+              :preview-disabled="true"
+              fit="contain"
             />
             <div class="flex flex-1 items-center justify-between">
               <div class="flex flex-col">