Commit Graph

51 Commits

Author SHA1 Message Date
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
0728974358 sth 2025-03-10 15:08:57 +08:00
xman
772c868da7 sth 2025-03-10 14:45:52 +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
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
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
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
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
17990bfa98 订单模块 2025-03-03 17:38:06 +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
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
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
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
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