+ {{ row.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/web-ele/src/views/mall/product/property/modules/value-form.vue b/apps/web-ele/src/views/mall/product/property/modules/value-form.vue
new file mode 100644
index 000000000..b66085663
--- /dev/null
+++ b/apps/web-ele/src/views/mall/product/property/modules/value-form.vue
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
diff --git a/apps/web-ele/src/views/mall/product/spu/data.ts b/apps/web-ele/src/views/mall/product/spu/data.ts
new file mode 100644
index 000000000..6ceb265ea
--- /dev/null
+++ b/apps/web-ele/src/views/mall/product/spu/data.ts
@@ -0,0 +1,117 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MallSpuApi } from '#/api/mall/product/spu';
+
+import { handleTree } from '@vben/utils';
+
+import { getCategoryList } from '#/api/mall/product/category';
+import { getRangePickerDefaultProps } from '#/utils';
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+ return [
+ {
+ fieldName: 'name',
+ label: '商品名称',
+ component: 'Input',
+ },
+ {
+ fieldName: 'categoryId',
+ label: '商品分类',
+ component: 'ApiTreeSelect',
+ componentProps: {
+ api: async () => {
+ const res = await getCategoryList({});
+ return handleTree(res, 'id', 'parentId', 'children');
+ },
+ fieldNames: { label: 'name', value: 'id', children: 'children' },
+ },
+ },
+ {
+ fieldName: 'createTime',
+ label: '创建时间',
+ component: 'RangePicker',
+ componentProps: {
+ ...getRangePickerDefaultProps(),
+ allowClear: true,
+ },
+ },
+ ];
+}
+
+/** 列表的字段 */
+export function useGridColumns+ +
+
+
+
+
+ + 注意： + 积分活动涉及复杂的商品选择和SKU配置，当前为简化版本。 + 完整的商品选择和积分配置功能需要在后续版本中完善。 +
+
+
+ + 说明： 当前为简化版本的满减送活动表单。 + 复杂的商品选择、优惠规则配置等功能已简化，仅保留基础字段配置。 + 如需完整功能，请参考原始 Element UI 版本的实现。 +
+
+
+ {{ formatConfigNames(configId) }}
+
+
+
+
+
+ {{ formatTimeRange(row.startTime, row.endTime) }}
+
+
+
+ +
+
+
+ 分销员编号：
+
+
+
+
+
+
+ 上级推广人编号：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ userInfo.user?.nickname }}
+
+
+
+
+
+
+
+ {{ userInfo.bindUser?.nickname }}
+
+
+
+ 有
+
+ 无
+
+
+ {{ formatDate(userInfo.bindUser?.brokerageTime) }}
+
+
+
+
+ 推广员编号：
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+ 账号：{{ row.userAccount }}
+ 真实姓名：{{ row.userName }}
+
+ 银行名称：{{ row.bankName }}
+ 开户地址：{{ row.bankAddress }}
+
+
+ ![]()
+
+ 收款码：
+
+
+
+
+
+
+ 时间：{{ formatDateTime(row.auditTime) }}
+
+
+ 审核原因：{{ row.auditReason }}
+
+
+ 转账失败原因：{{ row.transferErrorMsg }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.spuName }}
+
+ {{ property.propertyName }}: {{ property.valueName }}
+
+
+
+ 原价：{{ fenToYuan(item.price) }} 元 / 数量：{{
+ item.count
+ }}个
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.spuName }}
+
+ {{ property.propertyName }}: {{ property.valueName }}
+
+
+
+ 原价：{{ fenToYuan(item.price) }} 元 / 数量：{{
+ item.count
+ }}
+ 个
+
+
-
订单管理
+
-
售后管理
+
-
收藏记录
+
-
优惠劵
+
-
推广用户
+{{ $t('ui.upload.imgUpload') }}
@@ -262,4 +270,22 @@ function getValue() {
.ant-upload-select-picture-card {
@apply flex items-center justify-center;
}
+
+.custom-upload .el-upload {
+ width: auto !important;
+ height: auto !important;
+}
+
+.custom-upload .el-upload--picture-card {
+ width: auto !important;
+ height: auto !important;
+ line-height: normal !important;
+}
+
+.custom-upload .upload-content {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ overflow: hidden;
+}
diff --git a/apps/web-ele/src/router/routes/modules/mall.ts b/apps/web-ele/src/router/routes/modules/mall.ts
new file mode 100644
index 000000000..80416ba65
--- /dev/null
+++ b/apps/web-ele/src/router/routes/modules/mall.ts
@@ -0,0 +1,76 @@
+import type { RouteRecordRaw } from 'vue-router';
+
+const routes: RouteRecordRaw[] = [
+ {
+ path: '/mall/product',
+ name: 'ProductCenter',
+ meta: {
+ title: '商品中心',
+ icon: 'lucide:shopping-bag',
+ keepAlive: true,
+ hideInMenu: true,
+ },
+ children: [
+ {
+ path: 'spu/add',
+ name: 'ProductSpuAdd',
+ meta: {
+ title: '商品添加',
+ activeMenu: '/mall/product/spu',
+ },
+ component: () => import('#/views/mall/product/spu/modules/form.vue'),
+ },
+ {
+ path: String.raw`spu/edit/:id(\d+)`,
+ name: 'ProductSpuEdit',
+ meta: {
+ title: '商品编辑',
+ activeMenu: '/mall/product/spu',
+ },
+ component: () => import('#/views/mall/product/spu/modules/form.vue'),
+ },
+ {
+ path: String.raw`spu/detail/:id(\d+)`,
+ name: 'ProductSpuDetail',
+ meta: {
+ title: '商品详情',
+ activeMenu: '/crm/business',
+ },
+ component: () => import('#/views/mall/product/spu/modules/detail.vue'),
+ },
+ ],
+ },
+ // {
+ // path: '/mall/trade',
+ // name: 'TradeCenter',
+ // meta: {
+ // title: '交易中心',
+ // icon: 'lucide:shopping-cart',
+ // keepAlive: true,
+ // hideInMenu: true,
+ // },
+ // children: [
+ // {
+ // path: String.raw`order/detail/:id(\d+)`,
+ // name: 'TradeOrderDetail',
+ // meta: {
+ // title: '订单详情',
+ // activeMenu: '/mall/trade/order',
+ // },
+ // component: () => import('#/views/mall/trade/order/detail/index.vue'),
+ // },
+ // {
+ // path: String.raw`after-sale/detail/:id(\d+)`,
+ // name: 'TradeAfterSaleDetail',
+ // meta: {
+ // title: '退款详情',
+ // activeMenu: '/mall/trade/after-sale',
+ // },
+ // component: () =>
+ // import('#/views/mall/trade/afterSale/detail/index.vue'),
+ // },
+ // ],
+ // },
+];
+
+export default routes;
diff --git a/apps/web-ele/src/utils/bean.ts b/apps/web-ele/src/utils/bean.ts
new file mode 100644
index 000000000..fa4e3c028
--- /dev/null
+++ b/apps/web-ele/src/utils/bean.ts
@@ -0,0 +1,17 @@
+/**
+ * 将值复制到目标对象，且以目标对象属性为准，例：target: {a:1} source:{a:2,b:3} 结果为：{a:2}
+ * @param target 目标对象
+ * @param source 源对象
+ */
+export const copyValueToTarget = (target: any, source: any) => {
+ const newObj = Object.assign({}, target, source);
+ // 删除多余属性
+ Object.keys(newObj).forEach((key) => {
+ // 如果不是target中的属性则删除
+ if (Object.keys(target).indexOf(key) === -1) {
+ delete newObj[key];
+ }
+ });
+ // 更新目标对象值
+ Object.assign(target, newObj);
+};
diff --git a/apps/web-ele/src/utils/formatNum.ts b/apps/web-ele/src/utils/formatNum.ts
new file mode 100644
index 000000000..fd8fbb1e3
--- /dev/null
+++ b/apps/web-ele/src/utils/formatNum.ts
@@ -0,0 +1,38 @@
+/**
+ * 将一个整数转换为分数保留两位小数
+ * @param num
+ */
+export const formatToFraction = (num: number | string | undefined): string => {
+ if (typeof num === 'undefined') return '0.00';
+ const parsedNumber = typeof num === 'string' ? parseFloat(num) : num;
+ return (parsedNumber / 100.0).toFixed(2);
+};
+
+/**
+ * 将一个数转换为 1.00 这样
+ * 数据呈现的时候使用
+ *
+ * @param num 整数
+ */
+// TODO @芋艿：看看怎么融合掉
+export const floatToFixed2 = (num: number | string | undefined): string => {
+ let str = '0.00';
+ if (typeof num === 'undefined') {
+ return str;
+ }
+ const f = formatToFraction(num);
+ const decimalPart = f.toString().split('.')[1];
+ const len = decimalPart ? decimalPart.length : 0;
+ switch (len) {
+ case 0:
+ str = f.toString() + '.00';
+ break;
+ case 1:
+ str = f.toString() + '0';
+ break;
+ case 2:
+ str = f.toString();
+ break;
+ }
+ return str;
+};
diff --git a/apps/web-ele/src/utils/index.ts b/apps/web-ele/src/utils/index.ts
index 022e6441d..f07b644bd 100644
--- a/apps/web-ele/src/utils/index.ts
+++ b/apps/web-ele/src/utils/index.ts
@@ -5,3 +5,7 @@ export * from './formCreate';
export * from './rangePickerProps';
export * from './routerHelper';
export * from './validator';
+export * from './tree';
+export * from './formatNum';
+export * from './is';
+export * from './bean';
diff --git a/apps/web-ele/src/utils/is.ts b/apps/web-ele/src/utils/is.ts
new file mode 100644
index 000000000..cd2dcc376
--- /dev/null
+++ b/apps/web-ele/src/utils/is.ts
@@ -0,0 +1,117 @@
+// copy to vben-admin
+
+const toString = Object.prototype.toString
+
+export const is = (val: unknown, type: string) => {
+ return toString.call(val) === `[object ${type}]`
+}
+
+export const isDef =
+ 属性名：
+
+ {{ item.name }}
+
+
+
+ 属性值：
+
+ {{ value.name }}
+
+
+
+
+ + 添加
+
+
+
- 属性名：
-
+ 属性名：
+
{{ item.name }}
-
+
- 属性值：
-
- {{ value.name }}
-
-
-
-
- + 添加
-
+
+ 属性值：
+
+ {{ value.name }}
+
+
+
+
+ + 添加
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formData.name }}
+
+ {{ formData.introduction || '暂无简介' }}
+
+
+ 多规格
+ 单规格
+ 分销
+ 库存:
+ {{
+ formData.skus?.reduce(
+ (sum, sku) => sum + (sku.stock || 0),
+ 0,
+ ) || 0
+ }}
+ 分类: {{ getCategoryNameById(formData.categoryId) }}
+
+
+
+
+
+ {{
+ formData.name
+ }}
+
+ {{
+ getCategoryNameById(formData.categoryId)
+ }}
+
+
+ {{
+ getBrandNameById(formData.brandId)
+ }}
+
+
+
+ {{
+ formData.giveIntegral
+ }}
+ {{
+ formData.virtualSalesCount
+ }}
+ {{
+ formData.sort
+ }}
+
+
+ {{ formData.specType ? '多规格' : '单规格' }}
+
+
+
+
+ {{ formData.subCommissionType ? '单独设置' : '默认设置' }}
+
+
+
+
+
+
+
+
+
+
+ {{
+ formData.deliveryTemplateId || '未设置'
+ }}
+
+
+
+
+
+ {{ getDeliveryTypeName(type) }}
+
+
+ 暂无配送方式
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + 价格信息 +
+
+
+ 销售价:
+
+ ¥{{ sku.price }}
+
+ 市场价:
+ ¥{{ sku.marketPrice }}
+ 成本价:
+ ¥{{ sku.costPrice }}
+
+
+
+
+ + 库存信息 +
+
+
+ 库存:
+ {{ sku.stock }} 件
+ 条码:
+ {{ sku.barCode || '未设置' }}
+
+
+ + 物流信息 +
+
+
+ 重量:
+ {{ sku.weight }} kg
+ 体积:
+ {{ sku.volume }} m³
+
+
+
+
+ + 分销佣金 +
+
+
+ 一级佣金:
+ ¥{{ sku.firstBrokeragePrice }}
+ 二级佣金:
+ ¥{{ sku.secondBrokeragePrice }}
+
+
+ 规格属性
+
+
+ {{ prop.propertyName }}: {{ prop.valueName }}
+
+
+
+
+
+