Commit Graph

38 Commits

Author SHA1 Message Date
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
f4cae762e1 aftersale 2025-04-18 10:40:42 +08:00
57caec1805 调整 2025-04-17 23:05:48 +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
19b255c404 sth 2025-04-17 10:46:48 +08:00
a916c55786 开票 2025-04-16 17:51:41 +08:00
6b5d8df018 订单操作 2025-04-15 22:32:43 +08:00
017d9456c3 添加订单取消 2025-04-10 21:55:43 +08:00
6d9772e6c9 取消订单 2025-04-09 20:21:49 +08:00
c71ca560c8 添加订单报错 2025-04-08 22:07:27 +08:00
ed63962d56 派单员添加区域过滤 2025-04-02 22:43:14 +08:00
cee37cad21 订单数据 2025-04-01 23:03:44 +08:00
bbde06adb1 识别 2025-04-01 17:20:28 +08:00
xman
f9a6d1aa62 配置订单 2025-03-27 21:00:27 +08:00
xman
61e69718df 配置订单 2025-03-27 20:57:41 +08:00
10760ed9d0 添加订单 2025-03-23 18:19:34 +08:00
9b04e4d9a0 工人录入 2025-03-10 20:30:39 +08:00
dc60813220 城市选择 2025-03-10 15:49:47 +08:00
46596e3f30 城市选择 2025-03-10 15:26:58 +08:00
xman
bcfa38d16e sth 2025-03-10 14:09:57 +08:00
xman
34728ca220 sth 2025-03-10 14:04:45 +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
4f289c00d5 服务内容管理 2025-03-05 23:16:59 +08:00
08338b8373 添加服务内容管理 2025-03-04 22:04:28 +08:00
17990bfa98 订单模块 2025-03-03 17:38:06 +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
12d3a4b05a sth 2025-03-03 10:37:22 +08:00
12b0394ca0 添加服务内容管理 2025-03-02 18:59:24 +08:00
xman
f9822fc344 订单中转记录 2025-03-02 17:06:34 +08:00
282a1d79d3 地点添加拼音搜索 2025-03-02 16:04:10 +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