Commit Graph

1215 Commits

Author SHA1 Message Date
xman
970ad2e58b sth 2025-03-06 15:49:37 +08:00
xman
dbe39286a3 sth 2025-03-05 23:19:36 +08:00
47d26431c7 Accept Merge Request #5: (feature/hant -> master)
Merge Request: 服务内容管理

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/5?initial=true
2025-03-05 23:18:13 +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
7c0b57fc93 Accept Merge Request #4: (feature/hant -> develop)
Merge Request: 添加服务内容管理

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/4?initial=true
2025-03-04 22:04:59 +08:00
08338b8373 添加服务内容管理 2025-03-04 22:04:28 +08:00
xman
bd66abc4a2 css 2025-03-04 16:08:54 +08:00
b93a626cfa Accept Merge Request #3: (feature/hant -> develop)
Merge Request: 订单编辑

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/3?initial=true
2025-03-04 10:18:06 +08:00
a12a83a549 订单编辑 2025-03-04 10:17:22 +08:00
xman
0d13556380 css 2025-03-04 10:02:58 +08:00
xman
7e102fc193 css 2025-03-04 10:02:40 +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
9492976638 css 2025-03-03 18:14:01 +08:00
xman
8e4b1f5bba income 2025-03-03 17:50:58 +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
b2b6507f98 派单 2025-03-03 15:37:50 +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
af3da67d86 订单异常 2025-03-02 16:31:49 +08:00
xman
771c99846d 订单异常 2025-03-02 16:30:13 +08:00
xman
6111032c33 订单异常 2025-03-02 16:28:25 +08:00
xman
819fd19105 订单异常 2025-03-02 16:27:29 +08:00
282a1d79d3 地点添加拼音搜索 2025-03-02 16:04:10 +08:00