Commit Graph

315 Commits (7ad1457f799cf7af8252316dc6cda36165062a53)

Author SHA1 Message Date
liuhongfeng 7ad1457f79 【新增】回款管理 功能 2023-10-20 22:17:05 +08:00
913752709@qq.com 7af2a3bcc3 feat: CRM 线索表 crud 2023-10-18 20:02:59 +08:00
芋道源码 0089d59d36
!274 CRM/合同管理 CRUD初稿
Merge pull request !274 from dhb52/master
2023-10-17 12:01:51 +00:00
芋道源码 0242c84196
!267 【工作流】加签和减签
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
2023-10-17 11:01:18 +00:00
dhb52 dced551698 feat: CRM/合同 crud 2023-10-16 23:56:34 +08:00
dhb52 4d77d7e136 feat: 社交平台登录 2023-10-15 14:26:20 +08:00
芋道源码 532b237712
!268 统计:会员统计
Merge pull request !268 from 疯狂的世界/dev
2023-10-11 04:34:07 +00:00
puhui999 3500a20630 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 2023-10-10 16:53:22 +08:00
youkehai 62a953815d fix: 减签按钮显示和api地址修改 2023-10-10 10:40:30 +08:00
owen 6b7040404e 统计:会员统计 2023-10-09 23:27:32 +08:00
owen d4a521eff1 统计:交易统计Review修改 2023-10-09 23:27:32 +08:00
kehaiyou 683e319c72 fix: 【工作流】--加签减签 2023-10-08 22:35:50 +08:00
YunaiV 86323f970b code review:拼团记录列表 2023-10-08 07:30:14 +08:00
puhui999 e86dfa30fd Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-06 22:21:10 +08:00
puhui999 c445173855 拼团记录:接口对接 2023-10-06 22:20:40 +08:00
YunaiV 78062dd474 promotion:调整拼团活动的界面 2023-10-06 10:58:31 +08:00
puhui999 869bac2501 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-05 21:50:33 +08:00
YunaiV cf7ac2cb10 promotion:新增记录记录列表 2023-10-05 12:42:00 +08:00
YunaiV 860872a890 promotion:新增砍价记录列表 2023-10-05 12:06:57 +08:00
owen 58b6b1ba57 交易:核销 2023-10-04 10:51:35 +08:00
YunaiV 7c491ff62a promotion:优化秒杀活动的界面 2023-10-03 18:41:57 +08:00
YunaiV a9bbbc7b0a trade:优化运费模版的实现 2023-10-02 18:30:22 +08:00
YunaiV 4fddbccea1 trade:完善订单详情 2023-10-02 10:34:37 +08:00
YunaiV 588ce1c9ae trade:微调 order 列表界面 2023-10-01 23:44:38 +08:00
owen 3a96812d47 会员:会员配置的积分相关字段加上point前缀 2023-10-01 10:41:20 +08:00
owen 3ab1ed707f 会员:积分配置改为会员配置 2023-10-01 10:25:18 +08:00
owen 0066d79876 签到:签到后增加用户积分、经验 2023-10-01 09:53:52 +08:00
owen 4b7e57e67d 会员详情,修改会员积分 2023-09-30 15:50:12 +08:00
owen 675f3df5cb 会员详情,查询钱包信息 2023-09-30 12:40:21 +08:00
owen 6475f81534 Merge remote-tracking branch 'origin/dev' into dev 2023-09-29 21:08:48 +08:00
owen c322fb3d0d 统计:交易统计 2023-09-29 21:08:14 +08:00
kehaiyou b1469669e2 Merge branch 'feature/bpm-delegate'
# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue
2023-09-29 12:37:32 +08:00
YunaiV 2f82eff526 Merge remote-tracking branch 'origin/dev' into dev 2023-09-27 23:30:48 +08:00
youkehai 2aeba127b6 Merge remote-tracking branch 'upstream/master' into feature/bpm-delegate
# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue
2023-09-25 09:37:22 +08:00
owen a5dd7f4a81 分销:修正分享海报 2023-09-24 23:18:50 +08:00
YunaiV 245147223f code review:驳回逻辑 2023-09-24 23:05:33 +08:00
芋道源码 ada93a160b
!251 【工作流】回退fix
Merge pull request !251 from Youkehai/master
2023-09-24 14:45:54 +00:00
owen 2c22ef8ef1 分销:重命名提现类型字段 2023-09-24 22:32:10 +08:00
kehaiyou f40d1de62a fix: 【工作流】--回退的高亮和api地址更换 2023-09-24 19:42:53 +08:00
kehaiyou 20fe343646 feat: 【工作流】--委派 2023-09-24 15:44:02 +08:00
芋道源码 0ffd07447b
!248 【工作流】流程实例的任务节点回退
Merge pull request !248 from Youkehai/master
2023-09-24 07:18:26 +00:00
kehaiyou de79e79d91 feat: 支持回退按钮 2023-09-23 14:52:40 +08:00
puhui999 dd5a1f2d43 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-09-20 16:39:19 +08:00
owen 854acf6e70 trade: 分销业务 - 佣金提现后台管理 2023-09-19 22:03:28 +08:00
puhui999 8778f5746f spu:分佣属性和分佣保持一致 2023-09-13 10:17:14 +08:00
芋道源码 de615c2387
!241 完善分销功能
Merge pull request !241 from 疯狂的世界/brokerage
2023-09-12 15:19:33 +00:00
puhui999 5dc0c6e3da spu:分佣属性和分佣保持一致 2023-09-09 23:14:02 +08:00
puhui999 7e511d1e4f mall-order:修复 todo 提到的问题 2023-09-09 20:51:33 +08:00
owen 5ed909263a trade: 分销业务后台功能:修改上级推广人 2023-09-09 19:20:12 +08:00
owen 7ea3571356 trade: 分销业务后台功能:清除推广员、修改推广资格 2023-09-09 14:40:06 +08:00