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

1029 Commits

Author SHA1 Message Date
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
YunaiV
9f9e0f8bda 主子表：同步三种模式的代码 2023-11-10 19:54:55 +08: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
Wanwan
59b2d89a18 feat: CRM 客户公海配置 2023-11-09 00:08:09 +08:00
Wanwan
288aa72cdd feat: CRM 客户公海配置 2023-11-09 00:05:10 +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
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
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
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
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
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
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