yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,000 Commits
9 Branches
15 Tags
30 MiB
Commit Graph

265 Commits (21483448b9aa55df2beeb8b9631cb0bdf08ce3f4)

Author SHA1 Message Date
YunaiV 53c94af027 ✨ ERP：初始化其它入库的表单 40% 2024-02-06 12:44:39 +08:00
owen 89fdb5ced9 基础设施：前端直连上传，优先使用自定义域名 2024-02-04 20:57:05 +08:00
owen dd08fbcb46 Merge remote-tracking branch 'origin/dev' into dev 2024-02-04 19:42:14 +08:00
owen 490bb901e1 基础设施：增加前端直连上传文件到S3服务的功能 2024-02-04 19:41:48 +08:00
puhui999 6d0e242387 CRM-合同：完善 TODO 2024-02-03 20:47:50 +08:00
YunaiV 956f19d9d0 CRM：合同的 code review 2024-02-01 13:38:14 +08:00
puhui999 ed94205fa7 CRM-合同：完善合同表单 2024-01-27 23:11:43 +08:00
AKING 24062c7a3b
update src/components/Descriptions/src/Descriptions.vue. 
字段映射的功能点添加，已测

Signed-off-by: AKING <2734339436@qq.com>
 2024-01-22 01:41:37 +00:00
puhui999 f88b26e3c3 多图上传组件优化 2024-01-20 17:31:10 +08:00
YunaiV 9fa769b16a 📖 CRM：跟进记录的 code review 2024-01-15 21:30:25 +08:00
puhui999 2a55d88a44 Merge remote-tracking branch 'yudao/dev' into dev-crm 
# Conflicts:
#	src/router/modules/remaining.ts
 2024-01-14 21:53:31 +08:00
puhui999 d29dfef7c7 新增客户跟进 2024-01-14 00:00:50 +08:00
芋道源码 fdfb028dd9
!360 Review代码修改 
Merge pull request !360 from 疯狂的世界/dev
 2024-01-13 03:16:16 +00:00
owen 2b8eb49f71 Review代码修改 2024-01-11 12:25:34 +08:00
YunaiV efe702d383 📖 MALL：商品编辑 => 简化 InfoForm 基础设置 2024-01-11 09:42:23 +08:00
YunaiV ec87c1b61d 📖 CRM：code review crm 客户列表 2024-01-07 21:20:00 +08:00
芋道源码 4eb3c8a2f9
!358 fix: 修复多文件上传一个一个选择上传第二个文件上传失效的问题 
Merge pull request !358 from puhui999/dev-crm
 2024-01-07 12:53:49 +00:00
puhui999 17be1abb65 客户详情完善 2024-01-06 12:29:35 +08:00
YunaiV d36c4ab36c ✨ MALL：去除分销提现的银行配置 2024-01-05 22:46:22 +08:00
puhui999 7fd564307d fix: 修复多文件上传一个一个选择上传第二个文件上传失效的问题 2024-01-04 12:10:01 +08:00
芋道源码 0338caeef6
!355 修复一些 issues 提到的问题 
Merge pull request !355 from puhui999/dev-crm
 2023-12-30 13:26:46 +00:00
YunaiV 1eefa02c4c 📖 操作日志的界面实现 2023-12-30 21:25:08 +08:00
芋道源码 631c105f94
!346 feat：新增公共操作日志详情组件 
Merge pull request !346 from puhui999/dev-crm
 2023-12-30 12:54:53 +00:00
puhui999 aadad39a69 fix: 修复文件上传数据回显错误 2023-12-30 18:46:44 +08:00
puhui999 261d8b2aa4 crm-客户：集成操作日志详情组件 2023-12-30 17:06:09 +08:00
YunaiV 9591ed7084 📖 code review：店铺装修逻辑 2023-12-20 23:01:09 +08:00
YunaiV b86f082306 📖 code review：店铺装修逻辑 2023-12-19 23:10:58 +08:00
owen 80355f3acd 营销：优化商城装修组件 2023-12-15 17:12:02 +08:00
owen 33162a12c0 营销：适配商城装修组件【标题栏】 2023-12-15 13:26:28 +08:00
owen 41a404a52c 营销：适配商城装修组件【热区】 2023-12-14 20:22:52 +08:00
puhui999 59c6670775 feat：新增公共操作日志详情组件 2023-12-14 18:18:55 +08:00
owen edfdee8cc1 营销：适配商城装修组件【悬浮按钮】 2023-12-09 21:33:47 +08:00
owen 76025b6821 营销：适配商城装修组件【弹窗广告】 2023-12-09 16:45:54 +08:00
owen 59ff6b13fb 封装拖拽组件，提供移动、新增、删除功能 2023-12-08 21:54:11 +08:00
owen 9ff4f1f7a9 商城装修：修复同一类型的组件切换时，右侧属性面板不更新的问题 2023-12-07 21:18:51 +08:00
owen 784623724d 营销：完善装修编辑器预览功能 2023-12-07 19:58:52 +08:00
owen eec3a21852 营销：完善装修编辑器重置功能 2023-12-07 16:25:15 +08:00
puhui999 55c64d9c1b fix:修改 UploadImg 组件预览图片的方式为 createImageViewer，解决商城列表预览图片层级出现错误 2023-12-03 19:26:22 +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
owen d5f9d31d32 营销：适配商城装修组件【拼团】（待重写） 2023-12-01 21:00:39 +08:00
owen 7e44b621a5 营销：适配商城装修组件【秒杀】（待重写） 2023-12-01 20:24:55 +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
dhb52 e106fb73b6 Merge remote-tracking branch 'yudao/master' into dhb52_master 2023-11-28 21:53:20 +08:00
芋道源码 8aa17b673b
!331 菜单右上角加一个搜索图标 
Merge pull request !331 from boide/search-icon
 2023-11-25 10:50:20 +00:00
owen d4dc105b4f 营销：适配商城装修组件【营销文章】 2023-11-25 15:53:07 +08:00
Marvin b95b8008f7 feat: 菜单右上角加一个搜索图标 2023-11-25 03:52:59 +08:00
owen c3cad3f3ee 商城：修复会员统计时间范围选择昨天时, 会强制查询两天的问题 2023-11-24 20:54:47 +08:00
dhb52 c2038b95bf Merge remote-tracking branch 'yudao/master' 2023-11-23 08:47:06 +08:00
owen 253401ace3 营销：适配商城装修组件【优惠券】 2023-11-22 16:58:00 +08:00
owen 3198688eb5 营销：适配商城装修组件【商品栏】 2023-11-19 18:27:25 +08: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
芋道源码 5f0b0bd21d
!324 商城装修 
Merge pull request !324 from 疯狂的世界/dev
 2023-11-18 14:18:12 +00:00
芋道源码 f07d37438d
!321 修复滑块验证码无任何滑动直接点击验证时，x坐标空，导致后端NPE的问题 
Merge pull request !321 from 柯杨/master
 2023-11-18 13:43:22 +00: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
芋道源码 26dba8b457
!325 新增主子表、树表的代码生成 
Merge pull request !325 from 芋道源码/feature/sub-table
 2023-11-18 09:57:33 +00:00
owen b4a1772584 营销：适配商城装修组件【商品卡片】 2023-11-17 10:14:26 +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
柯杨 8bb9dec328
【bugfix】：修复滑块验证码无任何滑动直接点击验证时，x坐标空，导致后端NPE的问题 
Signed-off-by: 柯杨 <key5230@163.com>
 2023-11-14 01:43:59 +00:00
YunaiV 72c5eaae31 代码生成：增加 one 情况下的示例代码 2023-11-12 19:50:38 +08:00
owen 49ebadd748 营销：适配商城装修组件【广告魔方】 2023-11-12 19:29:24 +08:00
YunaiV 55f6e4ca25 主子表：确认列表编辑的支持组件情况 2023-11-10 23:01:36 +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
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
owen fa710b560d 营销：增加商城装修组件【图片展示】 2023-11-05 20:42:50 +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
owen 434aa864da 营销：优化装修编辑器 2023-11-05 12:40:32 +08:00
owen 0b0ba1f313 营销：优化装修编辑器样式 2023-11-05 10:08:03 +08:00
owen aedf014407 营销：装修页面适配搜索框 2023-11-04 22:06:40 +08:00
owen 3c0f3ceed5 营销：装修模板，底部导航适配APP 2023-11-03 06:47:46 +08:00
owen 9bd33355e2 营销：装修编辑器样式优化 2023-10-31 17:17:46 +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 f26a4cae10 feat: unocss add shortcuts 2023-10-31 10:04:31 +08:00
owen e9ff8d3237 商城装修 2023-10-29 22:03:24 +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
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
xingyu 1a1b70a350 style: stylelint 2023-10-16 15:04:05 +08:00
owen 3802fee661 商城：增加商城首页 2023-10-16 09:51:19 +08:00
kehaiyou 683e319c72 fix: 【工作流】--加签减签 2023-10-08 22:35:50 +08:00
owen 4c077711a1 对齐面包屑的图标和文字 2023-10-02 11:03:46 +08:00
owen 6475f81534 Merge remote-tracking branch 'origin/dev' into dev 2023-09-29 21:08:48 +08:00
owen c322fb3d0d 统计：交易统计 2023-09-29 21:08:14 +08:00
YunaiV 245147223f code review：驳回逻辑 2023-09-24 23:05:33 +08:00