puhui999
|
a624db04e9
|
三方应用新增授权方的网页应用 agentId 属性
|
2023-10-26 17:00:13 +08:00 |
|
puhui999
|
6ee2492ff1
|
新增社交用户 RUD
|
2023-10-25 17:02:11 +08:00 |
|
puhui999
|
8935188a82
|
新增社交客户端 CRUD
|
2023-10-25 16:07:58 +08:00 |
|
Wanwan
|
044754cdb4
|
feat: 客户表的 crud
|
2023-10-25 00:24:20 +08:00 |
|
puhui999
|
75135e1e4f
|
商品 spu 脱离优惠卷模块
|
2023-10-24 16:57:20 +08:00 |
|
puhui999
|
a7439ee08b
|
完善 banner 管理
|
2023-10-24 16:10:55 +08:00 |
|
YunaiV
|
6c6c2cb058
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2023-10-21 21:56:41 +08:00 |
|
芋道源码
|
af79d4a653
|
!285 【新增】回款管理 功能
Merge pull request !285 from souvc/master
|
2023-10-21 13:56:12 +00:00 |
|
芋道源码
|
73578ce8b2
|
!290 【工作流】--加签减签review修改接口地址
Merge pull request !290 from Youkehai/feature/addSignAndSubSign
|
2023-10-21 13:06:19 +00:00 |
|
芋道源码
|
4709c18a6e
|
!284 完善 SPU，订单列表：完善表头宽度自适应
Merge pull request !284 from puhui999/dev-to-dev
|
2023-10-21 11:08:44 +00:00 |
|
芋道源码
|
929fa9a208
|
!289 满减页面布局
Merge pull request !289 from 落日晚风/master
|
2023-10-21 11:05:51 +00:00 |
|
kehaiyou
|
5cfb67d047
|
fix: 【工作流】--加签减签review修改接口地址
|
2023-10-21 18:16:39 +08:00 |
|
jason
|
bb5945958b
|
钱包 - 优化
支付应用 - 证书模式增加应用私钥
|
2023-10-21 15:33:31 +08:00 |
|
芋道源码
|
e187c55408
|
!283 mall模块
Merge pull request !283 from zxiaoxiu/discount
|
2023-10-21 06:23:04 +00:00 |
|
puhui999
|
491b3a5018
|
新增 banner 管理
|
2023-10-21 02:40:20 +08:00 |
|
liuhongfeng
|
26780c3525
|
【新增】回款计划 功能
|
2023-10-20 23:48:39 +08:00 |
|
liuhongfeng
|
7ad1457f79
|
【新增】回款管理 功能
|
2023-10-20 22:17:05 +08:00 |
|
zhangshuai
|
9f77514c17
|
限时折扣
|
2023-10-20 20:51:18 +08:00 |
|
puhui999
|
d62bbcdd92
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
# package.json
# src/views/member/user/detail/UserOrderList.vue
|
2023-10-20 16:40:19 +08:00 |
|
puhui999
|
01d78429cc
|
SPU: 完善优惠卷选择
|
2023-10-20 15:35:01 +08:00 |
|
puhui999
|
18df708b49
|
SPU: 完善优惠卷选择
|
2023-10-20 11:48:59 +08:00 |
|
puhui999
|
3464bb9c74
|
SPU: 新增优惠卷选择
|
2023-10-19 17:33:42 +08:00 |
|
913752709@qq.com
|
7af2a3bcc3
|
feat: CRM 线索表 crud
|
2023-10-18 20:02:59 +08:00 |
|
puhui999
|
04d88ce1a6
|
订单列表：自定义列抽离封装为组件
|
2023-10-18 17:20:13 +08:00 |
|
owen
|
ff01effd45
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-17 23:26:08 +08:00 |
|
owen
|
61b3bdfd4c
|
交易：核销订单
|
2023-10-17 23:18:07 +08:00 |
|
芋道源码
|
40ec1b08ae
|
!275 Review代码修改
Merge pull request !275 from 疯狂的世界/dev
|
2023-10-17 12:52:28 +00:00 |
|
芋道源码
|
0089d59d36
|
!274 CRM/合同管理 CRUD初稿
Merge pull request !274 from dhb52/master
|
2023-10-17 12:01:51 +00:00 |
|
YunaiV
|
63fd52828c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-17 19:03:02 +08:00 |
|
YunaiV
|
aa99c53729
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
# src/views/mall/statistics/member/index.vue
|
2023-10-17 19:02:37 +08:00 |
|
芋道源码
|
0242c84196
|
!267 【工作流】加签和减签
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
|
2023-10-17 11:01:18 +00:00 |
|
owen
|
57f6367596
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-17 16:09:55 +08:00 |
|
owen
|
6fc232b758
|
交易：订单核销
|
2023-10-17 16:09:36 +08:00 |
|
dhb52
|
dced551698
|
feat: CRM/合同 crud
|
2023-10-16 23:56:34 +08:00 |
|
jason
|
8626bccc4c
|
钱包 - 钱包余额流水
|
2023-10-16 22:32:10 +08:00 |
|
jason
|
ae2c3f2ad5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-16 22:27:39 +08:00 |
|
owen
|
6204ce6c1b
|
统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
|
2023-10-16 22:09:20 +08:00 |
|
owen
|
cd4b4cd322
|
统计：Review修改
|
2023-10-16 22:03:36 +08:00 |
|
owen
|
8dec8edc6a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-16 13:01:02 +08:00 |
|
owen
|
e1a72779d4
|
统计：Review修改
|
2023-10-16 13:00:13 +08:00 |
|
YunaiV
|
99172ea088
|
code review：文章管理
|
2023-10-16 09:57:46 +08:00 |
|
owen
|
195309dbb6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-16 09:52:35 +08:00 |
|
owen
|
3802fee661
|
商城：增加商城首页
|
2023-10-16 09:51:19 +08:00 |
|
jason
|
90d6f4da9f
|
钱包- 钱包余额查询
|
2023-10-15 17:47:36 +08:00 |
|
puhui999
|
50e43e4028
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-10-15 16:14:32 +08:00 |
|
puhui999
|
befffb3f7d
|
营销活动：新增文章管理。
|
2023-10-15 16:14:09 +08:00 |
|
dhb52
|
4d77d7e136
|
feat: 社交平台登录
|
2023-10-15 14:26:20 +08:00 |
|
puhui999
|
36bb90fbb8
|
营销活动：新增文章分类管理
|
2023-10-15 00:54:28 +08:00 |
|
jason
|
f9d0c1aa1c
|
钱包-充值套餐
|
2023-10-14 11:32:54 +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 |
|
YunaiV
|
0e2ea39591
|
code review：会员详情
|
2023-09-09 10:06:32 +08:00 |
|
YunaiV
|
30f0c1b351
|
Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
Conflicts:
src/utils/dict.ts
|
2023-09-09 09:50:13 +08:00 |
|
YunaiV
|
3c315cf287
|
code review：完善订单详情和售后退款 TODO 提到的问题
|
2023-09-09 01:44:08 +08:00 |
|
芋道源码
|
dbfabcbbb5
|
!238 完善订单详情和售后退款 TODO 提到的问题
Merge pull request !238 from puhui999/dev-to-dev
|
2023-09-08 17:29:05 +00:00 |
|
owen
|
e9d5027e72
|
trade: 优化分销用户佣金字段名称
|
2023-09-08 23:10:04 +08:00 |
|
owen
|
7263315412
|
trade: 优化分销用户绑定用户编号、绑定时间字段名称
|
2023-09-08 22:51:04 +08:00 |
|
owen
|
34ce7f7ec5
|
trade: 分销用户管理
|
2023-09-08 11:05:31 +08:00 |
|
puhui999
|
f44688d61c
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-09-08 01:00:59 +08:00 |
|
puhui999
|
73628d3930
|
完善订单详情和售后退款 TODO 提到的问题
|
2023-09-06 11:23:16 +08:00 |
|
owen
|
1e2120806d
|
trade: 分销业务从 member 模块 转移到 trade模块
|
2023-09-06 00:41:20 +08:00 |
|
owen
|
2ed5d12be8
|
trade: 分销业务从 member 模块 转移到 trade模块
|
2023-09-06 00:33:59 +08:00 |
|
owen
|
35664d1f32
|
trade: 增加交易中心配置表
|
2023-09-05 22:31:35 +08:00 |
|
绮梦
|
fe6cf7ce98
|
新增用户详情下成长值页面。
|
2023-09-04 15:02:41 +08:00 |
|
owen
|
73f8cef3b4
|
member: 佣金记录
|
2023-09-03 23:04:20 +08:00 |
|
owen
|
5a9764c08c
|
member: 分销配置
|
2023-09-03 21:14:44 +08:00 |
|
puhui999
|
46fd154e3a
|
完善订单详情和售后退款日志展示样式重构
|
2023-09-03 01:44:22 +08:00 |
|
owen
|
5f557c7be5
|
promotion: 优惠券模板 productSpuIds 改成 productScopeValues
|
2023-09-02 09:53:36 +08:00 |
|
owen
|
76c4644b4b
|
mall：优惠券发送优化
|
2023-09-01 23:50:26 +08:00 |
|
芋道源码
|
190c6e384c
|
!225 优惠券
Merge pull request !225 from 疯狂的世界/owen_dev
|
2023-09-01 14:55:30 +00:00 |
|
puhui999
|
f0249e94a5
|
订单管理：完善订单详情
|
2023-09-01 12:04:33 +08:00 |
|
YunaiV
|
29b8d06ff2
|
code review：售后详情
|
2023-08-30 21:18:46 +08:00 |
|
owen
|
27219e1833
|
mall：优惠券 商品适用范围，增加商品分类
|
2023-08-30 20:54:20 +08:00 |
|
puhui999
|
ed739aec55
|
订单售后列表：完善售后详情及相关操作
|
2023-08-29 09:48:33 +08:00 |
|
puhui999
|
8a51c9c771
|
订单售后列表：初始化售后详情
|
2023-08-28 17:18:42 +08:00 |
|
puhui999
|
4f81468695
|
订单售后列表：重构列表
|
2023-08-28 14:00:09 +08:00 |
|
owen
|
beef6a0a94
|
mall: 完善后台发送优惠券
|
2023-08-26 22:29:55 +08:00 |
|
YunaiV
|
2d8d323767
|
code review：会员中心
|
2023-08-26 20:57:22 +08:00 |
|
绮梦
|
76e37a3ee7
|
Merge remote-tracking branch 'origin/dev' into dev-gitee
|
2023-08-26 13:58:11 +08:00 |
|
绮梦
|
45a6b3bcc7
|
账户信息组件 增加等级、成长值和积分的显示。
增加一些配套的svg 图标。
增加tab 的懒加载。
|
2023-08-26 13:48:43 +08:00 |
|
芋道源码
|
2605cb7de5
|
!217 完善 TODO 提到的问题，优化订单列表相关页面结构
Merge pull request !217 from puhui999/dev-to-dev
|
2023-08-26 03:21:35 +00:00 |
|
芋道源码
|
343b6bbf18
|
!220 商品：完善商品评论功能
Merge pull request !220 from 疯狂的世界/owen_dev
|
2023-08-26 02:59:07 +00:00 |
|
YunaiV
|
1b6c9b2e29
|
code review：用户详情
|
2023-08-26 01:59:36 +08:00 |
|
YunaiV
|
415309469c
|
Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
Conflicts:
src/views/member/user/index.vue
|
2023-08-26 01:24:30 +08:00 |
|
owen
|
814b4631c9
|
商品：完善后台商品评论功能
|
2023-08-25 21:02:48 +08:00 |
|
绮梦
|
28951fb31d
|
重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。
|
2023-08-25 11:27:47 +08:00 |
|
puhui999
|
6b487c7e68
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-08-24 14:39:09 +08:00 |
|
puhui999
|
7db6c121bb
|
完善 code review 提到的问题
|
2023-08-23 15:04:46 +08:00 |
|
owen
|
2e68a5239d
|
Merge remote-tracking branch 'origin/dev' into member_dev
# Conflicts:
# src/views/member/user/UserForm.vue
|
2023-08-23 10:22:03 +08:00 |
|
owen
|
e9120f06cf
|
会员: 会员等级取消分页功能
|
2023-08-23 10:12:20 +08:00 |
|
YunaiV
|
55772cbba0
|
code review：用户详情
|
2023-08-23 01:41:25 +08:00 |
|
YunaiV
|
746bf864d9
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
src/views/mall/promotion/combination/record/index.vue
|
2023-08-23 00:49:48 +08:00 |
|
YunaiV
|
cfbc2ed74c
|
code review：订单列表、订单详情
|
2023-08-23 00:43:40 +08:00 |
|
芋道源码
|
69a66b2a06
|
!210 订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
Merge pull request !210 from puhui999/dev-to-dev
|
2023-08-22 14:13:12 +00:00 |
|
YunaiV
|
bb0c1cb536
|
code review：会员等级
|
2023-08-22 21:59:17 +08:00 |
|
puhui999
|
5dceda614a
|
订单列表：列表重构 添加门店、物流检索条件
|
2023-08-22 18:47:31 +08:00 |
|
puhui999
|
be143ea21b
|
订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
|
2023-08-22 17:36:47 +08:00 |
|
绮梦
|
10d9f11fba
|
增加用户详情页以及 签到、积分等用户详情下的子tab页。
增加 用户、签到、积分 接口的VO,方便在组件中使用。
|
2023-08-22 16:14:25 +08:00 |
|
芋道源码
|
40711c0eb8
|
!209 会员：增加用户等级功能
Merge pull request !209 from 疯狂的世界/member_dev
|
2023-08-22 04:59:46 +00:00 |
|
owen
|
51738f8f6e
|
会员: 修改会员等级，使用单独的表单、接口
|
2023-08-22 11:23:08 +08:00 |
|
puhui999
|
71f9337d82
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-08-22 00:39:11 +08:00 |
|
puhui999
|
0d202a7a85
|
订单列表：列表重构 ③ 添加备注表单和发货表单
|
2023-08-22 00:38:44 +08:00 |
|
owen
|
78917cd2be
|
会员：增加用户分组
|
2023-08-21 23:59:49 +08:00 |
|
puhui999
|
345c09ee6c
|
订单列表：列表重构 ② and 完善订单详情
|
2023-08-21 22:39:21 +08:00 |
|
owen
|
884bb055b0
|
会员：用户标签增加下拉框使用的 精简信息列表查询接口
|
2023-08-21 21:44:04 +08:00 |
|
owen
|
7bef240926
|
会员：后台调整会员等级
|
2023-08-21 21:31:15 +08:00 |
|
YunaiV
|
be485cc4ab
|
code review：签到记录
|
2023-08-20 19:34:39 +08:00 |
|
YunaiV
|
82628ce780
|
code review：签到配置
|
2023-08-20 19:26:50 +08:00 |
|