438 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
YuanHuakk	79f34be500	Merge branch 'dev' into test	2024-03-20 16:37:56 +08:00
YuanHuakk	e139fed2a6	feat(custom): 新增若干功能	2024-03-20 16:35:15 +08:00
YuanHuakk	760c843060	Merge branch 'dev' into test	2024-03-09 18:18:27 +08:00
YuanHuakk	71f72ff03d	feat(custom): 增加后结统计时间筛选	2024-03-09 18:17:51 +08:00
YuanHuakk	af20de8776	Merge branch 'dev' into test	2024-03-08 20:55:00 +08:00
YuanHuakk	dd49ee9cd6	ci(custom):	2024-03-08 20:54:49 +08:00
YuanHuakk	3a246511e1	ci(custom):	2024-03-08 19:15:47 +08:00
YuanHuakk	7d7ac808f8	ci(custom):	2024-03-08 19:06:17 +08:00
YuanHuakk	a53552943a	Merge branch 'dev' into test	2024-03-08 18:59:17 +08:00
YuanHuakk	eb1f6ff400	ci(custom): update .drone.yml	2024-03-08 18:58:53 +08:00
YuanHuakk	2faf99c2ff	ci(custom): add CICD	2024-03-08 18:58:06 +08:00
YuanHuakk	c8974937ff	Merge branch 'dev' into test	2024-03-07 18:58:37 +08:00
YuanHuakk	d619dcb268	feat(custom): 增加核销人员权限	2024-03-07 18:58:15 +08:00
YuanHuakk	011284c5dc	Merge branch 'dev' into test	2024-03-05 21:20:39 +08:00
YuanHuakk	893649afdd	fix(custom): 去除后结订单统计多余逻辑	2024-03-05 21:20:20 +08:00
YuanHuakk	a0f1d29597	Merge branch 'dev' into test	2024-03-04 21:20:31 +08:00
YuanHuakk	8354c2ae72	feat(custom): 新增后结功能模块	2024-03-04 21:20:05 +08:00
YuanHuakk	74a4aa3ab2	Merge branch 'dev' into test	2024-01-25 22:48:31 +08:00
YuanHuakk	ab960e139f	feat(custom): 新增豆子记录	2024-01-25 22:47:53 +08:00
YuanHuakk	fca2672393	Merge branch 'dev' into test	2024-01-22 22:25:25 +08:00
YuanHuakk	f7b4942ef9	fix(custom): 修复添加商品时商品分类不是必选项的bug	2024-01-22 22:24:11 +08:00
YuanHuakk	28a6b326e4	Merge branch 'dev' into test	2023-12-17 21:49:22 +08:00
YuanHuakk	590f722d00	mod(custom): 部分细节优化	2023-12-17 21:48:17 +08:00
YuanHuakk	c9b590fcb2	Merge branch 'dev' into test	2023-12-15 20:48:04 +08:00
YuanHuakk	cdeab8ea29	feat(custom): 增加商品分类序号	2023-12-15 20:47:16 +08:00
YuanHuakk	40d27d2032	Merge branch 'dev' into test	2023-12-13 13:21:05 +08:00
YuanHuakk	6b8e3fac6c	feat(custom): 增加订单支付方式筛选	2023-12-13 13:19:58 +08:00
YuanHuakk	99336f5304	Merge branch 'dev' into test	2023-12-03 22:24:19 +08:00
YuanHuakk	0cdf5978ad	fix(custom): i	2023-12-03 22:21:51 +08:00
YuanHuakk	fd5bc032a6	Merge branch 'dev' into test	2023-12-03 21:37:21 +08:00
YuanHuakk	45c761a64a	Merge branch 'dev' of https://jihulab.com/xinling/jdt-mer into dev	2023-12-03 21:36:54 +08:00
YuanHuakk	71e9ad358a	fix(custom): 去除积分管理路由鉴权	2023-12-03 21:36:16 +08:00
YuanHuakk	02e47d0287	build(deps): 项目依赖升级	2023-12-01 23:06:17 +08:00
YuanHuakk	8fbe2c84b7	Merge branch 'dev' into test	2023-11-21 19:13:33 +08:00
YuanHuakk	b229880459	build(custom): 环境变量调整	2023-11-21 19:12:44 +08:00
YuanHuakk	871988a9b3	Merge branch 'dev' into test	2023-11-21 18:35:57 +08:00
YuanHuakk	f5aa29757e	build(custom): 调整编译脚本命令	2023-11-21 18:35:00 +08:00
YuanHuakk	5c279bdbbd	build(custom): 增加错误上报监控	2023-11-21 18:26:45 +08:00
YuanHuakk	ba00cf26a6	feat(custom): 订单列表改版	2023-11-14 20:45:30 +08:00
YuanHuakk	1ea4b218af	feat(custom): 增加用户数据统计	2023-10-28 15:11:07 +08:00
Huakk	9c95725969	Merge branch 'dev' into 'test' ... fix(custom): 订单列表统计小数点后两位不显示 See merge request xinling/jdt-mer!6	2023-10-20 21:07:17 +08:00
YuanHuakk	6ae8acb8df	fix(custom): 订单列表统计小数点后两位不显示	2023-10-20 21:04:59 +08:00
YuanHuakk	23180eff04	feat(custom): 新增订单统计，用户统计	2023-10-20 20:55:26 +08:00
Huakk	f6fa59a1c3	Merge branch 'dev' into 'test' ... fix(custom): 隐藏添加/编辑商品的log打印 See merge request xinling/jdt-mer!4	2023-10-10 18:04:27 +08:00
YuanHuakk	05d87a975c	fix(custom): 隐藏添加/编辑商品的log打印	2023-10-10 16:22:11 +08:00
Huakk	db9a56dade	Merge branch 'dev' into 'test' ... fix(custom): 修复Upload组件上传成功但未取到值的问题 See merge request xinling/jdt-mer!1	2023-10-10 16:00:25 +08:00
YuanHuakk	160d526693	fix(custom): 修复Upload组件上传成功但未取到值的问题	2023-10-10 15:57:10 +08:00
YuanHuakk	a95a8ac0d1	release(custom): i	2023-10-10 15:16:06 +08:00
YuanHuakk	5d1b96be72	Merge remote-tracking branch 'origin/main' ... # Conflicts: # src/views/demo/editor/md-editor.vue	2023-09-08 10:30:06 +08:00
YuanHuakk	363270378a	feat(custom): i	2023-09-08 10:29:31 +08:00