Commit Graph

132 Commits

Author SHA1 Message Date
落日晚风
62b9002cf6 满减送数据对接
(cherry picked from commit 21e8dbf985)
2024-03-08 20:53:30 +08:00
owen
cae1d7cb1a 统计:增加商品统计
(cherry picked from commit ca35e1a4af)
2024-03-08 20:52:15 +08:00
YunaiV
2be6f196e6 🔨 CRM:优化产品代码的实现
(cherry picked from commit b3d66cd0aa)
2024-03-07 13:03:54 +08:00
shizhong
255708beec 🐛 修复 IDEA 在 v-for="dict in getIntDictOptions(...)" 时,el-optionkey 会告警的问题 2024-03-07 12:55:25 +08:00
shizhong
d4dc61f34f 🐛 修复 operateLog 和 loginLog 在 IDEA 报错的问题 2024-03-07 12:35:03 +08:00
YunaiV
9a49a8ea40 🐛 修复 post 和 dept 在 IDEA 报错的问题
(cherry picked from commit a77173f2ae)
2024-03-06 21:37:36 +08:00
YunaiV
ef2a70e3f8 crm: 增加基于客户查询回款计划分页
(cherry picked from commit b0c1e55c6a)
2024-03-06 21:32:52 +08:00
owen
a8f9fa152a 营销:商城装修增加控件【APP 链接选择】
(cherry picked from commit 23a6bf5ef5)
2024-03-06 21:24:11 +08:00
YunaiV
affd0c52f2 crm:增加合同 List 组件
(cherry picked from commit 31a42fc3f7)
2024-03-06 21:21:29 +08:00
YunaiV
993cb4f216 crm:完善数据权限的界面
(cherry picked from commit 5f26c4afe9)
2024-03-06 21:21:11 +08:00
YunaiV
98c046ecd7 crm:code review 成员
(cherry picked from commit eb97447bb7)
2024-03-06 21:03:22 +08:00
owen
42b78d1411 商城:修复会员统计时间范围选择昨天时, 会强制查询两天的问题
(cherry picked from commit c3cad3f3ee)
2024-03-06 21:01:57 +08:00
puhui999
6da65b76d0 crm-数据权限:完善团队成员公共组件
(cherry picked from commit 19a0a83054)
2024-03-06 20:53:41 +08:00
owen
e8ec61a280 营销:适配商城装修组件【菜单导航】
(cherry picked from commit 82aed175ab)
2024-03-06 20:30:40 +08:00
ZanGe丶
618cf7459a 【crm:产品及产品分类】
(cherry picked from commit ff6f05df84)
2024-03-05 17:49:15 +08:00
YunaiV
98fc2fe327 优化:社交登录、用户的管理
(cherry picked from commit a9b91e7436)
2024-03-05 17:44:12 +08:00
xingyu
d172595f14 fix: types
(cherry picked from commit 10483577b7)
2024-03-05 17:40:50 +08:00
xingyu
709f3cfbd6 feat: coding
(cherry picked from commit 80e72fd924)
2024-03-05 17:34:25 +08:00
jason
18cd9dde6e 转账 - 管理后台新增转账示例
(cherry picked from commit 55a961e862)
2024-03-05 17:32:29 +08:00
Wanwan
7923078e17 feat: 调整客户表的字段
(cherry picked from commit 59cf0c29f0)
2024-03-05 17:30:11 +08:00
puhui999
212d40f290 新增社交客户端 CRUD
(cherry picked from commit 8935188a82)
2024-03-05 17:24:58 +08:00
YunaiV
6ca92b9251 code review:banner 逻辑
(cherry picked from commit e5d6a9dae1)
2024-03-05 17:22:30 +08:00
puhui999
1298c3dd52 完善 banner 管理
(cherry picked from commit a7439ee08b)
2024-03-05 17:22:09 +08:00
liuhongfeng
7b020781f0 【新增】回款管理 功能
(cherry picked from commit 7ad1457f79)
2024-03-05 17:20:32 +08:00
puhui999
e9da54b100 SPU: 新增优惠卷选择
(cherry picked from commit 3464bb9c74)
2024-03-05 17:12:24 +08:00
xingyu
16eb97e366 perf: is utils
(cherry picked from commit 8c18ad941e)
2024-03-05 17:03:10 +08:00
xingyu
5ef9a14f3a perf: propTypes
(cherry picked from commit 5da9b660bd)
2024-03-05 17:02:56 +08:00
owen
230d073fb8 商城:增加商城首页
(cherry picked from commit 3802fee661)
2024-03-05 16:52:31 +08:00
puhui999
d4d41701ab 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗
(cherry picked from commit b08e0e5ab2)
2024-03-05 16:48:39 +08:00
puhui999
848e0b7023 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗
(cherry picked from commit 3500a20630)
2024-03-05 16:33:41 +08:00
shizhong
f0cdee8e9a fix: 【工作流】--加签减签 2024-03-05 16:31:04 +08:00
风狗
a2c4cb22f4 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Signed-off-by: 风狗 <909275705@qq.com>
(cherry picked from commit aa5f27bec7)
2024-03-05 16:05:34 +08:00
puhui999
9f836ad25b 拼团记录:优化页面布局,添加日期快捷选项
(cherry picked from commit 5b4983a3e9)
2024-03-05 16:04:54 +08:00
puhui999
8346717986 拼团记录: 完成 UI 部分
(cherry picked from commit eee3d0fef5)
2024-03-05 16:04:27 +08:00
YunaiV
d9ec3f6e61 promotion:新增砍价记录列表
(cherry picked from commit 860872a890)
2024-03-05 15:58:04 +08:00
owen
cbba91dac5 交易:核销
(cherry picked from commit 58b6b1ba57)
2024-03-05 15:57:14 +08:00
YunaiV
6a8aa02960 trade:完善订单详情
(cherry picked from commit 4fddbccea1)
2024-03-05 15:53:59 +08:00
YunaiV
f1900d7717 product:优化商品列表的样式、实现代码
(cherry picked from commit 3a9668d632)
2024-03-05 15:53:27 +08:00
owen
05e6668322 会员详情,查询钱包信息
(cherry picked from commit 675f3df5cb)
2024-03-05 15:50:46 +08:00
owen
9b4bb4025b 统计:交易统计
(cherry picked from commit c322fb3d0d)
2024-03-05 15:50:37 +08:00
YunaiV
bf4ab7e58b trade:优化交易配置的参数校验
(cherry picked from commit 74de8e9687)
2024-03-05 13:17:57 +08:00
shizhong
0670facae4 解决处理顶级非目录路由的组件名称逻辑缺失的问题 2023-09-25 15:08:24 +08:00
owen
417be9f6ae Trade: 完善配置
(cherry picked from commit 21c67b1b75)
2023-09-25 13:14:23 +08:00
owen
36f6745ecb trade: 分销业务 - 佣金提现后台管理
(cherry picked from commit 854acf6e70)
2023-09-25 12:48:07 +08:00
owen
3f127d4d44 trade: 分销业务review代码修改
(cherry picked from commit 18b6c70d1a)
2023-09-25 12:48:04 +08:00
owen
52def241f8 trade: 分销业务review代码修改
(cherry picked from commit 2e830d14d5)
2023-09-25 12:43:29 +08:00
owen
4d1ecf7161 trade: 分销业务后台功能:推广订单列表
(cherry picked from commit 0582d41972)
2023-09-25 12:43:25 +08:00
owen
9117f56533 trade: 分销业务后台功能:推广用户列表
(cherry picked from commit 2aa372d8f4)
2023-09-25 12:43:19 +08:00
YunaiV
ca0ec86913 code review:会员详情
(cherry picked from commit 0e2ea39591)
2023-09-25 12:41:27 +08:00
shizhong
fa0c84da02 Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev 2023-09-25 12:40:29 +08:00