Commit Graph

500 Commits

Author SHA1 Message Date
苟川东
83982cac9f feat: 工作台页面调整 2025-05-09 15:06:19 +08:00
苟川东
d3df3a1d41 feat: 工作台页面调整 2025-05-09 11:47:45 +08:00
gcd
4066e74c1e feat: 工单列表调整 2025-05-08 22:08:33 +08:00
gcd
05529db202 feat: 工单支持修改上门时间 2025-05-08 20:52:12 +08:00
苟川东
c4adcf28a5 feat: 优化 2025-05-08 18:06:13 +08:00
xman
75e56d8bbb sth 2025-05-08 14:45:42 +08:00
4d32fe4a5b 面板 2025-05-07 23:34:30 +08:00
gcd
087315f2cf feat: 非派单状态,隐藏用户地址 2025-05-07 22:18:45 +08:00
gcd
f39f3a3ce6 feat: 细节优化 2025-05-07 22:04:33 +08:00
苟川东
c6b986f06f feat: 隐藏客户名 2025-05-07 20:13:24 +08:00
476e61e71d Accept Merge Request #39: (feature/hant -> develop)
Merge Request: 面板

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/39?initial=true
2025-05-06 23:14:25 +08:00
85d9e8ad2b 面板 2025-05-06 23:13:42 +08:00
16864b967b Merge remote-tracking branch 'origin/feature/hant' into feature/hant 2025-05-06 18:15:20 +08:00
f3a692243b 数据 2025-05-06 18:15:03 +08:00
xman
e947683638 sth 2025-04-29 14:30:47 +08:00
xman
d5dd883101 sth 2025-04-29 14:24:01 +08:00
xman
f05b93c678 Merge remote-tracking branch 'origin/develop' into develop 2025-04-29 09:36:34 +08:00
xman
8fa06c3a53 sth 2025-04-29 09:36:19 +08:00
大狗哥
f4c3362733 Accept Merge Request #38: (feature/dgg -> develop)
Merge Request: feat: 平台收款不需要提交收款相关信息

Created By: @大狗哥
Accepted By: @大狗哥
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/38
2025-04-28 23:02:58 +08:00
gcd
62df6dda50 feat: 平台收款不需要提交收款相关信息 2025-04-28 23:02:10 +08:00
ad049915f9 Merge remote-tracking branch 'origin/develop' into feature/hant 2025-04-28 22:12:23 +08:00
69cd09a63e 订单面板 2025-04-28 20:07:32 +08:00
xman
d4aea44afc sth 2025-04-28 16:50:53 +08:00
xman
3fb6925a8f sth 2025-04-28 16:37:32 +08:00
苟川东
c99ef60788 feat: 异常支持重复上报 2025-04-28 16:28:16 +08:00
xman
a17d218dcf sth 2025-04-28 15:58:50 +08:00
xman
b0739941af sth 2025-04-28 15:42:48 +08:00
d3f5829641 Merge remote-tracking branch 'origin/feature/hant' into feature/hant 2025-04-28 15:16:23 +08:00
xman
df63a6c89f sth 2025-04-28 10:22:20 +08:00
xman
4946ca4526 sth 2025-04-27 09:58:17 +08:00
xman
bf418b8e3a sth 2025-04-25 17:11:34 +08:00
xman
2b8cb7150b sth 2025-04-25 16:55:00 +08:00
xman
b27654d765 sth 2025-04-25 16:37:07 +08:00
xman
78623550ba sth 2025-04-25 16:22:05 +08:00
xman
0c2629f236 sth 2025-04-25 14:11:58 +08:00
xman
82447b27ad sth 2025-04-25 14:05:47 +08:00
5aba36fe1b Accept Merge Request #36: (feature/hant -> develop)
Merge Request: 看板

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/36?initial=true
2025-04-24 23:05:48 +08:00
f3e9f2640f 看板 2025-04-24 23:04:15 +08:00
xman
df587e31b5 sth 2025-04-24 17:03:12 +08:00
xman
9f9193a2c8 sth 2025-04-24 16:58:38 +08:00
大狗哥
ac3e4c8ba2 Accept Merge Request #35: (feature/dgg -> develop)
Merge Request: feat: 用户协议、隐私政策

Created By: @大狗哥
Accepted By: @大狗哥
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/35
2025-04-24 16:21:33 +08:00
苟川东
25c3dc4033 feat: 用户协议、隐私政策 2025-04-24 16:20:19 +08:00
xman
06715272c8 sth 2025-04-24 16:10:12 +08:00
xman
00a3f2bb21 sth 2025-04-24 10:02:24 +08:00
苟川东
eb91a7b9a3 feat: 删除无用代码 2025-04-24 09:18:35 +08:00
689376fa69 Accept Merge Request #34: (feature/hant -> develop)
Merge Request: 看板

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/34
2025-04-23 23:10:23 +08:00
33ca7a52a7 看板 2025-04-23 22:55:41 +08:00
大狗哥
0617ba4ea7 Accept Merge Request #33: (feature/dgg -> develop)
Merge Request: fix: 调试接口

Created By: @大狗哥
Accepted By: @大狗哥
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/33?initial=true
2025-04-23 22:55:40 +08:00
gcd
7431a96291 fix: 调试接口 2025-04-23 22:55:19 +08:00
大狗哥
10e0a37ad6 Accept Merge Request #32: (feature/dgg -> develop)
Merge Request: feat: 移除多余代码

Created By: @大狗哥
Accepted By: @大狗哥
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/32?initial=true
2025-04-23 22:18:00 +08:00
gcd
bcf2a099df feat: 移除多余代码 2025-04-23 22:17:20 +08:00
6078af68d8 Merge remote-tracking branch 'origin/develop' into feature/hant 2025-04-23 19:39:57 +08:00
xman
ddb58f0067 sth 2025-04-23 17:51:46 +08:00
xman
c7cb40a331 sth 2025-04-23 17:32:10 +08:00
xman
11c530b996 数据统计 2025-04-23 16:57:03 +08:00
xman
c4610806ad 派单员统计列表 2025-04-23 15:36:58 +08:00
大狗哥
3184a978a6 Accept Merge Request #31: (feature/dgg -> develop)
Merge Request: feat: 定期更新用户位置

Created By: @大狗哥
Accepted By: @大狗哥
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/31?initial=true
2025-04-23 00:12:59 +08:00
gcd
c67d511ee7 feat: 定期更新用户位置 2025-04-23 00:04:20 +08:00
大狗哥
f22f3547f4 Accept Merge Request #30: (feature/dgg -> develop)
Merge Request: fix: 修复派单详情无图片时,接口报错问题

Created By: @大狗哥
Accepted By: @大狗哥
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/30?initial=true
2025-04-22 23:27:21 +08:00
gcd
4dbd2a3bef fix: 修复派单详情无图片时,接口报错问题 2025-04-22 23:27:02 +08:00
d64fea7ac2 看板 2025-04-22 23:18:17 +08:00
大狗哥
d02d5b2063 Accept Merge Request #29: (feature/dgg -> develop)
Merge Request: feat: 微信登录兼容 "w7corp/easywechat": "^6.17"

Created By: @大狗哥
Accepted By: @大狗哥
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/29
2025-04-22 23:09:30 +08:00
gcd
97a8e526da feat: 微信登录兼容 "w7corp/easywechat": "^6.17" 2025-04-22 23:09:16 +08:00
gcd
3bc66da95a feat: 微信登录兼容 "w7corp/easywechat": "^6.17" 2025-04-22 23:07:30 +08:00
苟川东
fb0c43e309 feat: 微信登录调整 2025-04-22 22:16:51 +08:00
xman
490e1232f0 统计 2025-04-22 18:13:43 +08:00
xman
dc7cb57adf sth 2025-04-22 17:36:35 +08:00
xman
35f7a0d313 统计 2025-04-22 17:35:33 +08:00
xman
8f45a42d84 sth 2025-04-22 16:03:32 +08:00
xman
32db3c801f sth 2025-04-22 14:49:04 +08:00
xman
5ce43cf42d 新增材料成本 2025-04-22 14:36:08 +08:00
xman
c004a039b4 sth 2025-04-22 13:53:26 +08:00
xman
3c829efb54 sth 2025-04-22 13:49:15 +08:00
xman
f5d92ae1fe sth 2025-04-22 10:50:44 +08:00
gcd
a47d1944ed Merge branch 'develop' of e.coding.net:g-bcrc3009/allocatr/allocatr into feature/dgg 2025-04-21 23:09:59 +08:00
gcd
1fab1a1c3f fix: 修复订单备注显示错误 2025-04-21 23:08:20 +08:00
xman
bc268830ab sth 2025-04-21 16:55:44 +08:00
xman
c55bdf99b7 sth 2025-04-21 16:29:25 +08:00
苟川东
9762d89d4e feat: 工作台全部订单增加已拒接的订单 2025-04-21 14:57:49 +08:00
xman
68f869f0bb sth 2025-04-21 14:41:20 +08:00
xman
340e9fecd7 sth 2025-04-21 14:36:29 +08:00
xman
82e4679623 sth 2025-04-21 14:32:37 +08:00
xman
1f4e618561 sth 2025-04-21 14:27:48 +08:00
xman
ca133f4153 sth 2025-04-21 14:18:11 +08:00
xman
d7046959aa sth 2025-04-21 11:59:42 +08:00
xman
382d410bea sth 2025-04-21 10:57:51 +08:00
xman
0c14dba469 sth 2025-04-21 10:35:15 +08:00
xman
1abb664a35 sth 2025-04-21 10:27:14 +08:00
xman
06e6261498 sth 2025-04-21 10:20:03 +08:00
xman
ad6e114d2b sth 2025-04-21 10:19:22 +08:00
xman
2e61682f94 sth 2025-04-21 10:17:16 +08:00
gcd
f68b3571fc feat: 师傅备注 2025-04-20 23:47:00 +08:00
gcd
1d0a4d54c0 feat: 上报异常 2025-04-20 22:51:50 +08:00
苟川东
72483a53be feat: 订单异常 2025-04-20 14:02:17 +08:00
苟川东
84343e17e2 feat: 异常原因列表接口 2025-04-20 09:37:25 +08:00
苟川东
fe91ab5365 feat: 拒接优化 2025-04-20 08:46:05 +08:00
苟川东
6b6fb2cf86 feat: 师傅拒接支持填写原因 2025-04-19 23:44:07 +08:00
eef4c1a5b4 Accept Merge Request #24: (feature/hant -> develop)
Merge Request: 调整

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/24?initial=true
2025-04-19 22:17:55 +08:00
6ab562edf4 调整 2025-04-19 22:16:36 +08:00
xman
f64c6808f3 sth 2025-04-19 21:51:10 +08:00
xman
9c0953a45c sth 2025-04-19 21:42:11 +08:00
苟川东
ebe4f9549a feat: 完成服务接口 2025-04-19 21:40:42 +08:00
xman
acfb1a7371 审核 2025-04-19 21:27:54 +08:00
xman
910e720583 审核 2025-04-19 21:20:54 +08:00
69642477be 调整 2025-04-19 17:52:55 +08:00
1a285481dc Merge remote-tracking branch 'origin/develop' into feature/hant
# Conflicts:
#	application/admin/controller/aftersales/Aftersale.php
#	application/admin/view/aftersales/aftersale/add.html
#	public/assets/js/backend/order.js
2025-04-19 17:50:09 +08:00
12ab4135ca 调整 2025-04-19 17:44:32 +08:00
苟川东
f6dfba93f7 feat: 图片支持多张上传 2025-04-19 14:32:49 +08:00
xman
314fa09210 审核 2025-04-18 18:12:33 +08:00
xman
b5c9f6e29b 审核 2025-04-18 17:25:28 +08:00
xman
9d055a1dfe 审核 2025-04-18 17:19:04 +08:00
xman
fb99b2dbe6 审核 2025-04-18 16:54:52 +08:00
xman
bb80209ffb cmd 2025-04-18 16:37:28 +08:00
xman
b50c182e24 cmd 2025-04-18 15:55:18 +08:00
xman
579166b5e9 cmd 2025-04-18 15:47:37 +08:00
xman
c700360d48 cmd 2025-04-18 15:10:18 +08:00
xman
a45046c5f0 cmd 2025-04-18 15:09:26 +08:00
xman
417c62ce37 cmd 2025-04-18 14:52:54 +08:00
xman
c6bb2deead cmd 2025-04-18 14:52:02 +08:00
xman
c526249f6a cmd 2025-04-18 14:39:12 +08:00
xman
88aa8696ab aftersale 2025-04-18 14:28:38 +08:00
xman
d3d4f6c2e9 aftersale 2025-04-18 14:22:46 +08:00
xman
9774fb8385 aftersale 2025-04-18 13:55:09 +08:00
xman
02fe2e32d8 aftersale 2025-04-18 13:39:04 +08:00
xman
d3f794a517 aftersale 2025-04-18 13:38:30 +08:00
xman
480e7361a9 aftersale 2025-04-18 13:37:53 +08:00
xman
f4cae762e1 aftersale 2025-04-18 10:40:42 +08:00
57caec1805 调整 2025-04-17 23:05:48 +08:00
xman
76aa236cbd sth 2025-04-17 18:05:01 +08:00
xman
dcc87b85ec sth 2025-04-17 17:38:54 +08:00
xman
5417d0daa9 sth 2025-04-17 17:30:29 +08:00
xman
a138871cc2 sth 2025-04-17 17:20:20 +08:00
xman
4d0890c757 sth 2025-04-17 17:14:46 +08:00
xman
c80bd8aacb sth 2025-04-17 17:04:58 +08:00
xman
d598ecbde2 sth 2025-04-17 16:59:47 +08:00
xman
3af4172660 sth 2025-04-17 16:55:10 +08:00
苟川东
a79064eedc feat: 完成服务接口 2025-04-17 16:38:19 +08:00
苟川东
da72759c52 feat: 提交上门信息接口 2025-04-17 16:25:53 +08:00
苟川东
cfb91dc2aa feat: 提交上门信息接口 2025-04-17 16:20:13 +08:00
苟川东
04dd0ac106 feat: 提交上门信息接口 2025-04-17 15:40:07 +08:00
苟川东
3a2b25109b feat: 获取 OSS 上传文件参数 2025-04-17 14:49:27 +08:00
e36704bd28 Accept Merge Request #21: (feature/hant -> develop)
Merge Request: 开票

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/21?initial=true
2025-04-17 11:18:45 +08:00
1ac760222c 开票 2025-04-17 11:17:40 +08:00
xman
64b2c282ff sth 2025-04-17 10:14:26 +08:00
a916c55786 开票 2025-04-16 17:51:41 +08:00
xman
9489f84992 Merge branch 'feature/xman' into develop 2025-04-16 10:34:37 +08:00
xman
91b63727f8 sth 2025-04-16 10:34:26 +08:00
xman
72d03eba45 Merge branch 'feature/xman' into develop 2025-04-16 10:31:50 +08:00
xman
5bce8cf36c sth 2025-04-16 10:27:30 +08:00
苟川东
9e76852e48 Merge branch 'develop' of e.coding.net:g-bcrc3009/allocatr/allocatr into feature/dgg
# Conflicts:
#	composer.json
2025-04-16 09:25:31 +08:00
苟川东
3cd36d1301 feat: 获取 OSS 上传文件参数 2025-04-16 09:23:15 +08:00
16aeb48c8f Accept Merge Request #20: (feature/hant -> develop)
Merge Request: 订单操作

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/20?initial=true
2025-04-15 22:36:09 +08:00
6b5d8df018 订单操作 2025-04-15 22:32:43 +08:00
xman
dd67cb9d13 添加日志 2025-04-15 17:58:27 +08:00
苟川东
e25a2c29ea feat: 预约上门时间 2025-04-14 16:45:47 +08:00
xman
850c962340 添加日志 2025-04-14 15:52:54 +08:00
xman
b907583658 添加日志 2025-04-14 11:28:10 +08:00
xman
36d16437bf 添加日志 2025-04-14 11:05:15 +08:00
xman
ed8d1d420c 添加日志 2025-04-14 10:53:18 +08:00
xman
b042e4904c 添加日志 2025-04-14 10:44:19 +08:00
xman
4da8536a47 添加日志 2025-04-14 10:32:08 +08:00
xman
25f1c91271 添加日志 2025-04-14 10:28:53 +08:00
苟川东
e986fc8dbd feat: 新增派单详情接口 2025-04-14 10:06:27 +08:00
苟川东
293b737246 feat: 新增派单详情接口 2025-04-13 23:04:55 +08:00
xman
02cd6b94c7 sth 2025-04-12 20:08:12 +08:00
xman
8424126ffd sth 2025-04-12 19:54:05 +08:00
xman
ebc11c0513 sth 2025-04-12 19:32:15 +08:00
xman
d4521e4410 sth 2025-04-12 18:46:27 +08:00
017d9456c3 添加订单取消 2025-04-10 21:55:43 +08:00
6d9772e6c9 取消订单 2025-04-09 20:21:49 +08:00
xman
c4f4653568 record 2025-04-09 11:32:22 +08:00
c71ca560c8 添加订单报错 2025-04-08 22:07:27 +08:00
a36fe34eab Merge remote-tracking branch 'origin/develop' into feature/hant 2025-04-08 20:47:45 +08:00
zhuyu
cf1b76c0ab Accept Merge Request #16: (feature/zy -> develop)
Merge Request: feature: task

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/16?initial=true
2025-04-07 09:25:32 +08:00
zhuyu
85ae934110 feature: task 2025-04-06 15:42:10 +08:00
zhuyu
0c557472c7 feature: task 2025-04-06 15:32:08 +08:00
zhuyu
fad7b7d4a3 feature: task 2025-04-06 14:10:46 +08:00
zhuyu
a89e298e88 feature: task 2025-04-06 14:05:52 +08:00
zhuyu
0bd41bfb0f feature: task 2025-04-06 13:58:37 +08:00
zhuyu
a3629141d3 feature: task 2025-04-06 13:41:02 +08:00
gcd
b06ae1a1ae feat: 工作台订单统计接口 2025-04-03 17:26:53 +08:00
ed63962d56 派单员添加区域过滤 2025-04-02 22:43:14 +08:00
cee37cad21 订单数据 2025-04-01 23:03:44 +08:00
gcd
e2031cb75b feat: 工作台订单接口 2025-04-01 22:48:14 +08:00
gcd
11ec750e49 师傅接单 2025-04-01 20:56:11 +08:00
0a333ab742 Merge remote-tracking branch 'origin/develop' into feature/hant
# Conflicts:
#	composer.json
#	composer.lock
2025-04-01 20:32:13 +08:00
xman
fb650c85cb record 2025-04-01 18:20:23 +08:00
xman
ee367f5a76 record 2025-04-01 18:19:15 +08:00
xman
11a4ff1916 record 2025-04-01 18:07:18 +08:00
bbde06adb1 识别 2025-04-01 17:20:28 +08:00
xman
d037ec193d record 2025-04-01 17:19:25 +08:00
gcd
7ace9cc65c feat: 首页接口调整 2025-04-01 16:29:11 +08:00
xman
c5db908603 hook 2025-04-01 15:46:37 +08:00
xman
163f4785ec hook 2025-04-01 12:00:41 +08:00
xman
01f4316d80 hook 2025-03-31 15:59:33 +08:00
xman
24dc01baf3 hook 2025-03-31 15:52:30 +08:00
xman
8316a1dfdc hook 2025-03-31 15:15:41 +08:00
xman
79fe024c06 text 2025-03-31 14:57:18 +08:00
xman
501b1a7bde text 2025-03-31 14:27:41 +08:00
xman
066c6fb584 text 2025-03-31 14:15:54 +08:00