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 |
|
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
|
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
|
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 |
|
|
|
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
|
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 |
|
|
|
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 |
|
xman
|
850c962340
|
添加日志
|
2025-04-14 15:52:54 +08:00 |
|
xman
|
b907583658
|
添加日志
|
2025-04-14 11:28:10 +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 |
|
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 |
|
|
|
ed63962d56
|
派单员添加区域过滤
|
2025-04-02 22:43:14 +08:00 |
|
|
|
cee37cad21
|
订单数据
|
2025-04-01 23:03:44 +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 |
|
xman
|
c5db908603
|
hook
|
2025-04-01 15:46:37 +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 |
|
xman
|
65aea57786
|
dispatch 增加变更日志
|
2025-03-31 11:33:44 +08:00 |
|
xman
|
b77ccfe5f8
|
dispatch 增加变更日志
|
2025-03-31 11:28:33 +08:00 |
|
xman
|
7a4bafcc12
|
dispatch 日志
|
2025-03-31 11:15:08 +08:00 |
|
xman
|
86a1df86de
|
配置订单权限
|
2025-03-31 10:48:39 +08:00 |
|
zhuyu
|
7e535c03b0
|
feature: task
|
2025-03-30 17:59:00 +08:00 |
|
zhuyu
|
b5c32bb8ad
|
Merge branch 'develop' into feature/zy
|
2025-03-30 16:54:49 +08:00 |
|
|
|
e8a7dbddc3
|
订单数据
|
2025-03-30 16:29:32 +08:00 |
|
|
|
e52eb48f0b
|
自动派单
|
2025-03-30 15:55:20 +08:00 |
|
xman
|
09e94cd7b3
|
配置订单
|
2025-03-29 21:40:16 +08:00 |
|
xman
|
d3d63f4872
|
修改派单
|
2025-03-29 20:54:18 +08:00 |
|
|
|
2b32306511
|
添加管理员区域配置
|
2025-03-29 19:05:22 +08:00 |
|
zhuyu
|
a41e1e5408
|
feature: task
|
2025-03-28 11:11:22 +08:00 |
|
xman
|
6f9052e0fc
|
配置订单
|
2025-03-27 21:27:44 +08:00 |
|
xman
|
66407c5adf
|
配置订单
|
2025-03-27 20:49:09 +08:00 |
|
xman
|
d8ae933e81
|
配置订单
|
2025-03-27 20:36:30 +08:00 |
|
xman
|
d6d9db14e4
|
配置订单
|
2025-03-27 20:31:38 +08:00 |
|
xman
|
39bee27491
|
配置订单
|
2025-03-27 20:24:52 +08:00 |
|
xman
|
2c9c5bd894
|
配置订单
|
2025-03-27 17:32:06 +08:00 |
|
xman
|
dc1c098acc
|
配置订单
|
2025-03-27 17:29:51 +08:00 |
|
xman
|
e445d84761
|
配置订单
|
2025-03-27 17:18:28 +08:00 |
|
xman
|
3541b7675e
|
任务完成
|
2025-03-27 16:28:53 +08:00 |
|
xman
|
42be630a28
|
任务完成
|
2025-03-27 16:28:22 +08:00 |
|
xman
|
2e9bd0d804
|
cancel任务
|
2025-03-27 14:56:07 +08:00 |
|
xman
|
80a65b325f
|
cancel任务
|
2025-03-27 14:33:49 +08:00 |
|
xman
|
4c26d857e8
|
sth
|
2025-03-26 20:12:03 +08:00 |
|
zhuyu
|
df0aae4a22
|
feature: task
|
2025-03-26 14:24:42 +08:00 |
|
zhuyu
|
e281b3c65f
|
feature: task
|
2025-03-25 18:20:03 +08:00 |
|
zhuyu
|
7b268b1b84
|
feature: task
|
2025-03-25 15:46:52 +08:00 |
|
xman
|
d986cd7b69
|
sth
|
2025-03-25 09:22:41 +08:00 |
|
xman
|
8c4ce33384
|
sth
|
2025-03-24 21:40:45 +08:00 |
|
zhuyu
|
50e27370dd
|
feature: task
|
2025-03-24 18:09:16 +08:00 |
|
zhuyu
|
1c76cdf45e
|
feature: task
|
2025-03-24 15:23:06 +08:00 |
|
zhuyu
|
c5a37912c0
|
feature: task
|
2025-03-24 11:44:35 +08:00 |
|
zhuyu
|
d7462f828f
|
Merge branch 'develop' into feature/zy
|
2025-03-24 09:50:42 +08:00 |
|
zhuyu
|
4a00bf7b5f
|
feature: task
|
2025-03-23 22:10:20 +08:00 |
|
|
|
10760ed9d0
|
添加订单
|
2025-03-23 18:19:34 +08:00 |
|
zhuyu
|
a051e4136f
|
feature: task
|
2025-03-22 18:47:00 +08:00 |
|
zhuyu
|
30ecfd1f65
|
feature: task
|
2025-03-22 18:24:24 +08:00 |
|
zhuyu
|
7837c6df0b
|
feature: task
|
2025-03-21 18:00:59 +08:00 |
|
zhuyu
|
f8b0af6057
|
feature: task
|
2025-03-21 17:56:26 +08:00 |
|
zhuyu
|
f3ee736f1c
|
feature: task
|
2025-03-21 17:55:41 +08:00 |
|
xman
|
71d5546148
|
sth
|
2025-03-20 21:39:38 +08:00 |
|
|
|
f6e39867df
|
派单
|
2025-03-14 20:33:29 +08:00 |
|
|
|
2369446995
|
派单
|
2025-03-14 19:19:31 +08:00 |
|
|
|
bf4d2cf9ee
|
派单
|
2025-03-14 18:22:34 +08:00 |
|
|
|
b572345345
|
派单
|
2025-03-13 18:00:44 +08:00 |
|
|
|
e1a30208b9
|
派单逻辑
|
2025-03-11 23:20:44 +08:00 |
|
|
|
3e780bf5c6
|
添加地区筛选
|
2025-03-10 23:07:20 +08:00 |
|
zhuyu
|
bf23a69626
|
feature: task
|
2025-03-10 22:04:09 +08:00 |
|
|
|
d028613923
|
Accept Merge Request #10: (feature/hant -> develop)
Merge Request: 工人录入
Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/10?initial=true
|
2025-03-10 20:31:59 +08:00 |
|
|
|
9b04e4d9a0
|
工人录入
|
2025-03-10 20:30:39 +08:00 |
|
xman
|
74da2843ad
|
sth
|
2025-03-10 17:53:16 +08:00 |
|
xman
|
d81a1a14b7
|
Merge branch 'feature/xman' into develop
|
2025-03-10 17:06:52 +08:00 |
|
xman
|
ae8e0a86e4
|
sth
|
2025-03-10 16:39:30 +08:00 |
|
xman
|
0738e34e68
|
sth
|
2025-03-10 16:00:43 +08:00 |
|
xman
|
a6114e498b
|
Merge branch 'feature/xman' into develop
|
2025-03-10 15:55:44 +08:00 |
|
xman
|
e5df57d162
|
sth
|
2025-03-10 15:55:20 +08:00 |
|
|
|
93fb6a1b9c
|
Accept Merge Request #9: (feature/hant -> develop)
Merge Request: 城市选择
Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/9?initial=true
|
2025-03-10 15:51:29 +08:00 |
|
|
|
dc60813220
|
城市选择
|
2025-03-10 15:49:47 +08:00 |
|
xman
|
a7eb4f5615
|
Merge branch 'feature/xman' into develop
|
2025-03-10 15:37:42 +08:00 |
|
xman
|
b00990ebe9
|
sth
|
2025-03-10 15:35:36 +08:00 |
|
|
|
738f3973d6
|
Accept Merge Request #8: (feature/hant -> develop)
Merge Request: 黑明单管理
Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/8
|
2025-03-10 15:28:44 +08:00 |
|
|
|
bf13e11900
|
Merge remote-tracking branch 'origin/feature/hant' into feature/hant
|
2025-03-10 15:27:18 +08:00 |
|
|
|
46596e3f30
|
城市选择
|
2025-03-10 15:26:58 +08:00 |
|
xman
|
ec3b64b123
|
sth
|
2025-03-10 15:16:40 +08:00 |
|
xman
|
0728974358
|
sth
|
2025-03-10 15:08:57 +08:00 |
|
xman
|
772c868da7
|
sth
|
2025-03-10 14:45:52 +08:00 |
|
xman
|
59420b045b
|
sth
|
2025-03-10 14:39:43 +08:00 |
|
xman
|
0738ac092f
|
sth
|
2025-03-10 14:27:10 +08:00 |
|
xman
|
acbe7be179
|
sth
|
2025-03-10 14:16:49 +08:00 |
|
xman
|
e00dd9ce0f
|
sth
|
2025-03-10 14:11:34 +08:00 |
|
xman
|
bcfa38d16e
|
sth
|
2025-03-10 14:09:57 +08:00 |
|
xman
|
34728ca220
|
sth
|
2025-03-10 14:04:45 +08:00 |
|
xman
|
c296c743db
|
sth
|
2025-03-10 13:58:04 +08:00 |
|
xman
|
54d79c0197
|
sth
|
2025-03-10 13:57:39 +08:00 |
|
xman
|
eb7e22ca40
|
sth
|
2025-03-10 11:49:38 +08:00 |
|
xman
|
1729d3cf8b
|
sth
|
2025-03-10 11:28:47 +08:00 |
|
xman
|
311e6f8b86
|
sth
|
2025-03-10 10:43:04 +08:00 |
|
xman
|
141362cc51
|
sth
|
2025-03-10 10:41:43 +08:00 |
|
xman
|
ef30554fa2
|
Merge branch 'develop' into feature/xman
|
2025-03-10 09:52:31 +08:00 |
|
|
|
650d78b73a
|
黑明单管理
|
2025-03-09 21:40:36 +08:00 |
|
|
|
328d08e1d8
|
订单录入
|
2025-03-08 16:39:37 +08:00 |
|
|
|
7228cc267a
|
订单录入
|
2025-03-08 16:24:54 +08:00 |
|
|
|
7690b1e40f
|
添加优惠码，工作机
|
2025-03-08 15:39:17 +08:00 |
|
|
|
72523df3fa
|
店铺管理
|
2025-03-06 22:56:05 +08:00 |
|
|
|
60d4baae4e
|
Merge remote-tracking branch 'origin/develop' into feature/hant
|
2025-03-06 21:03:17 +08:00 |
|
zhuyu
|
b740f4ad8f
|
feature: task
|
2025-03-06 16:37:44 +08:00 |
|
xman
|
dc20f54a4e
|
sth
|
2025-03-06 15:50:31 +08:00 |
|
xman
|
970ad2e58b
|
sth
|
2025-03-06 15:49:37 +08:00 |
|
xman
|
dbe39286a3
|
sth
|
2025-03-05 23:19:36 +08:00 |
|
|
|
4f289c00d5
|
服务内容管理
|
2025-03-05 23:16:59 +08:00 |
|
xman
|
204afd4005
|
Merge branch 'feature/xman' into develop
|
2025-03-05 20:56:39 +08:00 |
|
xman
|
6ffc678158
|
sth
|
2025-03-05 20:56:22 +08:00 |
|
xman
|
ce92078a61
|
Merge branch 'feature/xman' into develop
|
2025-03-05 20:53:49 +08:00 |
|
xman
|
a7e4ce07ab
|
回访
|
2025-03-05 20:53:32 +08:00 |
|
xman
|
94c6ba065e
|
Merge branch 'feature/xman' into develop
|
2025-03-05 20:52:22 +08:00 |
|
xman
|
07c4f93ab7
|
回访
|
2025-03-05 20:51:43 +08:00 |
|
xman
|
072b2aa3bd
|
Merge branch 'feature/xman' into develop
|
2025-03-05 17:19:01 +08:00 |
|
xman
|
4e42993114
|
回访
|
2025-03-05 17:18:28 +08:00 |
|
xman
|
21f866d286
|
作用域条件
|
2025-03-05 17:06:22 +08:00 |
|
|
|
08338b8373
|
添加服务内容管理
|
2025-03-04 22:04:28 +08:00 |
|
xman
|
bd66abc4a2
|
css
|
2025-03-04 16:08:54 +08:00 |
|
|
|
a12a83a549
|
订单编辑
|
2025-03-04 10:17:22 +08:00 |
|
xman
|
ecc1874e0c
|
Merge branch 'develop' into feature/xman
|
2025-03-04 09:49:58 +08:00 |
|
xman
|
2dabba3ae7
|
css
|
2025-03-04 09:49:31 +08:00 |
|
|
|
d9916c782d
|
Accept Merge Request #2: (feature/hant -> develop)
Merge Request: 订单模块
Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/2?initial=true
|
2025-03-03 22:00:24 +08:00 |
|
xman
|
bec0aec8f9
|
log
|
2025-03-03 17:38:12 +08:00 |
|
|
|
17990bfa98
|
订单模块
|
2025-03-03 17:38:06 +08:00 |
|
xman
|
13b6bf42ae
|
log
|
2025-03-03 17:38:00 +08:00 |
|
xman
|
8125df124a
|
师傅
|
2025-03-03 17:37:30 +08:00 |
|
|
|
2a2f420de1
|
Accept Merge Request #1: (feature/hant -> develop)
Merge Request: Merge remote-tracking branch 'origin/develop' into feature/hant
Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/1?initial=true
|
2025-03-03 17:14:22 +08:00 |
|
|
|
737a495884
|
Merge remote-tracking branch 'origin/develop' into feature/hant
# Conflicts:
# public/assets/js/backend/order.js
|
2025-03-03 17:10:26 +08:00 |
|
xman
|
0ce0c7baca
|
师傅
|
2025-03-03 15:59:08 +08:00 |
|
xman
|
3857b28fcc
|
师傅
|
2025-03-03 15:58:16 +08:00 |
|
xman
|
c7d2e8a049
|
师傅
|
2025-03-03 15:54:54 +08:00 |
|
xman
|
26fbe129b3
|
派单
|
2025-03-03 15:36:51 +08:00 |
|
xman
|
69bf7242fd
|
orderLog
|
2025-03-03 14:57:03 +08:00 |
|
xman
|
6f46ca56b2
|
orderLog
|
2025-03-03 13:55:34 +08:00 |
|
xman
|
716d1e4d63
|
hook配置
|
2025-03-03 13:39:49 +08:00 |
|
xman
|
12d3a4b05a
|
sth
|
2025-03-03 10:37:22 +08:00 |
|
xman
|
e88a74138b
|
售后
|
2025-03-03 10:25:35 +08:00 |
|
|
|
12b0394ca0
|
添加服务内容管理
|
2025-03-02 18:59:24 +08:00 |
|
xman
|
f9822fc344
|
订单中转记录
|
2025-03-02 17:06:34 +08:00 |
|
xman
|
c912bc4ec3
|
订单中转记录
|
2025-03-02 16:45:10 +08:00 |
|
xman
|
901a6ed86c
|
订单中转记录
|
2025-03-02 16:44:56 +08:00 |
|
xman
|
819fd19105
|
订单异常
|
2025-03-02 16:27:29 +08:00 |
|
|
|
282a1d79d3
|
地点添加拼音搜索
|
2025-03-02 16:04:10 +08:00 |
|
xman
|
ec535b2a70
|
收款记录
|
2025-03-02 14:17:18 +08:00 |
|
|
|
1a9a5bea70
|
订单复制
|
2025-03-01 17:10:35 +08:00 |
|
|
|
e6df60292a
|
订单复制
|
2025-03-01 16:53:47 +08:00 |
|
|
|
43691f78ef
|
订单录入
|
2025-03-01 14:34:29 +08:00 |
|
|
|
5e17d3025b
|
订单模块
|
2025-02-28 20:24:38 +08:00 |
|
|
|
6aeb0cdf01
|
Dashboard.php
|
2025-02-26 16:03:09 +08:00 |
|
|
|
2416fa161a
|
first commit
|
2025-02-24 14:41:39 +08:00 |
|
