Commit Graph

1277 Commits

Author SHA1 Message Date
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
914ceff305 unplugin-auto-import:排除自动导入店铺装修组件
(cherry picked from commit 55b477acdb)
2024-03-06 20:31:54 +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
YunaiV
e65a853cda bugfix:注释掉 uno 的 transformerVariantGroup,解决 vite 监控到 css 变化,导致 Login.vue 登录时的重加载问题
(cherry picked from commit de62a7a5b7)
2024-03-05 17:42:12 +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