Commit Graph

676 Commits

Author SHA1 Message Date
e1cff74f41 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-11-05 20:48:12 +08:00
596ad888e1 !308 【增加CRM:产品以及产品分类】
Merge pull request !308 from ZanGe丶/master
2023-11-05 12:28:31 +00:00
65d85e30ca Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-11-05 20:23:56 +08:00
f0c45103e1 !309 完善回款管理和回款计划功能
Merge pull request !309 from souvc/master
2023-11-05 12:20:46 +00:00
ff6f05df84 【crm:产品及产品分类】 2023-11-04 18:28:59 +08:00
a9b91e7436 优化:社交登录、用户的管理 2023-11-04 14:37:23 +08:00
ac7f1e29fb Merge branch 'dev_tmp' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-04 10:50:04 +08:00
23f483ac45 feat: 客户详情 + review 修改 2023-11-04 03:21:01 +08:00
fcc748dc63 Merge remote-tracking branch 'origin/dev' into dev 2023-11-03 08:47:57 +08:00
753f5de81e 转账 - 新增转账订单查询 2023-11-03 08:46:53 +08:00
9a3253ad20 feat: 会员商品收藏 2023-10-31 16:53:44 +08:00
881c4f3a29 营销:完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器,默认选中组件判断
2023-10-31 16:01:22 +08:00
2b84de7e09 【新增】负责人
【修改】规范命名:期数:indexNo-》period
2023-10-30 21:32:50 +08:00
c1534bf168 Merge remote-tracking branch 'origin/dev' into dev 2023-10-29 23:48:20 +08:00
55a961e862 转账 - 管理后台新增转账示例 2023-10-29 23:48:10 +08:00
e9ff8d3237 商城装修 2023-10-29 22:03:24 +08:00
59cf0c29f0 feat: 调整客户表的字段 2023-10-29 00:03:11 +08:00
4cdab6fb3e feat: 调整客户表的字段 2023-10-28 19:50:42 +08:00
a624db04e9 三方应用新增授权方的网页应用 agentId 属性 2023-10-26 17:00:13 +08:00
6ee2492ff1 新增社交用户 RUD 2023-10-25 17:02:11 +08:00
8935188a82 新增社交客户端 CRUD 2023-10-25 16:07:58 +08:00
044754cdb4 feat: 客户表的 crud 2023-10-25 00:24:20 +08:00
75135e1e4f 商品 spu 脱离优惠卷模块 2023-10-24 16:57:20 +08:00
a7439ee08b 完善 banner 管理 2023-10-24 16:10:55 +08:00
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
5cfb67d047 fix: 【工作流】--加签减签review修改接口地址 2023-10-21 18:16:39 +08:00
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
491b3a5018 新增 banner 管理 2023-10-21 02:40:20 +08:00
26780c3525 【新增】回款计划 功能 2023-10-20 23:48:39 +08:00
7ad1457f79 【新增】回款管理 功能 2023-10-20 22:17:05 +08:00
9f77514c17 限时折扣 2023-10-20 20:51:18 +08:00
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
01d78429cc SPU: 完善优惠卷选择 2023-10-20 15:35:01 +08:00
18df708b49 SPU: 完善优惠卷选择 2023-10-20 11:48:59 +08:00
3464bb9c74 SPU: 新增优惠卷选择 2023-10-19 17:33:42 +08:00
7af2a3bcc3 feat: CRM 线索表 crud 2023-10-18 20:02:59 +08:00
04d88ce1a6 订单列表:自定义列抽离封装为组件 2023-10-18 17:20:13 +08:00
ff01effd45 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 23:26:08 +08:00
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
63fd52828c Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 19:03:02 +08:00
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
57f6367596 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 16:09:55 +08:00