bonus
/
Zlpt_Portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
484 Commits 11 Branches 0 Tags 90 MiB
Commit Graph

438 Commits

Author SHA1 Message Date
BianLzhaoMin ca2b907669 Merge branch 'main' into dev-sy 2024-12-12 15:32:45 +08:00
jjLv fd88bcbdc3 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-12-12 15:31:47 +08:00
BianLzhaoMin f6237bd741 标签页面完善 2024-12-12 15:30:21 +08:00
BianLzhaoMin 26823d5cb8 订单流程完善 2024-12-12 14:18:51 +08:00
jjLv d3fce3af52 Merge branch 'hongchao-dev' 2024-12-12 10:58:53 +08:00
jjLv 69d3d249ed 装备详情添加属性 2024-12-12 10:58:12 +08:00
BianLzhaoMin 477f48e23f 代码优化 2024-12-12 09:13:37 +08:00
BianLzhaoMin 21404d22f6 代码优化 2024-12-12 09:10:46 +08:00
BianLzhaoMin 7c9729f8f4 优化 2024-12-12 09:04:24 +08:00
BianLzhaoMin 33ba6cb863 Merge branch 'main' into dev-sy 2024-12-11 18:10:45 +08:00
BianLzhaoMin 0a7f44b847 订单状态合并 2024-12-11 18:09:31 +08:00
jjLv 871fa7ff27 装备新增属性必填 2024-12-11 18:09:23 +08:00
BianLzhaoMin d288f3131f 承租方订单页面优化 2024-12-11 16:10:20 +08:00
jjLv 19b2b4cc10 Merge branch 'hongchao-dev' 2024-12-11 16:06:24 +08:00
jjLv 84760ba32c 装备新增属性 2024-12-11 16:05:45 +08:00
BianLzhaoMin 9c3ae0bc5a Merge branch 'main' into dev-sy 2024-12-11 13:08:36 +08:00
BianLzhaoMin 0f04e449aa 代码优化 2024-12-11 09:55:14 +08:00
jjLv 57468d35b3 Merge branch 'hongchao-dev' 2024-12-11 09:28:28 +08:00
jjLv 31ffdd2b3c 合同管理 2024-12-11 09:27:49 +08:00
BianLzhaoMin 794720124d 代码完善 2024-12-11 09:13:14 +08:00
jjLv c4a6e9d71f Merge branch 'hongchao-dev' 2024-12-10 18:48:07 +08:00
jjLv 01850eaadc 属性重复bug修复 2024-12-10 18:47:44 +08:00
jjLv a1cfcb7e47 Merge branch 'hongchao-dev' 2024-12-10 18:35:09 +08:00
jjLv 8d701b7730 bug修复 2024-12-10 18:31:21 +08:00
jjLv 8643c87a71 查看，编辑属性 2024-12-10 18:12:15 +08:00
jjLv 5cdcd2f9bf 查看，编辑属性 2024-12-10 17:40:07 +08:00
jjLv 3e6738de6e 新增属性 2024-12-10 17:13:39 +08:00
jjLv 21ea680a38 新增属性 2024-12-10 17:01:47 +08:00
liang.chao 5729acf0b3 1 2024-12-10 15:56:12 +08:00
BianLzhaoMin 9bdae9d218 代码优化 2024-12-10 15:06:36 +08:00
BianLzhaoMin 076644e4f6 安全证书功能完善 2024-12-10 14:02:33 +08:00
BianLzhaoMin 6da92a3154 代码优化 2024-12-09 17:27:43 +08:00
BianLzhaoMin 0277edbe2d 质检管理功能开发 2024-12-09 17:21:46 +08:00
BianLzhaoMin acc00f3887 代码优化 2024-12-09 13:10:06 +08:00
BianLzhaoMin 6792becdbb 代码优化 2024-12-09 09:38:06 +08:00
BianLzhaoMin 68e431eb43 代码优化 2024-12-08 20:40:59 +08:00
BianLzhaoMin 0eec51d1e0 Merge branch 'dev-sy' 2024-12-06 21:27:44 +08:00
BianLzhaoMin 2b64c9d951 代码提交 2024-12-06 21:26:37 +08:00
BianLzhaoMin 3eae5482ee Merge branch 'dev-sy' 2024-12-06 21:02:44 +08:00
BianLzhaoMin 9df856613b 代码优化 2024-12-06 21:02:34 +08:00
BianLzhaoMin 14487ab37d 装备新增问题修复 2024-12-06 19:25:03 +08:00
BianLzhaoMin ef38e30bfe Merge branch 'dev-sy' 2024-12-06 17:53:49 +08:00
BianLzhaoMin 14cc1b3710 增加轮播图 2024-12-06 17:53:35 +08:00
BianLzhaoMin ed0e33e9fb Merge branch 'dev-sy' 2024-12-06 17:49:10 +08:00
BianLzhaoMin 141a763be1 装备新增逻辑完善 2024-12-06 17:48:56 +08:00
mashuai 6eb7329ee4 字段调整 2024-12-06 17:28:06 +08:00
liang.chao 0df9d457db 装备设备状态查询bug修改 2024-12-06 16:44:48 +08:00
BianLzhaoMin 421445f924 结算逻辑完善 2024-12-05 18:12:07 +08:00
BianLzhaoMin c665c32553 Merge branch 'dev-sy' 2024-12-05 16:58:48 +08:00
BianLzhaoMin a6568d208b 增加文件下载功能 2024-12-05 16:58:35 +08:00
liang.chao 2185be3542 模板下载 2024-12-05 16:54:22 +08:00
BianLzhaoMin c9316f53b0 Merge branch 'dev-sy' 2024-12-05 16:33:27 +08:00
BianLzhaoMin 37a7884a9a 代码优化提交 2024-12-05 16:33:12 +08:00
liang.chao 87f358430c 装备增加校验日期，校验周期 2024-12-05 16:23:04 +08:00
BianLzhaoMin ff0ac16157 代码优化 2024-12-05 13:07:05 +08:00
BianLzhaoMin 895fb62b6c 代码优化 2024-12-05 12:04:24 +08:00
BianLzhaoMin 2f82fffe13 代码完善 2024-12-05 11:51:00 +08:00
BianLzhaoMin 547b648140 需求管理页面优化 2024-12-04 18:31:12 +08:00
BianLzhaoMin 8715f7e45c 代码完善 2024-12-04 18:10:04 +08:00
BianLzhaoMin a9c350b960 代码调试 2024-12-04 18:00:17 +08:00
BianLzhaoMin d8d997c167 退租管理页面功能完善 2024-12-04 16:40:54 +08:00
BianLzhaoMin 02145d5b8e 代码优化 2024-12-04 12:10:50 +08:00
BianLzhaoMin c27af06779 代码优化 2024-12-04 11:57:24 +08:00
BianLzhaoMin 3b50ed9d0c 代码优化 2024-12-04 11:54:46 +08:00
BianLzhaoMin cbf3069a57 代码优化 2024-12-04 11:28:24 +08:00
BianLzhaoMin 2de641d81d 代码优化 2024-12-04 10:52:22 +08:00
BianLzhaoMin 399b067bdf 代码优化 2024-12-04 10:38:54 +08:00
BianLzhaoMin 96822c4fbf 商城优化 2024-12-04 08:44:24 +08:00
BianLzhaoMin aaa3488cfd 问题修复 2024-12-03 18:07:30 +08:00
BianLzhaoMin 98a864868c 代码优化 2024-12-03 16:00:10 +08:00
BianLzhaoMin a47974425a Merge branch 'dev-sy' 2024-12-03 13:55:20 +08:00
BianLzhaoMin 275b7d0038 代码完善 2024-12-03 13:51:08 +08:00
zzyuan 0f7d76a462 提交编辑接口 2024-12-03 13:31:59 +08:00
zzyuan 5685943ff9 装备列表整机重量必填去除 2024-12-03 09:49:52 +08:00
BianLzhaoMin 954cb755d2 冲突合并 2024-12-03 09:17:37 +08:00
BianLzhaoMin 59e5b61c81 样式优化 2024-12-03 09:16:20 +08:00
BianLzhaoMin 0e48968c9a 代码合并 2024-12-02 18:46:22 +08:00
BianLzhaoMin 676edb43bd 代码优化 2024-12-02 18:44:16 +08:00
BianLzhaoMin 72eb9ea652 冲突合并 2024-12-02 18:41:52 +08:00
BianLzhaoMin 653ae8fbb3 代码优化 2024-12-02 18:41:08 +08:00
BianLzhaoMin e47de79c5a 冲突合并 2024-12-02 18:37:35 +08:00
BianLzhaoMin 5875ffe08c 代码提交 2024-12-02 18:36:44 +08:00
BianLzhaoMin 8d49d0c89a 代码回退 2024-12-02 18:34:30 +08:00
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