Commit Graph

73 Commits

Author SHA1 Message Date
comlibmb
80e5a1ddeb feat(admin): merge stash changes into comclib-analytics (order/finance/product + rpc sql) 2026-02-10 18:49:21 +08:00
comlibmb
bf394eb65d sql数据流,amdin业务逻辑接入 2026-02-09 23:14:23 +08:00
comlibmb
8a11a43b6c Merge branch 'huangzhenbao-admin' into comclib-analytics
- Resolved rename conflicts by keeping docs/project_spec/ structure
- Added new admin modules: finance, decoration, kefu
- Enhanced marketing and product management features
- Updated analytics components and profile page
- Consolidated documentation under pages/mall/admin/docs/
2026-02-05 10:43:24 +08:00
comlibmb
7e62d3f8d9 sql数据流,amdin业务逻辑接入 2026-02-05 10:19:55 +08:00
comlibmb
ac670cf5d8 sql数据流,amdin业务逻辑接入 2026-02-05 10:11:09 +08:00
d51e6a8f72 大致完成页面 2026-02-05 09:01:16 +08:00
c411c23b9c docs: Admin管理系统融合方案完整分析文档 - 包含四端功能融合、15个新角色权限体系、5个新菜单详设计、15周实施路线图 2026-02-04 17:37:38 +08:00
df642813c3 完善页面 2026-02-04 09:14:37 +08:00
3476c006e6 Merge origin/main into huangzhenbao-admin 2026-02-04 08:50:46 +08:00
3922409a25 完善 2026-02-03 21:35:57 +08:00
not-like-juvenile
5bbca05d2e 配送端数据库文件 2026-02-03 17:30:00 +08:00
comlibmb
859372ca5b 合并后台端 2026-02-03 11:38:00 +08:00
comlibmb
9799de77b6 chore: sync local changes before merging huangzhenbao-admin 2026-02-03 08:56:35 +08:00
93b42a277a 继续完善页面 2026-02-02 21:45:59 +08:00
comlibmb
cd4861a6dc Merge branch 'ysj-delivery' into main 2026-02-02 21:41:53 +08:00
fca976158e Merge pull request 'comclib-analytics' (#18) from comclib-analytics into main
Reviewed-on: http://hfkj.git.meitizs.com/mall/mall/pulls/18
2026-02-02 13:14:53 +00:00
f4af5dded9 首页 2026-02-02 20:36:54 +08:00
21f4a0fa96 修改页面结构 2026-02-02 20:07:37 +08:00
not-like-juvenile
8efe6d5e89 连接数据库并修改页面 2026-02-02 18:20:22 +08:00
comlibmb
af665713d5 readme.md文档更新 2026-02-02 18:12:13 +08:00
comlibmb
21149dd3fe 数据库文档编写,开发规范文档,数据库接入 2026-02-02 18:09:30 +08:00
b6200cda28 前端各页面对接数据 2026-02-02 17:34:31 +08:00
5c9e0e20b8 Merge pull request 'comclib-analytics' (#17) from comclib-analytics into main
Reviewed-on: http://hfkj.git.meitizs.com/mall/mall/pulls/17
2026-02-02 02:44:18 +00:00
comlibmb
19970db288 数据分析ui补充完善,接入数据库 2026-02-01 20:17:37 +08:00
comlibmb
6716398175 数据分析ui补充完善,接入数据库 2026-01-31 21:47:42 +08:00
not-like-juvenile
5f856a96c9 修改数据库并修改页面样式 2026-01-30 21:11:17 +08:00
3de5e9ebe9 修复bug 2026-01-30 19:00:31 +08:00
d57592ca7d 继续完善 2026-01-30 17:29:02 +08:00
b381f2a7f6 Merge pull request 'comclib-analytics' (#14) from comclib-analytics into main
Reviewed-on: http://hfkj.git.meitizs.com/mall/mall/pulls/14
2026-01-30 08:18:55 +00:00
comlibmb
8f181b2b6a mall数据库文件 2026-01-30 16:17:13 +08:00
comlibmb
cfec4a16c0 mall数据库文件 2026-01-30 16:11:23 +08:00
not-like-juvenile
fde3cb0322 测试连接数据库 2026-01-30 08:32:12 +08:00
fcc976680d 完善页面 2026-01-29 17:54:35 +08:00
comlibmb
b53d2376ff 数据分析ui补充完善,接入数据库 2026-01-29 17:30:39 +08:00
ab038ec029 consumer模块完成度85%,连接服务器supabase,新建相关表 2026-01-29 17:28:47 +08:00
not-like-juvenile
76eb96ec0c 添加逻辑并测试连接数据库 2026-01-28 19:13:13 +08:00
9f3c2803e3 完善页面布局 2026-01-28 17:54:30 +08:00
a4fa00c935 consumer模块完成度85%,测试连接supabase 2026-01-28 17:28:50 +08:00
8c5024a943 修改页面布局 2026-01-28 11:10:05 +08:00
66aa909193 提交昨晚至今早的修改2 2026-01-28 10:56:43 +08:00
af316e6d94 提交昨晚至今早的修改 2026-01-28 10:46:54 +08:00
not-like-juvenile
1cca27096a 主分支合并及修改 2026-01-28 10:29:09 +08:00
comlibmb
3e89513e8b docs: update README and add pages routes 2026-01-28 09:26:56 +08:00
comlibmb
83d10a0a78 Refactor pages subpackages and remove backup files 2026-01-28 09:18:29 +08:00
comlibmb
7618e4188b Merge remote-tracking branch 'origin/cyh666666/consumer' 2026-01-28 09:06:25 +08:00
7615b14ed7 Merge pull request 'ysj-delivery' (#11) from ysj-delivery into main
配送端进行合并
2026-01-27 13:55:14 +00:00
comlibmb
dfbfd980ca page.json配置补齐 2026-01-27 21:54:36 +08:00
comlibmb
d542f74445 Merge huangzhenbao-admin into main and fix config 2026-01-27 21:43:26 +08:00
417aeab9ff Merge pull request 'comclib-analytics' (#8) from comclib-analytics into main
数据分析模块
2026-01-27 13:03:27 +00:00
comlibmb
932b199196 界面设计 2026-01-27 20:56:30 +08:00