|
|
45c761a64a
|
Merge branch 'dev' of https://jihulab.com/xinling/jdt-mer into dev
|
2023-12-03 21:36:54 +08:00 |
|
|
|
71e9ad358a
|
fix(custom): 去除积分管理路由鉴权
|
2023-12-03 21:36:16 +08:00 |
|
|
|
02e47d0287
|
build(deps): 项目依赖升级
|
2023-12-01 23:06:17 +08:00 |
|
|
|
7d1cc49a6d
|
mod(custom): merge branch 'test'
|
2023-11-29 15:38:06 +08:00 |
|
|
|
8fbe2c84b7
|
Merge branch 'dev' into test
|
2023-11-21 19:13:33 +08:00 |
|
|
|
b229880459
|
build(custom): 环境变量调整
|
2023-11-21 19:12:44 +08:00 |
|
|
|
871988a9b3
|
Merge branch 'dev' into test
|
2023-11-21 18:35:57 +08:00 |
|
|
|
f5aa29757e
|
build(custom): 调整编译脚本命令
|
2023-11-21 18:35:00 +08:00 |
|
|
|
5c279bdbbd
|
build(custom): 增加错误上报监控
|
2023-11-21 18:26:45 +08:00 |
|
|
|
ba00cf26a6
|
feat(custom): 订单列表改版
|
2023-11-14 20:45:30 +08:00 |
|
|
|
1ea4b218af
|
feat(custom): 增加用户数据统计
|
2023-10-28 15:11:07 +08:00 |
|
|
|
9c95725969
|
Merge branch 'dev' into 'test'
fix(custom): 订单列表统计小数点后两位不显示
See merge request xinling/jdt-mer!6
|
2023-10-20 21:07:17 +08:00 |
|
|
|
6ae8acb8df
|
fix(custom): 订单列表统计小数点后两位不显示
|
2023-10-20 21:04:59 +08:00 |
|
|
|
23180eff04
|
feat(custom): 新增订单统计，用户统计
|
2023-10-20 20:55:26 +08:00 |
|
|
|
8bf7cc8a31
|
Merge branch 'test' into 'main'
Merge branch 'dev' into 'test'
See merge request xinling/jdt-mer!5
|
2023-10-10 18:06:39 +08:00 |
|
|
|
1b2a0d7bc6
|
Revert "Merge branch 'dev' into 'main'"
This reverts merge request !3
|
2023-10-10 18:05:21 +08:00 |
|
|
|
f6fa59a1c3
|
Merge branch 'dev' into 'test'
fix(custom): 隐藏添加/编辑商品的log打印
See merge request xinling/jdt-mer!4
|
2023-10-10 18:04:27 +08:00 |
|
|
|
58deecbf36
|
Merge branch 'dev' into 'main'
fix(custom): 隐藏添加/编辑商品的log打印
See merge request xinling/jdt-mer!3
|
2023-10-10 18:03:41 +08:00 |
|
|
|
05d87a975c
|
fix(custom): 隐藏添加/编辑商品的log打印
|
2023-10-10 16:22:11 +08:00 |
|
|
|
0a4169d750
|
Merge branch 'test' into 'main'
fix(custom): 修复Upload组件上传成功但未取到值的问题
See merge request xinling/jdt-mer!2
|
2023-10-10 16:03:15 +08:00 |
|
|
|
db9a56dade
|
Merge branch 'dev' into 'test'
fix(custom): 修复Upload组件上传成功但未取到值的问题
See merge request xinling/jdt-mer!1
|
2023-10-10 16:00:25 +08:00 |
|
|
|
160d526693
|
fix(custom): 修复Upload组件上传成功但未取到值的问题
|
2023-10-10 15:57:10 +08:00 |
|
|
|
a95a8ac0d1
|
release(custom): i
|
2023-10-10 15:16:06 +08:00 |
|
|
|
5d1b96be72
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# src/views/demo/editor/md-editor.vue
|
2023-09-08 10:30:06 +08:00 |
|
|
|
363270378a
|
feat(custom): i
|
2023-09-08 10:29:31 +08:00 |
|
张传龙
|
3ed1aafa80
|
chore: update deps
|
2023-08-28 11:08:06 +08:00 |
|
张传龙
|
5cf1212847
|
build: 锁定不能升级的依赖包
|
2023-08-28 10:51:32 +08:00 |
|
张传龙
|
81e0bb7b78
|
feat: md-editor暗黑主题调整
|
2023-08-25 10:52:04 +08:00 |
|
张传龙
|
f3125ddec8
|
chore: update deps
|
2023-08-25 10:42:18 +08:00 |
|
张传龙
|
3b3cb7ba34
|
docs: update readme
|
2023-08-17 18:50:46 +08:00 |
|
张传龙
|
d7c1063102
|
feat: 更新logo
|
2023-08-17 18:30:24 +08:00 |
|
张传龙
|
a5aa8a353f
|
build: 新增一键启动脚本，F5直接启动项目
|
2023-08-15 10:49:44 +08:00 |
|
张传龙
|
cbb6ca4f6b
|
chore: update deps
|
2023-08-10 16:12:40 +08:00 |
|
Ronnie Zhang
|
2ece015dae
|
docs: update readme
|
2023-08-05 16:40:26 +08:00 |
|
zclzone
|
a80f83a011
|
mod: merge commit from github
|
2023-08-04 22:14:12 +08:00 |
|
zclzone
|
65d4d3848d
|
fix(deps): 修复自定义指令引起的热更新失效问题
ISSUES CLOSED: #45
|
2023-08-04 22:07:20 +08:00 |
|
zclzone
|
53830256f4
|
fix: size type
|
2023-08-04 21:53:55 +08:00 |
|
张传龙
|
22c59c208f
|
feat: add unocss preset rem to px
|
2023-08-03 17:20:21 +08:00 |
|
张传龙
|
b43f87035b
|
chore: rollback vite-plugin-mock version
|
2023-07-28 01:10:01 +08:00 |
|
张传龙
|
20eee94630
|
chore: update unocss config
|
2023-07-28 00:56:14 +08:00 |
|
张传龙
|
c504ad065c
|
chore: update deps
|
2023-07-27 14:25:07 +08:00 |
|
张传龙
|
0e764ac748
|
feat: add message notification
|
2023-07-21 16:01:35 +08:00 |
|
张传龙
|
8f15e1c655
|
fix: 多余的reloadPage
|
2023-07-13 14:46:41 +08:00 |
|
张传龙
|
d702a6703b
|
fix: keepAlive
|
2023-07-11 15:07:37 +08:00 |
|
张传龙
|
d49af8b574
|
docs: update readme
|
2023-07-07 15:33:20 +08:00 |
|
张传龙
|
a036602d3e
|
Merge branch 'main' of https://github.com/zclzone/vue-naive-admin
|
2023-07-07 15:09:04 +08:00 |
|
张传龙
|
eb173dc38e
|
docs: update readme
|
2023-07-07 15:05:25 +08:00 |
|
zclzone
|
e5f1ee25c3
|
mod: update copyright
|
2023-07-01 10:41:25 +08:00 |
|
张传龙
|
fe11e18197
|
Merge branch 'main' of https://github.com/zclzone/vue-naive-admin
|
2023-06-27 17:18:24 +08:00 |
|
张传龙
|
0f9fb9f1c9
|
Merge branch 'main' of https://gitee.com/zclzone/vue-naive-admin
|
2023-06-27 17:16:56 +08:00 |
|
