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 |
|
芋道源码
|
c1a92ba22a
|
!319 商城装修
Merge pull request !319 from 疯狂的世界/dev
|
2023-11-14 00:31:55 +00:00 |
|
puhui999
|
27c9a0f32d
|
crm-团队成员： 先提交一波
|
2023-11-13 17:49:27 +08:00 |
|
puhui999
|
2385cd9b9a
|
fix：如果已经到重新登录页面则不进行弹窗提示
|
2023-11-13 15:48:21 +08:00 |
|
owen
|
49ebadd748
|
营销：适配商城装修组件【广告魔方】
|
2023-11-12 19:29:24 +08:00 |
|
owen
|
55b477acdb
|
unplugin-auto-import：排除自动导入店铺装修组件
|
2023-11-09 15:48:20 +08:00 |
|
芋道源码
|
6160c2fa8a
|
!315 商城装修
Merge pull request !315 from 疯狂的世界/dev
|
2023-11-09 01:30:21 +00: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 |
|
owen
|
ac42493659
|
营销：适配商城装修组件【宫格导航】
|
2023-11-08 22:22:35 +08:00 |
|
owen
|
325e2e4ff2
|
营销：适配商城装修组件【列表导航】
|
2023-11-08 21:10:05 +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 |
|
芋道源码
|
ead30e8cd9
|
!312 商城装修
Merge pull request !312 from 疯狂的世界/dev
|
2023-11-06 07:02:18 +00: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 |
|
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 |
|
芋道源码
|
df646175dc
|
!296 新增社交客户端 CRUD,新增社交用户 RUD
Merge pull request !296 from puhui999/dev_tmp
|
2023-11-04 02:49:27 +00: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 |
|
芋道源码
|
188de1031b
|
!302 update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue.
Merge pull request !302 from 风狗/N/A
|
2023-11-03 16:28:27 +00:00 |
|
芋道源码
|
f6adb4ebaf
|
!303 商城装修
Merge pull request !303 from 疯狂的世界/dev
|
2023-11-03 15:07:04 +00:00 |
|
YunaiV
|
de62a7a5b7
|
bugfix：注释掉 uno 的 transformerVariantGroup，解决 vite 监控到 css 变化，导致 Login.vue 登录时的重加载问题
|
2023-11-03 18:44:56 +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 |
|
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 |
|
芋道源码
|
20c59b8122
|
!301 营销：完善商城装修
Merge pull request !301 from 疯狂的世界/dev
|
2023-11-01 00:48:16 +00:00 |
|