Commit Graph

328 Commits

Author SHA1 Message Date
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