Commit Graph

305 Commits

Author SHA1 Message Date
BianLzhaoMin d2a5f2d7bf 代码提交 2024-12-02 18:29:29 +08:00
BianLzhaoMin fec6b9896a 33 2024-12-02 18:22:52 +08:00
BianLzhaoMin bbebcc112d 代码优化 2024-12-02 18:15:13 +08:00
jjLv 6bc829e16c Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-12-02 17:15:47 +08:00
jjLv 9fd38b1c30 装备管理新增弹窗页面字段修改 2024-12-02 17:15:40 +08:00
BianLzhaoMin f452f3d8fb Merge branch 'main' into dev-sy 2024-12-02 17:08:41 +08:00
BianLzhaoMin 3a05dc4029 代码优化 2024-12-02 17:07:48 +08:00
jjLv bcc9558a06 订单一级页面传flag 2024-12-02 17:06:43 +08:00
BianLzhaoMin 660353b1d7 代码优化 2024-12-02 16:31:39 +08:00
jjLv 6c69e39a65 Merge branch 'hongchao-dev' 2024-12-02 16:03:28 +08:00
jjLv b1a033d61e 调试 2024-12-02 16:02:56 +08:00
BianLzhaoMin bcde57e771 冲突合并 2024-12-02 15:55:35 +08:00
BianLzhaoMin d1067fb61a 代码优化 2024-12-02 15:50:38 +08:00
BianLzhaoMin ccf00f726e Merge branch 'dev-sy' 2024-12-02 15:44:08 +08:00
BianLzhaoMin 9d4fc72589 代码优化 2024-12-02 15:43:54 +08:00
jjLv 2314b4760c Merge branch 'hongchao-dev' 2024-12-02 15:42:10 +08:00
jjLv 1874b5a836 订单详情传flag字段 2024-12-02 15:41:54 +08:00
BianLzhaoMin 0f874971ab Merge branch 'dev-sy' 2024-12-02 15:34:55 +08:00
BianLzhaoMin 356912fd37 代码优化 2024-12-02 15:33:53 +08:00
BianLzhaoMin 3f4c3b077e Merge branch 'dev-sy' 2024-12-02 14:07:34 +08:00
BianLzhaoMin 4be105707b 代码优化 2024-12-02 14:06:16 +08:00
BianLzhaoMin 8061547cc5 Merge branch 'dev-sy' 2024-12-01 16:39:09 +08:00
BianLzhaoMin d0ee98f7c9 代码优化 2024-12-01 16:38:50 +08:00
BianLzhaoMin f8bd517074 Merge branch 'dev-sy' 2024-12-01 16:21:56 +08:00
BianLzhaoMin 2140728271 问题完善 2024-12-01 16:21:35 +08:00
liang.chao e549975d58 装备列表请求方式提交 2024-12-01 13:33:29 +08:00
jjLv 28ed5e2f30 Merge branch 'hongchao-dev' 2024-12-01 13:18:25 +08:00
jjLv f1e1132cd1 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-12-01 13:18:08 +08:00
jjLv 3d165b3a13 承租方订单管理 2024-12-01 13:17:34 +08:00
jjLv 7758014fa1 订单管理 2024-12-01 12:52:50 +08:00
BianLzhaoMin ca1c4f0a6a Merge branch 'dev-sy' 2024-11-29 14:05:56 +08:00
BianLzhaoMin ca19d7a4d8 代码优化 2024-11-29 14:05:49 +08:00
BianLzhaoMin e72a10c832 Merge branch 'dev-sy' 2024-11-29 13:58:26 +08:00
BianLzhaoMin 391c6fefcd 代码优化 2024-11-29 13:57:59 +08:00
BianLzhaoMin 77558c5c6b Merge branch 'dev-sy' 2024-11-29 13:30:25 +08:00
BianLzhaoMin c319692a07 代码有哈 2024-11-29 13:30:02 +08:00
zzyuan 99ec2d950a 装备新增样式修改 2024-11-29 13:29:27 +08:00
zzyuan 171f694db1 装备列表问题修改 2024-11-29 13:24:49 +08:00
liang.chao da38da94dd 分页请求类型修改 2024-11-29 10:40:37 +08:00
BianLzhaoMin eb2d335d1e 代码调试 2024-11-29 09:40:29 +08:00
BianLzhaoMin 28d126bea5 冲突合并 2024-11-29 09:33:03 +08:00
BianLzhaoMin fb9f427bb9 代码优化 2024-11-29 09:27:46 +08:00
BianLzhaoMin 1c38b24b55 Merge branch 'dev-sy' 2024-11-28 19:08:10 +08:00
BianLzhaoMin 45a2f0424a 代码完善 2024-11-28 19:07:24 +08:00
jjLv 64b67b2576 Merge branch 'hongchao-dev' 2024-11-28 18:40:23 +08:00
jjLv c8bae06b80 订单样式 2024-11-28 18:39:53 +08:00
zzyuan 525e5511f5 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-11-28 18:29:04 +08:00
zzyuan 2ee19e7551 装备草稿接口对接 2024-11-28 18:28:01 +08:00
jjLv 2d85f94e76 Merge branch 'hongchao-dev' 2024-11-28 18:06:06 +08:00
jjLv 29bc0bdb6f 所有的订单管理页面 2024-11-28 18:02:43 +08:00
zzyuan b662406c55 个人中心菜单管理 2024-11-28 17:41:16 +08:00
zzyuan 932e8edf7c 订单修改装备列表修改 2024-11-28 17:35:25 +08:00
BianLzhaoMin 7af1325358 提交 2024-11-28 15:11:43 +08:00
BianLzhaoMin 2d18d62583 需求大厅功能初步完善 2024-11-28 15:11:08 +08:00
jjLv 0b7fe3c0a2 出租方订单页面以及订单详情 2024-11-28 13:43:25 +08:00
jjLv b083418ff9 冲突解决 2024-11-28 10:22:38 +08:00
jjLv 50a700fd9e 冲突 2024-11-28 10:15:48 +08:00
jjLv 5a73080675 冲突 2024-11-28 10:14:15 +08:00
BianLzhaoMin 078f56595f 冲突合并 2024-11-28 10:04:51 +08:00
BianLzhaoMin c6577dd0b9 冲突合并 2024-11-28 10:04:04 +08:00
jjLv 44443120a9 冲突合并 2024-11-28 10:01:37 +08:00
jjLv 4e74fc94b9 代码提交 2024-11-28 09:58:50 +08:00
BianLzhaoMin 00157903c5 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-11-28 09:53:24 +08:00
jjLv ac9ff61624 代码提交 2024-11-28 09:52:59 +08:00
BianLzhaoMin 0592ff5ea1 需求大厅开发 2024-11-28 09:29:25 +08:00
BianLzhaoMin 71ec17b97a 冲突合并 2024-11-28 09:01:52 +08:00
BianLzhaoMin d44bb19d90 样式等问题优化 2024-11-28 08:59:34 +08:00
jjLv 2c1dfcc49d 订单页面退租检修,费用结算按钮页面 2024-11-28 08:51:43 +08:00
BianLzhaoMin 8e2bdd4354 Merge branch 'dev-sy' 2024-11-27 18:23:07 +08:00
BianLzhaoMin 0c70fbdac4 需求列表功能完善 2024-11-27 18:22:35 +08:00
liang.chao 89fa822ca5 商品上下架和删除bug修改 2024-11-27 17:44:58 +08:00
jjLv d3d3907eb2 订单详情 2024-11-27 17:12:33 +08:00
BianLzhaoMin f73ff35633 Merge branch 'dev-sy' 2024-11-27 16:57:14 +08:00
BianLzhaoMin a876914ce1 需求管理页面完善 2024-11-27 16:56:15 +08:00
jjLv 3e9ad09a28 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-11-27 16:48:53 +08:00
jjLv 90e58531c2 出租方订单详情 2024-11-27 16:47:47 +08:00
BianLzhaoMin 3c60789c2c 冲突合并 2024-11-27 15:19:11 +08:00
BianLzhaoMin 97349aaec8 寻源需求页面初步完善 2024-11-27 15:16:53 +08:00
zzyuan a29e449ebe Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-11-27 14:39:57 +08:00
zzyuan 6c29ad4446 装备列表 2024-11-27 14:39:19 +08:00
jjLv c3f06d18ee 承租订单详情 2024-11-27 12:57:02 +08:00
jjLv 8c47679c4a 承租订单管理 2024-11-27 11:33:19 +08:00
zzyuan 0035d60f3d Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-11-27 10:07:07 +08:00
zzyuan d9f198a400 个人中心装备列表 2024-11-27 10:06:24 +08:00
BianLzhaoMin 30c74f840c Merge branch 'dev-sy' 2024-11-27 09:17:37 +08:00
BianLzhaoMin a7facfd975 样式问题调整 2024-11-27 09:17:00 +08:00
zzyuan aa10058a5a Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-11-27 09:11:39 +08:00
zzyuan f5bdfcfc6b 订单提交 2024-11-27 09:11:02 +08:00
BianLzhaoMin f75cc28ec2 冲突合并 2024-11-27 09:09:51 +08:00
BianLzhaoMin bfa5f4c771 需求列表完善 2024-11-27 09:08:48 +08:00
jjLv c767bd2593 出租方订单管理 2024-11-27 09:06:45 +08:00
zzyuan e33fffc973 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-11-26 18:30:57 +08:00
zzyuan 24fd3e45b6 订单提交 2024-11-26 18:30:19 +08:00
BianLzhaoMin 00dcf192e5 首页样式问题优化 2024-11-26 18:26:25 +08:00
BianLzhaoMin 009462b26d 预约车提交接口 删除接口调试完成 2024-11-26 18:09:58 +08:00
BianLzhaoMin 3f9cd683a4 代码提交 2024-11-26 15:38:36 +08:00
BianLzhaoMin 1e34fb5d55 首页菜单功能完善 2024-11-26 09:11:25 +08:00
BianLzhaoMin 05f5ced28b 代码优化 2024-11-25 18:36:55 +08:00
BianLzhaoMin bed711660b 代码优化 2024-11-25 18:04:21 +08:00
BianLzhaoMin c2f44146c4 首页以及装备共享大厅页面完善 2024-11-25 18:00:42 +08:00