root/ludu-admin-vue3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,487 Commits 8 Branches 11 Tags 16 MiB
d6ff66dc1d
Commit Graph

1230 Commits

Author SHA1 Message Date
芋道源码
b0b669129b
!314 会员中心商品收藏 
Merge pull request !314 from niou233/featrue/mall_org
 2023-11-18 16:32:02 +00:00
YunaiV
ebb19cfe8c Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-11-19 00:30:02 +08:00
YunaiV
b1f5ad55b8 crm：code review 权限列表 2023-11-19 00:28:22 +08:00
芋道源码
2e01944df9
!322 crm-团队成员：完善团队成员通用组件封装 
Merge pull request !322 from puhui999/dev-to-dev
 2023-11-18 16:13:06 +00:00
芋道源码
5f0b0bd21d
!324 商城装修 
Merge pull request !324 from 疯狂的世界/dev
 2023-11-18 14:18:12 +00:00
芋道源码
9d7c578d48
!323 update src/views/Profile/components/UserSocial.vue. 
Merge pull request !323 from 口口口/N/A
 2023-11-18 14:17:55 +00:00
YunaiV
526172af60 crm：code review 客户配置管理 2023-11-18 22:11:42 +08:00
芋道源码
c06223decd
!316 feat: CRM 客户公海配置 + CRM 客户限制 + review 修改 
Merge pull request !316 from wanwan/dev
 2023-11-18 13:45:48 +00:00
芋道源码
f07d37438d
!321 修复滑块验证码无任何滑动直接点击验证时，x坐标空，导致后端NPE的问题 
Merge pull request !321 from 柯杨/master
 2023-11-18 13:43:22 +00:00
YunaiV
85e953b920 crm：code review 联系人管理 2023-11-18 21:08:00 +08:00
YunaiV
7c5ae17d04 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 
# Conflicts:
#	src/components/DiyEditor/components/ComponentContainer.vue
 2023-11-18 20:39:31 +08:00
芋道源码
538783ce2d
!317 crm联系人前端 
Merge pull request !317 from zyna/master
 2023-11-18 12:35:34 +00:00
YunaiV
f1e3eccc8a Merge branch 'feature/sub-table' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-18 18:00:41 +08:00
YunaiV
652698b871 代码生成：增加说明文档 2023-11-18 18:00:19 +08:00
芋道源码
26dba8b457
!325 新增主子表、树表的代码生成 
Merge pull request !325 from 芋道源码/feature/sub-table
 2023-11-18 09:57:33 +00:00
YunaiV
a42d0695fe 代码生成：增加主子表 erp 模式的示例 2023-11-17 13:21:17 +08:00
口口口
68f6683e52
update src/views/Profile/components/UserSocial.vue. 
在这里绑定，绑定成功后，列表重复

Signed-off-by: 口口口 <17975121@qq.com>
 2023-11-17 05:17:17 +00:00
owen
b4a1772584 营销：适配商城装修组件【商品卡片】 2023-11-17 10:14:26 +08:00
YunaiV
6c405ba420 代码生成：增加主子表 inner 模式的示例 2023-11-16 23:48:20 +08:00
YunaiV
9aca49c1ff 代码生成：增加主子表 normal 模式的示例 2023-11-16 23:24:03 +08:00
YunaiV
bbc37613b6 代码生成：增加 tree 树形的示例 2023-11-16 20:39:12 +08:00
YunaiV
3d0c4f4422 代码生成：支持树形表结构的配置 2023-11-16 00:11:23 +08:00
YunaiV
40b1522ed0 代码生成：增加 crud 单表示例 2023-11-15 23:48:00 +08:00
Wanwan
22206b25e1 feat: CRM 客户限制 2023-11-15 21:55:44 +08:00
xingyu
821c804189 fix: stylelint 2023-11-14 21:56:54 +08:00
xingyu
249e0d21a3 fix: eslint 2023-11-14 21:56:02 +08:00
puhui999
8e0cf5c1e5 crm-团队成员：新增获得权限级别名称函数 getLevelName 2023-11-14 12:06:42 +08:00
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
YunaiV
45656562a8 代码生成：支持设置主子表的信息 2023-11-14 09:50:54 +08:00
柯杨
8bb9dec328
【bugfix】：修复滑块验证码无任何滑动直接点击验证时，x坐标空，导致后端NPE的问题 
Signed-off-by: 柯杨 <key5230@163.com>
 2023-11-14 01:43:59 +00:00
puhui999
27c9a0f32d crm-团队成员： 先提交一波 2023-11-13 17:49:27 +08:00
puhui999
2385cd9b9a fix：如果已经到重新登录页面则不进行弹窗提示 2023-11-13 15:48:21 +08:00
YunaiV
999d8de9e9 代码生成：增加主子表（内嵌）的示例 2023-11-13 13:57:15 +08:00
YunaiV
f0f7886025 代码生成：增加主子表（普通）的示例 2023-11-12 22:33:38 +08:00
YunaiV
72c5eaae31 代码生成：增加 one 情况下的示例代码 2023-11-12 19:50:38 +08:00
owen
49ebadd748 营销：适配商城装修组件【广告魔方】 2023-11-12 19:29:24 +08:00
Wanwan
702f23e672 feat: CRM 客户限制 2023-11-12 14:34:25 +08:00
zyna
ed26142bb0 crm联系人init 2023-11-11 23:35:18 +08:00
Wanwan
a7f86dfd8b feat: CRM 客户限制 2023-11-11 21:06:11 +08:00
Wanwan
6369b334e3 feat: CRM 客户限制 2023-11-11 20:50:33 +08:00
YunaiV
55f6e4ca25 主子表：确认列表编辑的支持组件情况 2023-11-10 23:01:36 +08:00
Wanwan
b63e2a9efb Merge remote-tracking branch 'origin/dev' into dev 2023-11-10 22:47:34 +08:00
YunaiV
9f9e0f8bda 主子表：同步三种模式的代码 2023-11-10 19:54:55 +08:00
niou233
af5d1cf25e
update src/locales/zh-CN.ts. 
Signed-off-by: niou233 <2922564446@qq.com>
 2023-11-10 11:36:11 +00:00
niou233
1ab5b44254
update src/locales/en.ts. 
Signed-off-by: niou233 <2922564446@qq.com>
 2023-11-10 11:35:54 +00:00
niou233
2ff97758fd
update src/hooks/web/useMessage.ts. 
Signed-off-by: niou233 <2922564446@qq.com>
 2023-11-10 11:34:32 +00:00
YunaiV
86d9a97ccb 主子表：暂时存储，参数校验-表单数据跑通 2023-11-10 08:51:01 +08:00
YunaiV
d45ebd4fcf 主子表：暂时存储，样式跑通 2023-11-10 00:20:00 +08:00
YunaiV
4e413a10e6 主子表：暂时存储，准备重构 2023-11-09 23:10:54 +08:00
YunaiV
e9299c6710 多租户：登录界面，根据 host 域名获取对应的租户编号 2023-11-09 09:20:21 +08:00
YunaiV
a08e9bea7c 多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突 2023-11-09 09:20:21 +08:00
owen
82aed175ab 营销：适配商城装修组件【菜单导航】 2023-11-09 09:18:46 +08:00
Wanwan
59b2d89a18 feat: CRM 客户公海配置 2023-11-09 00:08:09 +08:00
Wanwan
288aa72cdd feat: CRM 客户公海配置 2023-11-09 00:05:10 +08:00
owen
ac42493659 营销：适配商城装修组件【宫格导航】 2023-11-08 22:22:35 +08:00
owen
325e2e4ff2 营销：适配商城装修组件【列表导航】 2023-11-08 21:10:05 +08:00
niou233
084009f7f2 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-08 17:30:04 +08:00
niou233
f2c71d5836 refactor: 会员商品收藏 2023-11-08 17:29:57 +08:00
Wanwan
57474c0644 Merge remote-tracking branch 'origin/dev' into dev 2023-11-07 22:54:50 +08:00
Wanwan
7146fdc9b9 style: 客户 review 修改 2023-11-06 22:00:40 +08:00
YunaiV
eb9f8c9f6f Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-06 21:43:55 +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
4253173a2a 营销：适配商城装修组件【轮播图】 2023-11-06 09:31:42 +08:00
owen
6e9e1d0888 Merge remote-tracking branch 'origin/dev' into dev 2023-11-06 08:33:16 +08:00
owen
bb2b7ffd03 营销：增加商城装修组件【视频播放】 2023-11-05 22:53:30 +08:00
VicoHu
3f803767c4
fix: 修复关闭拼团活动请求URL错误的问题 
Signed-off-by: VicoHu <vicohu@163.com>
 2023-11-05 13:59:28 +00: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
owen
434aa864da 营销：优化装修编辑器 2023-11-05 12:40:32 +08:00
owen
0b0ba1f313 营销：优化装修编辑器样式 2023-11-05 10:08:03 +08:00
owen
984351fbf0 修复页面中心内容区会出现滚动条的问题: 底部版权栏的P标签有默认的margin导致 2023-11-05 09:47:54 +08:00
owen
aedf014407 营销：装修页面适配搜索框 2023-11-04 22:06:40 +08: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
芋道源码
71e6d51c12
!299 update src/layout/components/Message/src/Message.vue. 
Merge pull request !299 from lzy/N/A
 2023-11-04 02:44:57 +00: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
芋道源码
09c44cd4fe
!306 feat: 客户详情 + review 修改 
Merge pull request !306 from wanwan/dev
 2023-11-04 01:50:33 +00: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
芋道源码
f6adb4ebaf
!303 商城装修 
Merge pull request !303 from 疯狂的世界/dev
 2023-11-03 15:07:04 +00: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
owen
3c0f3ceed5 营销：装修模板，底部导航适配APP 2023-11-03 06:47:46 +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
9bd33355e2 营销：装修编辑器样式优化 2023-10-31 17:17:46 +08:00
dongshanshan
18e2c33cef Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-10-31 16:53:48 +08:00
dongshanshan
9a3253ad20 feat: 会员商品收藏 2023-10-31 16:53:44 +08:00
owen
881c4f3a29 营销：完善商城装修 
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断
 2023-10-31 16:01:22 +08:00