Commit Graph

171 Commits

Author SHA1 Message Date
BianLzhaoMin 1b344d37ad 提交 2024-12-01 16:39:19 +08:00
BianLzhaoMin 8061547cc5 Merge branch 'dev-sy' 2024-12-01 16:39:09 +08:00
BianLzhaoMin 8de2509ac5 提交 2024-12-01 16:39:00 +08:00
BianLzhaoMin d0ee98f7c9 代码优化 2024-12-01 16:38:50 +08:00
BianLzhaoMin 37b8f6170e 提交 2024-12-01 16:22:08 +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
jjLv 28ed5e2f30 Merge branch 'hongchao-dev' 2024-12-01 13:18:25 +08:00
jjLv 7758014fa1 订单管理 2024-12-01 12:52:50 +08:00
BianLzhaoMin 154a8f384e 提交 2024-11-29 13:58:18 +08:00
BianLzhaoMin 391c6fefcd 代码优化 2024-11-29 13:57:59 +08:00
BianLzhaoMin 241d8b2b01 提交 2024-11-29 13:30:32 +08:00
BianLzhaoMin 77558c5c6b Merge branch 'dev-sy' 2024-11-29 13:30:25 +08:00
BianLzhaoMin b601e0a584 提交 2024-11-29 13:30:14 +08:00
BianLzhaoMin c319692a07 代码有哈 2024-11-29 13:30:02 +08:00
BianLzhaoMin 43bd59bd0c 提交 2024-11-29 09:40:58 +08:00
BianLzhaoMin eb2d335d1e 代码调试 2024-11-29 09:40:29 +08:00
BianLzhaoMin fb9f427bb9 代码优化 2024-11-29 09:27:46 +08:00
BianLzhaoMin 45a2f0424a 代码完善 2024-11-28 19:07:24 +08:00
jjLv 29bc0bdb6f 所有的订单管理页面 2024-11-28 18:02: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 84f63f55cf Merge branch 'hongchao-dev' 2024-11-28 10:13:44 +08:00
jjLv 892df1aea0 页面错误解决 2024-11-28 10:10:17 +08:00
BianLzhaoMin 078f56595f 冲突合并 2024-11-28 10:04:51 +08:00
BianLzhaoMin 0592ff5ea1 需求大厅开发 2024-11-28 09:29:25 +08:00
BianLzhaoMin 71ec17b97a 冲突合并 2024-11-28 09:01:52 +08:00
BianLzhaoMin 9c80be269e 提交 2024-11-28 08:59:47 +08:00
BianLzhaoMin d44bb19d90 样式等问题优化 2024-11-28 08:59:34 +08:00
BianLzhaoMin 55d20a391a 提交 2024-11-27 18:23:16 +08:00
BianLzhaoMin 0c70fbdac4 需求列表功能完善 2024-11-27 18:22:35 +08:00
BianLzhaoMin a8a64b1056 冲突合并 2024-11-27 16:56:38 +08:00
BianLzhaoMin dcd1a9fd53 提交 2024-11-27 16:56:26 +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 8725fe5796 冲突合并 2024-11-27 15:17:34 +08:00
BianLzhaoMin d3f9ddc80a 提交 2024-11-27 15:17:10 +08:00
BianLzhaoMin 97349aaec8 寻源需求页面初步完善 2024-11-27 15:16:53 +08:00
jjLv c3f06d18ee 承租订单详情 2024-11-27 12:57:02 +08:00
zzyuan deaaa5508b 合并冲突 2024-11-27 10:07:32 +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 6a4520d056 提交 2024-11-27 09:17:22 +08:00
BianLzhaoMin a7facfd975 样式问题调整 2024-11-27 09:17:00 +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
BianLzhaoMin aabe6c4003 冲突合并 2024-11-26 18:27:16 +08:00
BianLzhaoMin 00dcf192e5 首页样式问题优化 2024-11-26 18:26:25 +08:00
BianLzhaoMin ff06debde4 冲突合并 2024-11-26 18:10:28 +08:00
BianLzhaoMin 009462b26d 预约车提交接口 删除接口调试完成 2024-11-26 18:09:58 +08:00
BianLzhaoMin be918726a3 Merge branch 'dev-sy' 2024-11-26 15:39:44 +08:00
BianLzhaoMin 3f9cd683a4 代码提交 2024-11-26 15:38:36 +08:00
BianLzhaoMin efce0fd406 增加忽略文件 2024-11-26 09:14:20 +08:00
BianLzhaoMin d237715c52 gitignore增加忽略文件 2024-11-26 09:12:17 +08:00
BianLzhaoMin 30cb53ac37 冲突合并 2024-11-25 18:04:52 +08:00
BianLzhaoMin c2f44146c4 首页以及装备共享大厅页面完善 2024-11-25 18:00:42 +08:00
BianLzhaoMin e45dbf5c32 冲突合并 2024-11-23 16:33:11 +08:00
BianLzhaoMin 5e423f3879 提交 2024-11-23 16:32:29 +08:00
BianLzhaoMin eecfd0c0e0 购物车等 页面提交 接口调试 2024-11-23 16:31:54 +08:00
BianLzhaoMin f46cd7b905 首页等模块完善 2024-11-22 18:03:09 +08:00
BianLzhaoMin e541f212e1 更改门户等样式问题 2024-11-20 11:16:18 +08:00
songyang e101f3e1bc 更新商品管理 2023-12-14 09:19:43 +08:00
songyang 0b9bcc4046 新增寻源比价 企业专区等菜单 2023-12-13 11:21:25 +08:00
songyang 0dfa819171 企业专区 寻源比较页面基础搭建 2023-12-12 09:58:08 +08:00
songyang 18ca331378 增加企业专区 寻源比较理由 2023-12-12 09:23:09 +08:00
songyang e9125881d2 更新首页背景图 2023-12-10 15:45:09 +08:00
songyang 31432758ef 更新登录页背景图 2023-12-10 15:27:49 +08:00
songyang ed526ece95 更新 2023-12-10 01:53:08 +08:00
songyang cc39ee8869 1223 2023-12-10 01:43:50 +08:00
13218645326 91da4dae26 自定义指令auth 封装 2023-12-09 22:29:54 +08:00
songyang a6e21486fe ii 2023-12-08 21:15:08 +08:00
songyang 1a2819b023 个人中心修改 2023-12-08 20:29:37 +08:00
songyang 7aed73fbbf 冲突合并 2023-12-08 19:10:39 +08:00
songyang 25eb983c91 更新 2023-12-08 19:09:37 +08:00
13218645326 7d2e8c236f 合并冲突 2023-12-08 17:50:38 +08:00
13218645326 223f796e30 上传文件 2023-12-08 17:49:14 +08:00
songyang 9b644b01e9 冲突提交 2023-12-08 17:41:16 +08:00
songyang 852539478b 订单管理优化 2023-12-08 17:38:59 +08:00
13218645326 eb07ba7eab 函数优化 2023-12-08 17:33:41 +08:00
13218645326 ab3d43f629 接口调用,打包配置 2023-12-08 17:03:26 +08:00
13218645326 ad5d31ccbc 合并代码 2023-12-08 15:18:01 +08:00
13218645326 ccd9f60a79 合并冲突 2023-12-08 15:09:00 +08:00
songyang 88b4dde528 订单列表字段更新 2023-12-08 15:05:47 +08:00
13218645326 22fc1dc911 接口调试 2023-12-08 15:04:24 +08:00
songyang 114f3bd4ce 添加服务协议 隐私协议跳转 2023-12-08 13:27:28 +08:00
songyang 74ffade539 热搜装备获取 2023-12-08 13:13:00 +08:00
songyang be333962e8 接口对接 2023-12-08 12:09:54 +08:00
songyang fb27448f50 接口统一更新 2023-12-08 10:10:04 +08:00
songyang cc90a75d85 冲突合并 2023-12-07 17:55:09 +08:00
songyang 95aeb1473f 订单管理更新 2023-12-07 17:48:36 +08:00
13218645326 85cc3f6649 商城 2023-12-07 13:34:05 +08:00
13218645326 99f52f3500 页面流程 2023-12-07 13:04:50 +08:00
13218645326 8c240eed96 订单样式 2023-12-06 17:47:57 +08:00
songyang 8d3fac9a3a 代码提交 2023-12-06 15:58:21 +08:00
songyang 0848782d52 冲突合并 2023-12-06 14:19:48 +08:00
songyang d6af74672d 商品入驻,商品上架接口正常调通 2023-12-06 14:17:22 +08:00
13218645326 b2f1010624 接口调试 2023-12-06 13:40:33 +08:00