Commit Graph

965 Commits

Author SHA1 Message Date
puhui999
ba702d03bc Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-11-14 11:26:41 +08:00
puhui999
015a1640c1 crm-团队成员:完善团队成员通用组件封装 2023-11-14 11:26:07 +08:00
puhui999
27c9a0f32d crm-团队成员: 先提交一波 2023-11-13 17:49:27 +08:00
owen
49ebadd748 营销:适配商城装修组件【广告魔方】 2023-11-12 19:29:24 +08:00
YunaiV
85ee558bef 多租户:登录界面,根据 host 域名获取对应的租户编号 2023-11-06 19:42:28 +08:00
YunaiV
c0d5c76a06 多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突 2023-11-06 19:09:20 +08:00
owen
6e9e1d0888 Merge remote-tracking branch 'origin/dev' into dev 2023-11-06 08:33:16 +08:00
YunaiV
47bb88d892 code review:产品分类 2023-11-05 20:50:13 +08:00
YunaiV
e1cff74f41 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-11-05 20:48:12 +08:00
owen
fa710b560d 营销:增加商城装修组件【图片展示】 2023-11-05 20:42:50 +08:00
芋道源码
596ad888e1
!308 【增加CRM:产品以及产品分类】
Merge pull request !308 from ZanGe丶/master
2023-11-05 12:28:31 +00:00
YunaiV
17742988c9 code review:回款 2023-11-05 20:25:52 +08:00
YunaiV
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
YunaiV
4f2f4f72b5 优化:社交登录、用户的管理 2023-11-04 20:43:36 +08:00
ZanGe丶
ff6f05df84 【crm:产品及产品分类】 2023-11-04 18:28:59 +08:00
YunaiV
a9b91e7436 优化:社交登录、用户的管理 2023-11-04 14:37:23 +08:00
YunaiV
ac7f1e29fb Merge branch 'dev_tmp' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-04 10:50:04 +08:00
YunaiV
f79d31a64a code review:满减送活动 2023-11-04 10:39:39 +08:00
芋道源码
27defa7268
!291 满减页面布局
Merge pull request !291 from Bluemark/mall-backed
2023-11-04 02:30:50 +00:00
YunaiV
a9faeb1bdb code review:客户管理 2023-11-04 10:12:40 +08:00
Wanwan
23f483ac45 feat: 客户详情 + review 修改 2023-11-04 03:21:01 +08:00
liuhongfeng
8ef5227f88 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-04 00:48:51 +08:00
jason
fcc748dc63 Merge remote-tracking branch 'origin/dev' into dev 2023-11-03 08:47:57 +08:00
jason
753f5de81e 转账 - 新增转账订单查询 2023-11-03 08:46:53 +08:00
风狗
bf418653e4
update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue.
地区选择框placeholder 修改

Signed-off-by: 风狗 <909275705@qq.com>
2023-11-02 02:08:26 +00:00
liuhongfeng
3d54ad3a6a 【新增】负责人
【修改】规范命名:期数:indexNo-》period
2023-10-31 23:32:35 +08:00
owen
881c4f3a29 营销:完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器,默认选中组件判断
2023-10-31 16:01:22 +08:00
xingyu
4365ca6177 fix: title name 2023-10-31 14:10:05 +08:00
xingyu
af7c6f3b2c fix: url error 2023-10-31 10:17:00 +08:00
liuhongfeng
2b84de7e09 【新增】负责人
【修改】规范命名:期数:indexNo-》period
2023-10-30 21:32:50 +08:00
jason
c1534bf168 Merge remote-tracking branch 'origin/dev' into dev 2023-10-29 23:48:20 +08:00
jason
55a961e862 转账 - 管理后台新增转账示例 2023-10-29 23:48:10 +08:00
YunaiV
0c81a0d96a code review:客户表的实现 2023-10-29 22:29:03 +08:00
owen
e9ff8d3237 商城装修 2023-10-29 22:03:24 +08:00
YunaiV
dc5cf9f24c code review:客户表的实现 2023-10-29 17:55:39 +08:00
YunaiV
690b208a4e Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-10-29 10:38:48 +08:00
Wanwan
60d53126c4 feat: 调整客户表的字段 2023-10-29 00:33:38 +08:00
Wanwan
59cf0c29f0 feat: 调整客户表的字段 2023-10-29 00:03:11 +08:00
Wanwan
4cdab6fb3e feat: 调整客户表的字段 2023-10-28 19:50:42 +08:00
芋道源码
cca34e0acb
!295 订单:解决列数据中的 table#header 数据不刷新的问题
Merge pull request !295 from puhui999/dev-to-dev
2023-10-27 15:03:42 +00:00
YunaiV
b9ab22dad1 code review:客户表的实现 2023-10-27 23:01:00 +08:00
芋道源码
32b3c874f5
!294 feat: 客户表的 crud
Merge pull request !294 from wanwan/master
2023-10-27 14:41:47 +00:00
puhui999
a624db04e9 三方应用新增授权方的网页应用 agentId 属性 2023-10-26 17:00:13 +08:00
puhui999
88a22d90e5 解决钉钉绑定失败的问题 2023-10-26 16:19:22 +08:00
puhui999
6ee2492ff1 新增社交用户 RUD 2023-10-25 17:02:11 +08:00
puhui999
8935188a82 新增社交客户端 CRUD 2023-10-25 16:07:58 +08:00
puhui999
d060d27ab2 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-25 11:14:26 +08:00
puhui999
ca385bc08e 解决列数据中的 table#header 数据不刷新的问题 2023-10-25 11:14:00 +08:00
xingyu
238537df83 fix: ElLoading need import 2023-10-25 10:36:06 +08:00