YunaiV
|
a77173f2ae
|
🐛 修复 post 和 dept 在 IDEA 报错的问题
|
2023-12-02 10:20:09 +08:00 |
|
owen
|
b982397449
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-02 00:00:50 +08:00 |
|
owen
|
3c8ffc8c21
|
营销：适配商城装修组件【用户卡券】
|
2023-12-01 23:58:57 +08:00 |
|
owen
|
c058048fac
|
营销：适配商城装修组件【用户资产】
|
2023-12-01 23:40:07 +08:00 |
|
owen
|
2c1edfa781
|
营销：适配商城装修组件【用户订单】
|
2023-12-01 23:34:19 +08:00 |
|
owen
|
af67db577d
|
营销：适配商城装修组件【用户卡片】
|
2023-12-01 23:12:44 +08:00 |
|
YunaiV
|
b0c1e55c6a
|
crm: 增加基于客户查询回款计划分页
|
2023-12-01 22:46:20 +08:00 |
|
owen
|
d5f9d31d32
|
营销：适配商城装修组件【拼团】（待重写）
|
2023-12-01 21:00:39 +08:00 |
|
owen
|
7e44b621a5
|
营销：适配商城装修组件【秒杀】（待重写）
|
2023-12-01 20:24:55 +08:00 |
|
YunaiV
|
bdc80ea55b
|
crm: 增加基于客户查询回款分页
|
2023-12-01 19:37:51 +08:00 |
|
owen
|
b4ba1043d6
|
eslint
|
2023-12-01 18:57:46 +08:00 |
|
owen
|
08be359578
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-01 00:39:55 +08:00 |
|
owen
|
23a6bf5ef5
|
营销：商城装修增加控件【APP 链接选择】
|
2023-12-01 00:39:10 +08:00 |
|
YunaiV
|
88e5e67a89
|
crm: 增加基于客户查询商机分页
|
2023-11-30 20:21:45 +08:00 |
|
YunaiV
|
31a42fc3f7
|
crm：增加合同 List 组件
|
2023-11-30 19:12:57 +08:00 |
|
YunaiV
|
5f26c4afe9
|
crm：完善数据权限的界面
|
2023-11-30 13:42:49 +08:00 |
|
YunaiV
|
7de0e93d5a
|
crm：联系人增加 ContactList 组件，提供给其它模块内嵌
|
2023-11-29 21:42:10 +08:00 |
|
YunaiV
|
2cda0cdd9f
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/views/crm/contact/ContactForm.vue
|
2023-11-29 14:01:20 +08:00 |
|
YunaiV
|
8b787176b6
|
crm：code review 客户详情
|
2023-11-29 13:59:53 +08:00 |
|
wanwan
|
443f65b5dc
|
!334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
|
2023-11-29 13:59:52 +08:00 |
|
YunaiV
|
ddfceddf4a
|
crm：code review 联系人详情
|
2023-11-29 13:57:01 +08:00 |
|
YunaiV
|
ae8cb9218c
|
crm：code review 客户详情
|
2023-11-29 13:55:53 +08:00 |
|
wanwan
|
85810c0786
|
!334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
|
2023-11-29 13:55:53 +08:00 |
|
YunaiV
|
c5b2fdecd5
|
crm：code review 商机类型
|
2023-11-29 13:55:53 +08:00 |
|
ljlleo
|
50430bb9cd
|
商机、商机状态类型
|
2023-11-29 13:55:53 +08:00 |
|
YunaiV
|
661dc2ff67
|
crm：code review 成员
|
2023-11-29 13:55:53 +08:00 |
|
dhb52
|
e106fb73b6
|
Merge remote-tracking branch 'yudao/master' into dhb52_master
|
2023-11-28 21:53:20 +08:00 |
|
zyna
|
ed22e02b5b
|
crm联系人review修改
|
2023-11-27 23:44:13 +08:00 |
|
芋道源码
|
57b20f1810
|
!336 同步公众号粉丝接口调用错误
Merge pull request !336 from Evol郑天/N/A
|
2023-11-27 12:35:25 +00:00 |
|
YunaiV
|
1ba450103e
|
crm：code review 联系人详情
|
2023-11-27 20:33:53 +08:00 |
|
YunaiV
|
24773a6eaa
|
crm：code review 客户详情
|
2023-11-27 20:31:23 +08:00 |
|
wanwan
|
e1f9e16a77
|
!334 feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
* feat: 客户配置 review 修改
|
2023-11-27 20:31:23 +08:00 |
|
YunaiV
|
3c19cb1a85
|
crm：code review 商机类型
|
2023-11-27 20:31:23 +08:00 |
|
ljlleo
|
b3515b2db5
|
商机、商机状态类型
|
2023-11-27 20:31:23 +08:00 |
|
YunaiV
|
4e1748caa3
|
crm：code review 成员
|
2023-11-27 20:31:23 +08:00 |
|
Evol郑天
|
633965b07d
|
同步公众号粉丝接口调用错误
Signed-off-by: Evol郑天 <jpevol@163.com>
|
2023-11-27 07:07:32 +00:00 |
|
zyna
|
46a8755c93
|
联系人review修改
|
2023-11-26 21:54:50 +08:00 |
|
芋道源码
|
8aa17b673b
|
!331 菜单右上角加一个搜索图标
Merge pull request !331 from boide/search-icon
|
2023-11-25 10:50:20 +00:00 |
|
liuhongfeng
|
7df7719be3
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2023-11-25 17:45:32 +08:00 |
|
owen
|
d4dc105b4f
|
营销：适配商城装修组件【营销文章】
|
2023-11-25 15:53:07 +08:00 |
|
芋道源码
|
54897b6d1b
|
!332 同步最新的代码到 dev
Merge pull request !332 from 芋道源码/master
|
2023-11-25 02:27:11 +00:00 |
|
芋道源码
|
c6192a1918
|
!329 完善团队成员公共组件,crm-客户：集成团队成员
Merge pull request !329 from puhui999/dev-crm
|
2023-11-25 02:24:45 +00:00 |
|
Marvin
|
b95b8008f7
|
feat: 菜单右上角加一个搜索图标
|
2023-11-25 03:52:59 +08:00 |
|
liuhongfeng
|
764e1715be
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2023-11-24 22:56:39 +08:00 |
|
owen
|
c3cad3f3ee
|
商城：修复会员统计时间范围选择昨天时, 会强制查询两天的问题
|
2023-11-24 20:54:47 +08:00 |
|
YunaiV
|
1744c6ec6f
|
websocket 重新封装
|
2023-11-24 00:33:05 +08:00 |
|
puhui999
|
f8b56a8c46
|
crm-客户：公海数据区分
|
2023-11-23 09:35:59 +08:00 |
|
dhb52
|
c2038b95bf
|
Merge remote-tracking branch 'yudao/master'
|
2023-11-23 08:47:06 +08:00 |
|
liuhongfeng
|
aceac6daae
|
【修改】ureport2 集成
|
2023-11-22 22:09:48 +08:00 |
|
owen
|
253401ace3
|
营销：适配商城装修组件【优惠券】
|
2023-11-22 16:58:00 +08:00 |
|
puhui999
|
12b59200c1
|
crm-客户：集成团队成员
|
2023-11-22 15:45:10 +08:00 |
|
puhui999
|
19a0a83054
|
crm-数据权限：完善团队成员公共组件
|
2023-11-22 15:44:42 +08:00 |
|
YunaiV
|
f74ddf46ae
|
sms：移除 sendCode、sendMsg 字段
|
2023-11-21 22:53:49 +08:00 |
|
owen
|
1bb9df7b3c
|
商品中心：修复商品表格选择对话框，在多选时表头内的多选框不显示选中效果的问题
|
2023-11-21 10:27:29 +08:00 |
|
liuhongfeng
|
4440ec866c
|
【新增】ureport2 集成
|
2023-11-20 23:32:54 +08:00 |
|
owen
|
e0a731dd86
|
商品评论、优惠券模板复用组件【商品橱窗】
|
2023-11-20 10:53:02 +08:00 |
|
owen
|
3198688eb5
|
营销：适配商城装修组件【商品栏】
|
2023-11-19 18:27:25 +08:00 |
|
芋道源码
|
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 |
|
dhb52
|
89dbb8c9e8
|
perf: 优化.env配置
|
2023-11-05 23:14:56 +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 |
|
xingyu
|
10483577b7
|
fix: types
|
2023-10-31 14:26:17 +08:00 |
|
xingyu
|
52755b38a9
|
fix: props
|
2023-10-31 14:25:49 +08:00 |
|
xingyu
|
4365ca6177
|
fix: title name
|
2023-10-31 14:10:05 +08:00 |
|
xingyu
|
ce93c8d4e9
|
fix: name warn
|
2023-10-31 14:04:43 +08:00 |
|
xingyu
|
7321ff2136
|
chore: wh-full
|
2023-10-31 10:20:39 +08:00 |
|
xingyu
|
af7c6f3b2c
|
fix: url error
|
2023-10-31 10:17:00 +08:00 |
|
xingyu
|
80e72fd924
|
feat: coding
|
2023-10-31 10:13:22 +08:00 |
|
xingyu
|
2a029ba35b
|
feat: add useTagsView hooks
|
2023-10-31 10:12:04 +08:00 |
|
xingyu
|
57e8256e9a
|
feat: add useNow hooks
|
2023-10-31 10:11:55 +08:00 |
|
xingyu
|
bdcef303ff
|
perf: useValidator hooks
|
2023-10-31 10:11:43 +08:00 |
|
xingyu
|
f8fdebffe6
|
feat: add useNetwork hooks
|
2023-10-31 10:11:34 +08:00 |
|
xingyu
|
4ba264e00d
|
perf: use driver.js
|
2023-10-31 10:07:21 +08:00 |
|
xingyu
|
f26a4cae10
|
feat: unocss add shortcuts
|
2023-10-31 10:04:31 +08:00 |
|
liuhongfeng
|
2b84de7e09
|
【新增】负责人
【修改】规范命名：期数：indexNo-》period
|
2023-10-30 21:32:50 +08:00 |
|
lzy
|
c269cab6b2
|
update src/layout/components/Message/src/Message.vue.
fix: 处理站内信内容过多回显问题
Signed-off-by: lzy <7783739+lzyyd@user.noreply.gitee.com>
|
2023-10-30 06:20:16 +00: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 |
|
Wanwan
|
044754cdb4
|
feat: 客户表的 crud
|
2023-10-25 00:24:20 +08:00 |
|
YunaiV
|
539352f598
|
修复 banner 返回字段不对
|
2023-10-24 20:29:23 +08:00 |
|
YunaiV
|
6644a4d4a6
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2023-10-24 20:12:39 +08:00 |
|
YunaiV
|
e5d6a9dae1
|
code review：banner 逻辑
|
2023-10-24 20:07:48 +08:00 |
|
puhui999
|
95d7d1eb42
|
优惠卷模版样式调整
|
2023-10-24 17:39:02 +08:00 |
|
puhui999
|
75135e1e4f
|
商品 spu 脱离优惠卷模块
|
2023-10-24 16:57:20 +08:00 |
|
puhui999
|
a7439ee08b
|
完善 banner 管理
|
2023-10-24 16:10:55 +08:00 |
|
KONGDY-PC\Kongdy
|
7c8f7d570f
|
满减页面布局
|
2023-10-23 10:37:39 +08:00 |
|
芋道源码
|
54cce467ab
|
!286 feat: crm 线索表完善 review 提到的问题
Merge pull request !286 from wanwan/master
|
2023-10-21 13:58:13 +00: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 |
|
YunaiV
|
2dbfa77bee
|
code review：banner 逻辑
|
2023-10-21 19:59:41 +08: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 |
|
YunaiV
|
423ea319e0
|
code review：限时折扣
|
2023-10-21 18:18:40 +08: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 |
|
913752709@qq.com
|
fb90a85e43
|
feat: crm 线索表完善 review 提到的问题
|
2023-10-21 00:53:32 +08:00 |
|
liuhongfeng
|
26780c3525
|
【新增】回款计划 功能
|
2023-10-20 23:48:39 +08:00 |
|
liuhongfeng
|
7ad1457f79
|
【新增】回款管理 功能
|
2023-10-20 22:17:05 +08:00 |
|
puhui999
|
0730e215d8
|
完善文章管理 review 提到的问题
|
2023-10-20 22:16:18 +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
|
1e8945de63
|
SPU: 新增完善活动优先级拖拽排序
|
2023-10-20 16:36:50 +08:00 |
|
puhui999
|
01d78429cc
|
SPU: 完善优惠卷选择
|
2023-10-20 15:35:01 +08:00 |
|
puhui999
|
18df708b49
|
SPU: 完善优惠卷选择
|
2023-10-20 11:48:59 +08:00 |
|
YunaiV
|
2457665b55
|
code review：门店自提
|
2023-10-20 09:46:15 +08:00 |
|
芋道源码
|
826199dc22
|
!281 fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx
Merge pull request !281 from 陈晨成/master
|
2023-10-19 16:25:00 +00:00 |
|
1351515658@qq.com
|
3074adb1df
|
fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx
|
2023-10-19 18:43:02 +08:00 |
|
puhui999
|
3464bb9c74
|
SPU: 新增优惠卷选择
|
2023-10-19 17:33:42 +08:00 |
|
puhui999
|
5b3bcecef2
|
OrderTableColumn: 商品信息列样式调整2
|
2023-10-19 15:54:23 +08:00 |
|
puhui999
|
094f8e16db
|
OrderTableColumn: 商品信息列样式调整
|
2023-10-19 11:10:33 +08:00 |
|
puhui999
|
70778fd9e6
|
UserOrderList 重构完善
|
2023-10-19 10:54:10 +08:00 |
|
puhui999
|
5270c83876
|
订单列表：完善表头宽度自适应
|
2023-10-19 10:36:52 +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 |
|
puhui999
|
d1a3fe5d5a
|
营销文章：新增表单属性移除浏览量
|
2023-10-18 11:33:42 +08:00 |
|
owen
|
ff01effd45
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-17 23:26:08 +08:00 |
|
owen
|
431fff28ce
|
统计卡片修改为全局组件
|
2023-10-17 23:25:49 +08:00 |
|
owen
|
61b3bdfd4c
|
交易：核销订单
|
2023-10-17 23:18:07 +08:00 |
|
芋道源码
|
d6b0305d78
|
!277 修复前端支付渠道配置权限
Merge pull request !277 from 小玩家/master
|
2023-10-17 14:55:14 +00:00 |
|
YunaiV
|
8832eafaae
|
code review：crm 合同流程
|
2023-10-17 22:52:24 +08:00 |
|
1163996518@qq.com
|
533b4e5006
|
支付渠道配置--修复权限
|
2023-10-17 21:27:13 +08:00 |
|
1163996518@qq.com
|
d5328918ab
|
支付渠道配置--修复权限
|
2023-10-17 20:58:28 +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
|
c27685285a
|
code review：修复工作流的审批界面报错问题
|
2023-10-17 19:50:09 +08: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
|
c3f06f5fbe
|
钱包 - 钱包余额流水
|
2023-10-16 22:45:32 +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
|
e3a0cfe5e9
|
统计：修复错误
|
2023-10-16 22:18:51 +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 |
|
YunaiV
|
66ec610801
|
code review：文章管理
|
2023-10-16 21:55:11 +08:00 |
|
xingyu
|
8c18ad941e
|
perf: is utils
|
2023-10-16 15:09:47 +08:00 |
|
xingyu
|
5da9b660bd
|
perf: propTypes
|
2023-10-16 15:09:13 +08:00 |
|
xingyu
|
1a1b70a350
|
style: stylelint
|
2023-10-16 15:04:05 +08:00 |
|
owen
|
edfd03903f
|
统计：会员终端统计，处理未知终端情况
|
2023-10-16 14:26:04 +08:00 |
|
owen
|
2bfc9c3b13
|
统计：处理会员性别统计，存在未知的情况
|
2023-10-16 13:25:15 +08:00 |
|
owen
|
661e72bcfd
|
统计：修复错误
|
2023-10-16 13:15:17 +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 |
|
YunaiV
|
e2a08ddbac
|
恢复 SSO 界面的路由
|
2023-10-15 21:58: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
|
89417ac393
|
fix: 删除SSOLogin.vue组建，解决登录界面不停重定向问题
|
2023-10-15 14:58:13 +08:00 |
|
dhb52
|
3587d1ef97
|
fix: 路由缺少name字段，ts不高兴
|
2023-10-15 14:29:16 +08:00 |
|
dhb52
|
4d77d7e136
|
feat: 社交平台登录
|
2023-10-15 14:26:20 +08:00 |
|
puhui999
|
36bb90fbb8
|
营销活动：新增文章分类管理
|
2023-10-15 00:54:28 +08:00 |
|
芋道源码
|
889334bc37
|
!266 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Merge pull request !266 from 风狗/N/A
|
2023-10-14 10:19:37 +00:00 |
|
芋道源码
|
b57b45c96f
|
!255 站内信测试增加 Member 用户类型支持
Merge pull request !255 from 风狗/dev
|
2023-10-14 10:18:54 +00:00 |
|
芋道源码
|
fa71f85221
|
!265 修复，刷新菜单缓存失效问题
Merge pull request !265 from 天痕/N/A
|
2023-10-14 10:15:13 +00:00 |
|
jason
|
f9d0c1aa1c
|
钱包-充值套餐
|
2023-10-14 11:32:54 +08:00 |
|
xingyu
|
e04ca7aac7
|
fix: unocss eslint
|
2023-10-13 10:34:01 +08:00 |
|
芋道源码
|
6ed7b3a69e
|
!270 合并商城最新代码
Merge pull request !270 from 芋道源码/dev
|
2023-10-12 13:53:25 +00:00 |
|
芋道源码
|
532b237712
|
!268 统计：会员统计
Merge pull request !268 from 疯狂的世界/dev
|
2023-10-11 04:34:07 +00:00 |
|
YunaiV
|
855b37c1ab
|
code review：拼团记录列表
|
2023-10-11 11:04:03 +08:00 |
|
puhui999
|
b08e0e5ab2
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
|
2023-10-10 16:55:53 +08: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 |
|
风狗
|
aa5f27bec7
|
修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Signed-off-by: 风狗 <909275705@qq.com>
|
2023-10-08 08:26:07 +00:00 |
|
YunaiV
|
86323f970b
|
code review：拼团记录列表
|
2023-10-08 07:30:14 +08:00 |
|
天痕
|
fff4cfd012
|
修复，刷新菜单缓存失效问题
Signed-off-by: 天痕 <614891294@qq.com>
|
2023-10-07 10:51:56 +00:00 |
|
puhui999
|
5b4983a3e9
|
拼团记录：优化页面布局，添加日期快捷选项
|
2023-10-07 11:10:26 +08:00 |
|
puhui999
|
8c347e5990
|
拼团活动：表单添加虚拟成团控制按钮
|
2023-10-07 10:04:05 +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
|
24fc36e23a
|
promotion：调整拼团活动的界面
|
2023-10-06 21:03:17 +08:00 |
|
puhui999
|
eee3d0fef5
|
拼团记录： 完成 UI 部分
|
2023-10-06 18:40:21 +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 |
|