YunaiV
|
7f50592069
|
crm：code review 权限列表
(cherry picked from commit b1f5ad55b8)
|
2024-03-06 20:49:39 +08:00 |
|
YunaiV
|
b1892674f6
|
crm：code review 客户配置管理
(cherry picked from commit 526172af60)
|
2024-03-06 20:49:30 +08:00 |
|
YunaiV
|
c631fa7915
|
crm：code review 联系人管理
(cherry picked from commit 85e953b920)
|
2024-03-06 20:49:20 +08:00 |
|
YunaiV
|
1a6a68be5a
|
代码生成：增加说明文档
(cherry picked from commit 652698b871)
|
2024-03-06 20:45:38 +08:00 |
|
YunaiV
|
646f73b923
|
代码生成：增加主子表 erp 模式的示例
(cherry picked from commit a42d0695fe)
|
2024-03-06 20:44:51 +08:00 |
|
口口口
|
ebfc1b1375
|
update src/views/Profile/components/UserSocial.vue.
在这里绑定，绑定成功后，列表重复
Signed-off-by: 口口口 <17975121@qq.com>
(cherry picked from commit 68f6683e52)
|
2024-03-06 20:44:48 +08:00 |
|
owen
|
d492186d3e
|
营销：适配商城装修组件【商品卡片】
(cherry picked from commit b4a1772584)
|
2024-03-06 20:44:34 +08:00 |
|
YunaiV
|
262ef0f651
|
代码生成：增加主子表 inner 模式的示例
(cherry picked from commit 6c405ba420)
|
2024-03-06 20:44:23 +08:00 |
|
YunaiV
|
8d2d1a26b5
|
代码生成：增加主子表 normal 模式的示例
(cherry picked from commit 9aca49c1ff)
|
2024-03-06 20:43:58 +08:00 |
|
YunaiV
|
59e98a6679
|
代码生成：增加 tree 树形的示例
(cherry picked from commit bbc37613b6)
|
2024-03-06 20:43:52 +08:00 |
|
YunaiV
|
eeaa608995
|
代码生成：支持树形表结构的配置
(cherry picked from commit 3d0c4f4422)
|
2024-03-06 20:43:44 +08:00 |
|
YunaiV
|
4cf6b9000a
|
代码生成：增加 crud 单表示例
(cherry picked from commit 40b1522ed0)
|
2024-03-06 20:43:40 +08:00 |
|
Wanwan
|
13d1b3a084
|
feat: CRM 客户限制
(cherry picked from commit 22206b25e1)
|
2024-03-06 20:43:21 +08:00 |
|
xingyu
|
9d52790910
|
fix: stylelint
(cherry picked from commit 821c804189)
|
2024-03-06 20:41:49 +08:00 |
|
xingyu
|
18251290f9
|
fix: eslint
(cherry picked from commit 249e0d21a3)
|
2024-03-06 20:41:08 +08:00 |
|
puhui999
|
76c05964fa
|
crm-团队成员：新增获得权限级别名称函数 getLevelName
(cherry picked from commit 8e0cf5c1e5)
|
2024-03-06 20:36:44 +08:00 |
|
puhui999
|
8e08665344
|
crm-团队成员：完善团队成员通用组件封装
(cherry picked from commit 015a1640c1)
|
2024-03-06 20:36:29 +08:00 |
|
YunaiV
|
3524e3525b
|
代码生成：支持设置主子表的信息
(cherry picked from commit 45656562a8)
|
2024-03-06 20:36:07 +08:00 |
|
柯杨
|
9449829fd3
|
【bugfix】：修复滑块验证码无任何滑动直接点击验证时，x坐标空，导致后端NPE的问题
Signed-off-by: 柯杨 <key5230@163.com>
(cherry picked from commit 8bb9dec328)
|
2024-03-06 20:33:44 +08:00 |
|
puhui999
|
fa1d2f25e7
|
crm-团队成员： 先提交一波
(cherry picked from commit 27c9a0f32d)
|
2024-03-06 20:33:39 +08:00 |
|
puhui999
|
c58275cd41
|
fix：如果已经到重新登录页面则不进行弹窗提示
(cherry picked from commit 2385cd9b9a)
|
2024-03-06 20:33:26 +08:00 |
|
YunaiV
|
8823f11109
|
代码生成：增加主子表（内嵌）的示例
(cherry picked from commit 999d8de9e9)
|
2024-03-06 20:33:21 +08:00 |
|
YunaiV
|
05592577ff
|
代码生成：增加主子表（普通）的示例
(cherry picked from commit f0f7886025)
|
2024-03-06 20:33:18 +08:00 |
|
YunaiV
|
26e6d287f5
|
代码生成：增加 one 情况下的示例代码
(cherry picked from commit 72c5eaae31)
|
2024-03-06 20:33:14 +08:00 |
|
owen
|
d176271313
|
营销：适配商城装修组件【广告魔方】
(cherry picked from commit 49ebadd748)
|
2024-03-06 20:33:03 +08:00 |
|
Wanwan
|
291c34f45a
|
feat: CRM 客户限制
(cherry picked from commit 702f23e672)
|
2024-03-06 20:32:59 +08:00 |
|
zyna
|
1f22d9ad0b
|
crm联系人init
(cherry picked from commit ed26142bb0)
|
2024-03-06 20:32:54 +08:00 |
|
Wanwan
|
5a3fcb3b88
|
feat: CRM 客户限制
(cherry picked from commit a7f86dfd8b)
|
2024-03-06 20:32:47 +08:00 |
|
Wanwan
|
f356bf8076
|
feat: CRM 客户限制
(cherry picked from commit 6369b334e3)
|
2024-03-06 20:32:43 +08:00 |
|
YunaiV
|
e7886a1224
|
主子表：确认列表编辑的支持组件情况
(cherry picked from commit 55f6e4ca25)
|
2024-03-06 20:32:39 +08:00 |
|
YunaiV
|
7613a3b454
|
主子表：同步三种模式的代码
(cherry picked from commit 9f9e0f8bda)
|
2024-03-06 20:32:30 +08:00 |
|
niou233
|
95f6dd4bbf
|
update src/locales/zh-CN.ts.
Signed-off-by: niou233 <2922564446@qq.com>
(cherry picked from commit af5d1cf25e)
|
2024-03-06 20:32:26 +08:00 |
|
niou233
|
06d62672e9
|
update src/locales/en.ts.
Signed-off-by: niou233 <2922564446@qq.com>
(cherry picked from commit 1ab5b44254)
|
2024-03-06 20:32:22 +08:00 |
|
niou233
|
c0b6729620
|
update src/hooks/web/useMessage.ts.
Signed-off-by: niou233 <2922564446@qq.com>
(cherry picked from commit 2ff97758fd)
|
2024-03-06 20:32:19 +08:00 |
|
YunaiV
|
c1d82098f9
|
主子表：暂时存储，参数校验-表单数据跑通
(cherry picked from commit 86d9a97ccb)
|
2024-03-06 20:32:11 +08:00 |
|
YunaiV
|
980d546b06
|
主子表：暂时存储，样式跑通
(cherry picked from commit d45ebd4fcf)
|
2024-03-06 20:32:07 +08:00 |
|
YunaiV
|
c8a3c5a3ad
|
主子表：暂时存储，准备重构
(cherry picked from commit 4e413a10e6)
|
2024-03-06 20:31:57 +08:00 |
|
owen
|
e8ec61a280
|
营销：适配商城装修组件【菜单导航】
(cherry picked from commit 82aed175ab)
|
2024-03-06 20:30:40 +08:00 |
|
Wanwan
|
2ed3c2a51c
|
feat: CRM 客户公海配置
(cherry picked from commit 59b2d89a18)
|
2024-03-06 20:30:33 +08:00 |
|
Wanwan
|
c3dc0836c2
|
feat: CRM 客户公海配置
(cherry picked from commit 288aa72cdd)
|
2024-03-06 20:30:20 +08:00 |
|
owen
|
2d838325c9
|
营销：适配商城装修组件【宫格导航】
(cherry picked from commit ac42493659)
|
2024-03-06 20:30:15 +08:00 |
|
owen
|
9bf49b4d38
|
营销：适配商城装修组件【列表导航】
(cherry picked from commit 325e2e4ff2)
|
2024-03-06 20:30:10 +08:00 |
|
niou233
|
4d02972b86
|
refactor: 会员商品收藏
(cherry picked from commit f2c71d5836)
|
2024-03-06 20:30:03 +08:00 |
|
Wanwan
|
cc577dfc6f
|
style: 客户 review 修改
(cherry picked from commit 7146fdc9b9)
|
2024-03-06 20:29:35 +08:00 |
|
shizhong
|
800c6c83d9
|
BUG
|
2024-03-05 20:40:16 +08:00 |
|
YunaiV
|
adba0142f1
|
多租户：登录界面，根据 host 域名获取对应的租户编号
(cherry picked from commit 85ee558bef)
|
2024-03-05 17:57:53 +08:00 |
|
shizhong
|
e2047eb6e9
|
多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突
|
2024-03-05 17:54:50 +08:00 |
|
owen
|
8f70c7f299
|
营销：适配商城装修组件【轮播图】
(cherry picked from commit 4253173a2a)
|
2024-03-05 17:52:32 +08:00 |
|
dhb52
|
fa174ba54e
|
perf: 优化.env配置
(cherry picked from commit 89dbb8c9e8)
|
2024-03-05 17:52:24 +08:00 |
|
owen
|
8c2b96afc9
|
营销：增加商城装修组件【视频播放】
(cherry picked from commit bb2b7ffd03)
|
2024-03-05 17:52:08 +08:00 |
|
VicoHu
|
79cf4d31e8
|
fix: 修复关闭拼团活动请求URL错误的问题
Signed-off-by: VicoHu <vicohu@163.com>
(cherry picked from commit 3f803767c4)
|
2024-03-05 17:51:58 +08:00 |
|
YunaiV
|
e354a6f22e
|
code review：产品分类
(cherry picked from commit 47bb88d892)
|
2024-03-05 17:51:53 +08:00 |
|
owen
|
11a28eb196
|
营销：增加商城装修组件【图片展示】
(cherry picked from commit fa710b560d)
|
2024-03-05 17:51:08 +08:00 |
|
YunaiV
|
e3ef2c7e4c
|
code review：回款
(cherry picked from commit 17742988c9)
|
2024-03-05 17:50:42 +08:00 |
|
owen
|
ce5314ab41
|
营销：优化装修编辑器
(cherry picked from commit 434aa864da)
|
2024-03-05 17:50:00 +08:00 |
|
owen
|
cf9691f993
|
营销：优化装修编辑器样式
(cherry picked from commit 0b0ba1f313)
|
2024-03-05 17:49:53 +08:00 |
|
owen
|
f526675293
|
修复页面中心内容区会出现滚动条的问题: 底部版权栏的P标签有默认的margin导致
(cherry picked from commit 984351fbf0)
|
2024-03-05 17:49:36 +08:00 |
|
owen
|
8cb041b57a
|
营销：装修页面适配搜索框
(cherry picked from commit aedf014407)
|
2024-03-05 17:49:29 +08:00 |
|
YunaiV
|
b2e9e9273d
|
优化：社交登录、用户的管理
(cherry picked from commit 4f2f4f72b5)
|
2024-03-05 17:49:22 +08:00 |
|
ZanGe丶
|
618cf7459a
|
【crm:产品及产品分类】
(cherry picked from commit ff6f05df84)
|
2024-03-05 17:49:15 +08:00 |
|
shizhong
|
18e7aea217
|
优化：社交登录、用户的管理
|
2024-03-05 17:47:17 +08:00 |
|
YunaiV
|
98fc2fe327
|
优化：社交登录、用户的管理
(cherry picked from commit a9b91e7436)
|
2024-03-05 17:44:12 +08:00 |
|
YunaiV
|
f575ddacea
|
code review：满减送活动
(cherry picked from commit f79d31a64a)
|
2024-03-05 17:43:11 +08:00 |
|
YunaiV
|
85df91ddab
|
code review：客户管理
(cherry picked from commit a9faeb1bdb)
|
2024-03-05 17:42:57 +08:00 |
|
Wanwan
|
f780cf0c7b
|
feat: 客户详情 + review 修改
(cherry picked from commit 23f483ac45)
|
2024-03-05 17:42:31 +08:00 |
|
jason
|
6949c196d0
|
转账 - 新增转账订单查询
(cherry picked from commit 753f5de81e)
|
2024-03-05 17:41:57 +08:00 |
|
owen
|
2c485504e7
|
营销：装修模板，底部导航适配APP
(cherry picked from commit 3c0f3ceed5)
|
2024-03-05 17:41:50 +08:00 |
|
风狗
|
d47a60b18d
|
update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue.
地区选择框placeholder 修改
Signed-off-by: 风狗 <909275705@qq.com>
(cherry picked from commit bf418653e4)
|
2024-03-05 17:41:43 +08:00 |
|
liuhongfeng
|
044ad7740e
|
【新增】负责人
【修改】规范命名：期数：indexNo-》period
(cherry picked from commit 3d54ad3a6a)
|
2024-03-05 17:41:35 +08:00 |
|
owen
|
0d5e6c4098
|
营销：装修编辑器样式优化
(cherry picked from commit 9bd33355e2)
|
2024-03-05 17:41:26 +08:00 |
|
dongshanshan
|
525e511670
|
feat: 会员商品收藏
(cherry picked from commit 9a3253ad20)
|
2024-03-05 17:41:11 +08:00 |
|
owen
|
97a94cd29f
|
营销：完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断
(cherry picked from commit 881c4f3a29)
|
2024-03-05 17:41:01 +08:00 |
|
xingyu
|
d172595f14
|
fix: types
(cherry picked from commit 10483577b7)
|
2024-03-05 17:40:50 +08:00 |
|
xingyu
|
de9e45ba43
|
fix: props
(cherry picked from commit 52755b38a9)
|
2024-03-05 17:40:33 +08:00 |
|
shizhong
|
b0e4735936
|
fix: title name
|
2024-03-05 17:40:03 +08:00 |
|
xingyu
|
28485eaf61
|
fix: name warn
(cherry picked from commit ce93c8d4e9)
|
2024-03-05 17:35:30 +08:00 |
|
xingyu
|
1d518c2826
|
chore: wh-full
(cherry picked from commit 7321ff2136)
|
2024-03-05 17:35:17 +08:00 |
|
xingyu
|
709f3cfbd6
|
feat: coding
(cherry picked from commit 80e72fd924)
|
2024-03-05 17:34:25 +08:00 |
|
xingyu
|
5eea8d1681
|
feat: add useTagsView hooks
(cherry picked from commit 2a029ba35b)
|
2024-03-05 17:34:14 +08:00 |
|
xingyu
|
ea3249c421
|
feat: add useNow hooks
(cherry picked from commit 57e8256e9a)
|
2024-03-05 17:34:10 +08:00 |
|
xingyu
|
3a402d51dc
|
perf: useValidator hooks
(cherry picked from commit bdcef303ff)
|
2024-03-05 17:34:04 +08:00 |
|
xingyu
|
56e3a69188
|
feat: add useNetwork hooks
(cherry picked from commit f8fdebffe6)
|
2024-03-05 17:34:00 +08:00 |
|
xingyu
|
2d0d8eadd8
|
perf: use driver.js
(cherry picked from commit 4ba264e00d)
|
2024-03-05 17:33:51 +08:00 |
|
xingyu
|
8b8d7451e0
|
feat: unocss add shortcuts
(cherry picked from commit f26a4cae10)
|
2024-03-05 17:33:45 +08:00 |
|
liuhongfeng
|
bccd02a53f
|
【新增】负责人
【修改】规范命名：期数：indexNo-》period
(cherry picked from commit 2b84de7e09)
|
2024-03-05 17:33:13 +08:00 |
|
lzy
|
fae715c01f
|
update src/layout/components/Message/src/Message.vue.
fix: 处理站内信内容过多回显问题
Signed-off-by: lzy <7783739+lzyyd@user.noreply.gitee.com>
(cherry picked from commit c269cab6b2)
|
2024-03-05 17:33:00 +08:00 |
|
jason
|
18cd9dde6e
|
转账 - 管理后台新增转账示例
(cherry picked from commit 55a961e862)
|
2024-03-05 17:32:29 +08:00 |
|
YunaiV
|
ef7156cc97
|
code review：客户表的实现
(cherry picked from commit 0c81a0d96a)
|
2024-03-05 17:31:37 +08:00 |
|
owen
|
d12dcde81d
|
商城装修
(cherry picked from commit e9ff8d3237)
|
2024-03-05 17:31:22 +08:00 |
|
YunaiV
|
ce97304056
|
code review：客户表的实现
(cherry picked from commit dc5cf9f24c)
|
2024-03-05 17:31:18 +08:00 |
|
Wanwan
|
40e64ecaf3
|
feat: 调整客户表的字段
(cherry picked from commit 60d53126c4)
|
2024-03-05 17:30:15 +08:00 |
|
Wanwan
|
7923078e17
|
feat: 调整客户表的字段
(cherry picked from commit 59cf0c29f0)
|
2024-03-05 17:30:11 +08:00 |
|
Wanwan
|
ed9ae42ba8
|
feat: 调整客户表的字段
(cherry picked from commit 4cdab6fb3e)
|
2024-03-05 17:30:07 +08:00 |
|
YunaiV
|
3d5fcaf50b
|
code review：客户表的实现
(cherry picked from commit b9ab22dad1)
|
2024-03-05 17:29:53 +08:00 |
|
puhui999
|
0cddb9c370
|
三方应用新增授权方的网页应用 agentId 属性
(cherry picked from commit a624db04e9)
|
2024-03-05 17:29:45 +08:00 |
|
puhui999
|
68b2571c0c
|
解决钉钉绑定失败的问题
(cherry picked from commit 88a22d90e5)
|
2024-03-05 17:29:36 +08:00 |
|
puhui999
|
ca7c311f88
|
新增社交用户 RUD
(cherry picked from commit 6ee2492ff1)
|
2024-03-05 17:25:31 +08:00 |
|
puhui999
|
212d40f290
|
新增社交客户端 CRUD
(cherry picked from commit 8935188a82)
|
2024-03-05 17:24:58 +08:00 |
|
puhui999
|
5359c4c862
|
解决列数据中的 table#header 数据不刷新的问题
(cherry picked from commit ca385bc08e)
|
2024-03-05 17:24:50 +08:00 |
|
xingyu
|
16e0486768
|
fix: ElLoading need import
(cherry picked from commit 238537df83)
|
2024-03-05 17:24:10 +08:00 |
|