Commit Graph

74 Commits

Author SHA1 Message Date
wangyilin 6a7bdfd316 小程序 2024-09-13 09:41:19 +08:00
wangyilin 795f1238af Merge remote-tracking branch 'origin/main'
# Conflicts:
#	collect_information/src/pages/policeManager/index/index.vue
2024-09-13 09:40:45 +08:00
wangyilin a1042b806d 小程序 2024-09-13 09:40:08 +08:00
TimSpan 3322082043 .. 2024-09-13 09:38:35 +08:00
TimSpan 8ab0580add Merge branch 'main' of http://175.6.124.250:3100/luozhun/policeSecurity 2024-09-11 16:58:52 +08:00
TimSpan fd1c56bdab 。。。 2024-09-11 16:58:49 +08:00
wangyilin 184a981526 小程序 2024-09-11 16:58:31 +08:00
TimSpan 8d588076da 合并 2024-09-11 16:54:39 +08:00
TimSpan 0767dc704d Merge branch 'main' of http://175.6.124.250:3100/luozhun/policeSecurity 2024-09-11 14:42:13 +08:00
TimSpan e21843ae85 公安后台接口替换 2024-09-11 14:42:09 +08:00
wangyilin 423c6c86fb 小程序管理 2024-09-11 14:27:30 +08:00
TimSpan 5825ea2767 Merge branch 'main' of http://175.6.124.250:3100/luozhun/policeSecurity 2024-09-11 11:35:29 +08:00
TimSpan 28cbb4647c 自定义tabbar 2024-09-11 11:35:24 +08:00
luozhun 93242c30be Merge remote-tracking branch 'origin/main' 2024-09-11 11:31:19 +08:00
luozhun a727084b3f 接口整合 后台接口统一控制器 小程序项目经理跟公安首页我的企事业项目 2024-09-11 11:31:10 +08:00
TimSpan 7f86ec40cc 自定义tabbar
自定义tabbar
2024-09-11 10:25:03 +08:00
TimSpan 0301099879 Merge branch 'main' of http://175.6.124.250:3100/luozhun/policeSecurity 2024-09-11 09:22:37 +08:00
TimSpan c849afb43b 。。。 2024-09-11 09:22:32 +08:00
wangyilin 5d563bec3d Merge remote-tracking branch 'origin/main' 2024-09-11 09:22:06 +08:00
wangyilin cab07c803f 小程序 2024-09-11 09:22:00 +08:00
TimSpan 18e7d30b9c Update IconFont.vue 2024-09-10 16:48:52 +08:00
TimSpan 41e4464224 测试图标 2024-09-10 16:47:54 +08:00
TimSpan 2fc5a867fb Merge branch 'main' of http://175.6.124.250:3100/luozhun/policeSecurity 2024-09-10 11:06:24 +08:00
TimSpan cfc3b0641a 公安 退出登录、优化菜单缓存、 2024-09-10 11:06:18 +08:00
wangyilin 397c874f00 Merge remote-tracking branch 'origin/main' 2024-09-10 11:01:57 +08:00
wangyilin ed8d12bf29 小程序 2024-09-10 11:00:20 +08:00
wangyilin bcde6a1839 小程序 2024-09-10 10:59:29 +08:00
luozhun 7834d915b7 Merge remote-tracking branch 'origin/main' 2024-09-10 10:12:45 +08:00
luozhun 6f0c121dea 企事业单位 服务项目 小程序注册及登录 2024-09-10 10:12:37 +08:00
wangyilin 62913342e2 小程序管理 2024-09-09 17:37:44 +08:00
TimSpan 0125301cee Update .DS_Store 2024-09-09 16:27:16 +08:00
TimSpan 98a0438393 后台用户管理使用ProMax组件
后台用户管理使用ProMax组件
2024-09-09 15:01:20 +08:00
TimSpan be3eea4a2a Merge branch 'main' of http://175.6.124.250:3100/luozhun/policeSecurity 2024-09-06 19:24:03 +08:00
TimSpan 7a5bfaca77 企事业单位 以及ts 配置
企事业单位 以及ts 配置
2024-09-06 19:24:01 +08:00
wangyilin 5dbc5bd252 服务项目管理 2024-09-06 17:38:13 +08:00
luozhun 3c461b4853 Merge remote-tracking branch 'origin/main' 2024-09-06 14:54:24 +08:00
luozhun 3b4e770939 微信小程序注册接口 2024-09-06 14:54:14 +08:00
TimSpan d6ed7e354c 复制组件 2024-09-06 10:39:19 +08:00
TimSpan e81895f62e 完成了 后台用户页面、菜单还是带优化、移除了黄色警告 2024-09-06 09:45:51 +08:00
TimSpan 7bf0c49319 Merge branch 'main' of http://175.6.124.250:3100/luozhun/policeSecurity 2024-09-05 10:45:50 +08:00
TimSpan 3b11749c37 后台用户 2024-09-05 10:45:49 +08:00
wangyilin 23e90cd5d9 Merge remote-tracking branch 'origin/main' 2024-09-05 10:42:21 +08:00
wangyilin b0fe85e4d8 后台用户 2024-09-05 10:41:57 +08:00
luozhun d4240811e8 公安用户增删改查
接口鉴权 过滤客户端
2024-09-04 17:13:26 +08:00
luozhun 3447e1bc0a Merge remote-tracking branch 'origin/main' 2024-09-04 17:13:13 +08:00
luozhun ec9e040aec 公安用户增删改查
接口鉴权 过滤客户端
2024-09-04 17:13:01 +08:00
TimSpan 9eebc328c2 优化注册登录 2024-09-04 15:33:29 +08:00
TimSpan f06a136ea7 Merge branch 'main' of http://175.6.124.250:3100/luozhun/policeSecurity 2024-09-04 14:02:49 +08:00
TimSpan e0d0e5a618 router-view 加key,传参去登录,添加路由
router-view 加key,传参去登录,添加路由
2024-09-04 14:02:47 +08:00
wangyilin dd48806fcd 新增编辑 2024-09-03 18:25:25 +08:00