root/ludu-admin-vue3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,235 Commits 8 Branches 11 Tags 16 MiB
f9c272ad0d
Commit Graph

353 Commits

Author SHA1 Message Date
puhui999
848e0b7023 营销活动：完善 review 提到的问题，添加拼团列表查看弹窗 
(cherry picked from commit 3500a20630)
 2024-03-05 16:33:41 +08:00
youkehai
dbcefcca9b fix: 减签按钮显示和api地址修改 
(cherry picked from commit 62a953815d)
 2024-03-05 16:33:32 +08:00
owen
c4e6163437 统计：会员统计 
(cherry picked from commit 22adab8590)
 2024-03-05 16:32:14 +08:00
shizhong
f0cdee8e9a fix: 【工作流】--加签减签 2024-03-05 16:31:04 +08:00
YunaiV
a06369d427 code review：拼团记录列表 
(cherry picked from commit 86323f970b)
 2024-03-05 16:05:22 +08:00
puhui999
22449ed21a 拼团记录：接口对接 
(cherry picked from commit c445173855)
 2024-03-05 16:04:39 +08:00
owen
e30e0e2d32 统计：交易统计Review修改 
(cherry picked from commit 2a58b04a98)
 2024-03-05 16:03:05 +08:00
YunaiV
2b4c192423 promotion：调整拼团活动的界面 
(cherry picked from commit 78062dd474)
 2024-03-05 16:03:00 +08:00
YunaiV
be2f92754b promotion：新增记录记录列表 
(cherry picked from commit cf7ac2cb10)
 2024-03-05 15:58:09 +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
e92709da70 promotion：优化秒杀活动的界面 
(cherry picked from commit 7c491ff62a)
 2024-03-05 15:57:09 +08:00
YunaiV
7d44b98116 trade：优化运费模版的实现 
(cherry picked from commit a9bbbc7b0a)
 2024-03-05 15:54:35 +08:00
YunaiV
6a8aa02960 trade：完善订单详情 
(cherry picked from commit 4fddbccea1)
 2024-03-05 15:53:59 +08:00
YunaiV
a83db39abf trade：微调 order 列表界面 
(cherry picked from commit 588ce1c9ae)
 2024-03-05 15:53:54 +08:00
owen
e05b749e4d 会员：会员配置的积分相关字段加上point前缀 
(cherry picked from commit 3a96812d47)
 2024-03-05 15:53:20 +08:00
owen
24a650d89b 会员：积分配置改为会员配置 
(cherry picked from commit 3ab1ed707f)
 2024-03-05 15:53:16 +08:00
owen
6b6c9f5f02 签到：签到后增加用户积分、经验 
(cherry picked from commit 0066d79876)
 2024-03-05 15:52:41 +08:00
owen
18bdea83be 会员详情，修改会员积分 
(cherry picked from commit 4b7e57e67d)
 2024-03-05 15:52:21 +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
owen
75e0a701f3 分销：修正分享海报 
(cherry picked from commit a5dd7f4a81)
 2024-03-05 13:14:55 +08:00
owen
28d312c857 分销：重命名提现类型字段 
(cherry picked from commit 2c22ef8ef1)
 2024-03-05 13:14:11 +08:00
shizhong
2c74888712 feat: 【工作流】--委派 2023-09-26 19:56:57 +08:00
YunaiV
d46b9deb18 code review：驳回逻辑 
(cherry picked from commit 245147223f)
 2023-09-25 13:32:48 +08:00
kehaiyou
0bef9924fe fix: 【工作流】--回退的高亮和api地址更换 
(cherry picked from commit f40d1de62a)
 2023-09-25 13:30:17 +08:00
kehaiyou
6888fd90d1 feat: 支持回退按钮 
(cherry picked from commit de79e79d91)
 2023-09-25 13:15:55 +08:00
owen
36f6745ecb trade: 分销业务 - 佣金提现后台管理 
(cherry picked from commit 854acf6e70)
 2023-09-25 12:48:07 +08:00
puhui999
9607127897 spu：分佣属性和分佣保持一致 
(cherry picked from commit 5dc0c6e3da)
 2023-09-25 12:43:15 +08:00
puhui999
2e4cad38bb mall-order：修复 todo 提到的问题 
(cherry picked from commit 7e511d1e4f)
 2023-09-25 12:42:27 +08:00
owen
ad35b40a76 trade: 分销业务后台功能：修改上级推广人 
(cherry picked from commit 5ed909263a)
 2023-09-25 12:42:08 +08:00
owen
9dbf4feeae trade: 分销业务后台功能：清除推广员、修改推广资格 
(cherry picked from commit 7ea3571356)
 2023-09-25 12:42:04 +08:00
YunaiV
ca0ec86913 code review：会员详情 
(cherry picked from commit 0e2ea39591)
 2023-09-25 12:41:27 +08:00
YunaiV
58f01a8bc5 code review：完善订单详情和售后退款 TODO 提到的问题 
(cherry picked from commit 3c315cf287)
 2023-09-25 12:38:53 +08:00
owen
f0d95e4a93 trade: 优化分销用户佣金字段名称 
(cherry picked from commit e9d5027e72)
 2023-09-25 12:38:25 +08:00
owen
91ab91fdbb trade: 优化分销用户绑定用户编号、绑定时间字段名称 
(cherry picked from commit 7263315412)
 2023-09-25 12:38:22 +08:00
owen
eab116cfce trade: 分销用户管理 
(cherry picked from commit 34ce7f7ec5)
 2023-09-25 12:38:18 +08:00
puhui999
69eb2c0f3a 完善订单详情和售后退款 TODO 提到的问题 
(cherry picked from commit 73628d3930)
 2023-09-25 12:30:24 +08:00
owen
b398062102 trade: 分销业务从 member 模块 转移到 trade模块 
(cherry picked from commit 1e2120806d)
 2023-09-25 12:30:17 +08:00
owen
d33f42a525 trade: 分销业务从 member 模块 转移到 trade模块 
(cherry picked from commit 2ed5d12be8)
 2023-09-25 12:30:13 +08:00
owen
f5804431a3 trade: 增加交易中心配置表 
(cherry picked from commit 35664d1f32)
 2023-09-25 12:30:09 +08:00
绮梦
b58b8bb6ea 新增用户详情下成长值页面。 
(cherry picked from commit fe6cf7ce98)
 2023-09-25 12:26:40 +08:00
owen
4d0f941f7c member: 佣金记录 
(cherry picked from commit 73f8cef3b4)
 2023-09-25 12:25:28 +08:00
owen
c2f411607e member: 分销配置 
(cherry picked from commit 5a9764c08c)
 2023-09-25 12:25:23 +08:00
puhui999
c960ba1e20 完善订单详情和售后退款日志展示样式重构 
(cherry picked from commit 46fd154e3a)
 2023-09-25 12:24:59 +08:00
shizhong
ec76b555a3 解决合并出现的问题 2023-09-20 16:53:38 +08:00
owen
6f8dc79283 promotion: 优惠券模板 productSpuIds 改成 productScopeValues 
(cherry picked from commit 5f557c7be5)
 2023-09-20 12:39:13 +08:00
owen
842c922855 mall：优惠券发送优化 
(cherry picked from commit 76c4644b4b)
 2023-09-20 12:38:35 +08:00
puhui999
d740a4d894 订单管理：完善订单详情 
(cherry picked from commit f0249e94a5)
 2023-09-20 12:34:53 +08:00
YunaiV
8364e52477 code review：售后详情 
(cherry picked from commit 29b8d06ff2)
 2023-09-20 12:32:48 +08:00
owen
c999b72692 mall：优惠券 商品适用范围，增加商品分类 
(cherry picked from commit 27219e1833)
 2023-09-20 12:30:42 +08:00
puhui999
c738fd417a 订单售后列表：完善售后详情及相关操作 
(cherry picked from commit ed739aec55)
 2023-09-20 12:30:14 +08:00
puhui999
52776c97da 订单售后列表：初始化售后详情 
(cherry picked from commit 8a51c9c771)
 2023-09-20 12:25:56 +08:00
puhui999
875211e24f 订单售后列表：重构列表 
(cherry picked from commit 4f81468695)
 2023-09-20 12:25:50 +08:00
owen
529ac7d347 mall: 完善后台发送优惠券 
(cherry picked from commit beef6a0a94)
 2023-09-20 12:25:36 +08:00
YunaiV
4ffc150701 code review：会员中心 
(cherry picked from commit 2d8d323767)
 2023-09-20 12:23:45 +08:00
绮梦
48a230aac4 账户信息组件 增加等级、成长值和积分的显示。 
增加一些配套的svg 图标。
增加tab 的懒加载。

(cherry picked from commit 45a6b3bcc7)
 2023-09-20 12:23:26 +08:00
YunaiV
e97a62fe06 code review：用户详情 
(cherry picked from commit 1b6c9b2e29)
 2023-09-20 12:22:09 +08:00
owen
1a49567613 商品：完善后台商品评论功能 
(cherry picked from commit 814b4631c9)
 2023-09-20 12:19:40 +08:00
绮梦
72e494c532 重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。 
(cherry picked from commit 28951fb31d)
 2023-09-20 12:19:00 +08:00
puhui999
9d9ccaa1b8 完善 code review 提到的问题 
(cherry picked from commit 7db6c121bb)
 2023-09-20 12:18:16 +08:00
owen
4de2049956 会员: 会员等级取消分页功能 
(cherry picked from commit e9120f06cf)
 2023-09-20 12:14:25 +08:00
YunaiV
92423dc00b code review：用户详情 
(cherry picked from commit 55772cbba0)
 2023-09-20 12:14:21 +08:00
YunaiV
46ab58ddf0 code review：订单列表、订单详情 
(cherry picked from commit cfbc2ed74c)
 2023-09-20 12:14:05 +08:00
YunaiV
6556feed21 code review：会员等级 
(cherry picked from commit bb0c1cb536)
 2023-09-20 12:13:05 +08:00
puhui999
edb88f8548 订单列表：列表重构 添加门店、物流检索条件 
(cherry picked from commit 5dceda614a)
 2023-09-20 12:12:58 +08:00
puhui999
99ef6f83ba 订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注 
(cherry picked from commit be143ea21b)
 2023-09-20 12:12:52 +08:00
绮梦
612cc026b3 增加用户详情页以及 签到、积分等用户详情下的子tab页。 
增加 用户、签到、积分 接口的VO,方便在组件中使用。

(cherry picked from commit 10d9f11fba)
 2023-09-20 12:12:11 +08:00
owen
2b67180f80 会员: 修改会员等级，使用单独的表单、接口 
(cherry picked from commit 51738f8f6e)
 2023-09-20 12:12:02 +08:00
puhui999
9efe122318 订单列表：列表重构 ③ 添加备注表单和发货表单 
(cherry picked from commit 0d202a7a85)
 2023-09-20 12:11:09 +08:00
owen
b74d4df4f8 会员：增加用户分组 
(cherry picked from commit 78917cd2be)
 2023-09-20 12:11:04 +08:00
puhui999
c89d08e22a 订单列表：列表重构 ② and 完善订单详情 
(cherry picked from commit 345c09ee6c)
 2023-09-20 12:10:57 +08:00
owen
788cba3bc5 会员：用户标签增加下拉框使用的 精简信息列表查询接口 
(cherry picked from commit 884bb055b0)
 2023-09-20 12:09:04 +08:00
owen
9b15c04efc 会员：后台调整会员等级 
(cherry picked from commit 7bef240926)
 2023-09-20 12:08:53 +08:00
YunaiV
e27733aed8 code review：签到记录 
(cherry picked from commit be485cc4ab)
 2023-09-19 21:04:40 +08:00
YunaiV
57df63dc35 code review：签到配置 
(cherry picked from commit 82628ce780)
 2023-09-19 21:04:29 +08:00
owen
8006325621 会员：增加会员等级增删改查 
(cherry picked from commit f1735a4010)
 2023-09-19 21:04:04 +08:00
YunaiV
5a0579e087 code review：会员签到配置 
(cherry picked from commit 76a63e01c9)
 2023-09-19 21:03:59 +08:00
puhui999
21643274cb 订单列表：列表重构 ① 
(cherry picked from commit 2eb740765e)
 2023-09-19 21:03:26 +08:00
owen
bcb0ed847e 会员： 
1.增加会员标签功能

(cherry picked from commit 334962fe09)
 2023-09-19 20:59:58 +08:00
YunaiV
779c6c760c 会员中心：会员管理 50% 
(cherry picked from commit 4fd9dfd1f8)
 2023-09-19 20:57:35 +08:00
xiaqing
a7f0c8d3a2 会员积分和会员签到模块todo修改 
(cherry picked from commit 19444021ca)
 2023-09-19 20:57:26 +08:00
puhui999
1854e891cb fix: 完善砍价活动管理对齐后端 
(cherry picked from commit 44be35b5ce)
 2023-09-19 20:53:01 +08:00
YunaiV
81d8e36ccc 商城： 
1. 修复拼团活动，修改商品的拼团价格，会存在 *100 的问题

(cherry picked from commit 127e6b202e)
 2023-09-19 20:50:49 +08:00
YunaiV
0fd07c0cbc 商城： 
1. 调整优惠劵的目录
2. 简化秒杀时间配置

(cherry picked from commit 9984de0dc7)
 2023-09-19 20:50:06 +08:00
YunaiV
a7610dbab3 code review：优化支付通知的实现 
(cherry picked from commit 1ab7ea0640)
 2023-09-19 20:45:22 +08:00
YunaiV
db1e2beaf0 code review：优化收银台的实现，解决 TODO 
(cherry picked from commit 7625e6757c)
 2023-09-19 20:44:38 +08:00
xiaqing
817548c825 会员积分针对代码格式、功能优化 
1.优化todo建议
2.删除无用代码

(cherry picked from commit de941ec6ba)
 2023-09-19 20:41:09 +08:00
xiaqing
0991528c17 会员签到针对代码格式、功能优化 
1.优化todo建议
 2.删除无用代码

(cherry picked from commit f310f65842)
 2023-09-19 20:40:40 +08:00
dhb52
191d149959 feat: 支付功能迁移（初稿） 
(cherry picked from commit a6eab3cc9a)
 2023-09-19 20:39:21 +08:00
puhui999
541fc97796 feat: 完善砍价活动管理 
(cherry picked from commit 4947716983)
 2023-09-19 20:36:04 +08:00
YunaiV
f9be77efd4 bugfix：分配角色菜单时，调用接口 404 问题 
(cherry picked from commit ef31ec7aaf)
 2023-09-19 20:35:42 +08:00
dhb52
3f479ecffc feat: 支付管理/应用信息(alpha) 
(cherry picked from commit 323417b0d4)
 2023-09-19 20:25:26 +08:00
puhui999
da5ad39251 fix: combinationActivity 调整 
(cherry picked from commit c327f79177)
 2023-09-19 20:24:40 +08:00
YunaiV
4cef3e3e5f 登录时，直接从用户信息中，获取菜单。目的：加快首页的加载速度 
(cherry picked from commit ee802d6335)
 2023-09-19 19:59:19 +08:00
shizhong
74aac991bc 发布 1.8.0 版本 2023-07-27 20:53:52 +08:00
YunaiV
2104de6a71 review 秒杀、拼团活动的 CRUD 
(cherry picked from commit a003b59e39)
 2023-07-27 19:51:42 +08:00
puhui999
84d538ad69 fix: 完善拼团活动 CRUD 
(cherry picked from commit dc39ad0cd1)
 2023-07-27 19:45:36 +08:00
puhui999
85cc7cdb46 fix: mall SeckillConfig 
(cherry picked from commit 3fd9f1b43e)
 2023-07-27 19:43:51 +08:00
puhui999
0394f81dab fix: mall SeckillActivity and CombinationActivity 
(cherry picked from commit 4057130275)
 2023-07-27 19:41:21 +08:00
puhui999
d1cc7d134b fix: mall SeckillActivity 
(cherry picked from commit ce3ca7c6ce)
 2023-07-27 19:41:03 +08:00
puhui999
de53abb249 fix: mall SeckillActivity 
(cherry picked from commit 36c0bce184)
 2023-07-27 19:40:57 +08:00
puhui999
1ab348f8df fix: mall SeckillActivity 
(cherry picked from commit b98149f1a7)
 2023-07-27 19:40:48 +08:00
puhui999
22f869db89 feat: mall CombinationActivity 
(cherry picked from commit 2e96b1c984)
 2023-07-27 19:36:45 +08:00
xiaqing
195ae79bfc 会员中心代码 
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码

(cherry picked from commit 4251dc5d61)
 2023-07-27 19:36:28 +08:00
puhui999
1d0d9d24ad fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件 
(cherry picked from commit 51e79f29cc)
 2023-07-27 19:35:12 +08:00
YunaiV
a22eea8e90 review 营销活动 
(cherry picked from commit 5d613e69b3)
 2023-07-27 19:34:54 +08:00
puhui999
70c2fe409c fix：完善秒杀活动管理① 
(cherry picked from commit b1e7f14963)
 2023-07-27 19:33:06 +08:00
puhui999
7da1b04ae2 feat：添加秒杀活动管理 
(cherry picked from commit 3d47d6744e)
 2023-07-27 19:27:44 +08:00
xiaobai
1b5c983d1d 提交订单页面和详情页面 20230619 
(cherry picked from commit 42a7aec0b5)
 2023-07-27 19:15:56 +08:00
puhui999
0f9629707f feat: 完事秒杀时段管理 
(cherry picked from commit f7b195b226)
 2023-07-27 19:14:57 +08:00
puhui999
a233d16dbb feat: 秒杀时段管理 
(cherry picked from commit a75720ec06)
 2023-07-27 19:14:47 +08:00
YunaiV
8bf1f04044 code review：订单列表 
(cherry picked from commit e3f250fff0)
 2023-07-27 19:11:50 +08:00
xiaqing
98c977a732 初始化积分模块 
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理

(cherry picked from commit 1dca8476b3)
 2023-07-27 19:06:34 +08:00
xiaobai
b9ba1d36c2 20230606 add trade-order and details 
(cherry picked from commit 985d764f62)
 2023-07-27 18:54:36 +08:00
YunaiV
f641785df9 code review：优惠劵管理 
(cherry picked from commit 51e76ffd53)
 2023-07-27 18:53:49 +08:00
shizhong
0d0b2265c6 !164 优惠券迁移vue3 Merge pull request !164 from dhb52/dev 2023-07-27 18:53:17 +08:00
YunaiV
16c518e18a code review：门店自提、快递运费 
(cherry picked from commit 60c1604d49)
 2023-07-27 18:46:14 +08:00
xiaobai
a29421dd41 临时提交 
(cherry picked from commit 505f5cfa0c)
 2023-07-27 18:44:50 +08:00
dhb52
e2faf6a2a4 style: 添加VO 
(cherry picked from commit c5a7d05821)
 2023-07-27 18:42:44 +08:00
puhui999
144be6ef44 fix: 完善 SPU 选择快递模版的功能 
(cherry picked from commit 2ddb605076)
 2023-07-27 13:11:05 +08:00
puhui999
d35ac547ac fix: 完善 SPU 查看详情 
(cherry picked from commit 39c92cb944)
 2023-07-27 13:10:58 +08:00
jason
9e7fe34ae8 新增门店自提管理 
(cherry picked from commit 000aa95012)
 2023-07-27 13:10:46 +08:00
puhui999
cf7f4ff89e fix: 修改 review 提到的问题，完善分类选择层级校验、完整层级展示 
(cherry picked from commit e555977757)
 2023-07-27 13:09:36 +08:00
周建
b07cc98619 接口命名统一 2023-06-21 13:22:47 +08:00
jason
88439669c0 运费模板区域改成多选 
(cherry picked from commit 70c5082776)
 2023-06-13 14:15:44 +08:00
YunaiV
4cd4327bc8 review + mall：商品管理 
(cherry picked from commit 0fba3fd503)
 2023-06-13 14:13:55 +08:00
puhui999
4eacb6dd8c fix: 完善善品导出 
(cherry picked from commit d877bfd26e)
 2023-06-13 14:12:49 +08:00
jason
bbe9e667c4 运费模板性能优化。区域选择使用懒加载 
(cherry picked from commit af2fb4bf5f)
 2023-06-13 14:12:41 +08:00
jason
90ccc11006 mall: 订单中心->运费模板(第一版 性能有问题) 
(cherry picked from commit 4e69f15128)
 2023-06-13 14:10:52 +08:00
puhui999
4410bdd93c fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 
(cherry picked from commit 0c42b76a52)
 2023-06-13 14:07:22 +08:00
jason
4ec3d3fe72 新增快递公司菜单 
(cherry picked from commit b0984c9013)
 2023-06-13 14:06:19 +08:00
puhui999
ea4e2a0bcc fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 
(cherry picked from commit 4ddba9d454)
 2023-06-13 14:06:16 +08:00
puhui999
74d926172c fix: 进一步完善商品列表，修复TODO 
(cherry picked from commit 52bfc4dac0)
 2023-06-13 14:05:48 +08:00
puhui999
478f02fa7c fix: 整合spu，移动相关类型到spu删除对应文件和文件夹 
(cherry picked from commit 50b181318b)
 2023-06-13 14:05:43 +08:00
shizhong
e81f8c51cb 修复后台”在线用户强退“功能 2023-06-13 14:03:52 +08:00
YunaiV
7a5993c584 code review 商品管理的实现 
(cherry picked from commit e92361ed40)
 2023-06-13 13:56:48 +08:00
puhui999
b9fd7b7753 商品管理: 打通所有接口（第一版） 
(cherry picked from commit 0c6e3a39c9)
 2023-06-13 13:56:04 +08:00
puhui999
263ca68ff1 商品管理: 调整相关组件优化逻辑,完成表单保存和数据回显 
(cherry picked from commit 9ee35fc165)
 2023-06-13 13:55:51 +08:00
puhui999
2152573c5e 商品管理: 调整相关组件优化逻辑 
(cherry picked from commit 1116fb278b)
 2023-06-13 13:55:48 +08:00
puhui999
72fd0b8ed5 商品管理: 调整相关组件优化逻辑 
(cherry picked from commit 6478d295df)
 2023-06-13 13:55:44 +08:00
puhui999
4bb39f2578 商品管理: fix:根据商品属性动态生成表格值 
(cherry picked from commit 538d1e0b6c)
 2023-06-13 13:54:58 +08:00
puhui999
1a2d7a2f0e 商品管理: 初步完成相关组件 
(cherry picked from commit 61218ae711)
 2023-06-13 13:54:08 +08:00
puhui999
7a1a4e82d0 商品管理: 完善选择商品分类 
(cherry picked from commit ab1685a741)
 2023-06-13 13:53:11 +08:00
puhui999
083a0c4760 商品管理: 完善表单校验，优化信息提示，完成新建、编辑、提交逻辑 
(cherry picked from commit c38abc365c)
 2023-06-13 13:52:42 +08:00
YunaiV
6e604f9e07 调整商品分类的实现 
(cherry picked from commit 9680a204ca)
 2023-06-13 13:50:37 +08:00
dhb52
a737b267a8 refactor: mp模块统一accountId未初始化值为-1，删除QueryParams定义 
(cherry picked from commit 198752868c)
 2023-06-13 13:44:29 +08:00
shizhong
9b00e33ddb REVIEW 支付应用、支付订单 2023-06-13 12:22:27 +08:00
shizhong
c33a40623c REVIEW OA 请假 2023-06-13 12:11:09 +08:00
shizhong
68981b9153 REVIEW 单点登录界面 2023-06-13 12:02:05 +08:00