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 |
|