xt / xcx-book · Commits

29 Aug, 2019

4 commits

fixbug 接单时间跨天
 fc6c533b

by vking
2019-08-29 10:52:38 +0800
Browse Files
fixbug 我的订单
 56ab15ae

by vking
2019-08-29 10:45:25 +0800
Browse Files
merge haowuquan
dfea1455

by vking
2019-08-29 09:59:10 +0800
Browse Files
haowuquan
59d05ff0

by vking
2019-08-29 09:49:52 +0800
Browse Files

28 Aug, 2019

13 commits

Merge remote-tracking branch 'origin/master'
656cdfc8

by vking
2019-08-28 16:45:47 +0800
Browse Files
使用下时段进行判断
6c2f60b7

by vking
2019-08-28 16:45:42 +0800
Browse Files
no message
9373c6cf

by liuxuqinfhp1220
2019-08-28 16:24:58 +0800
Browse Files
no message
1a644014

by liuxuqinfhp1220
2019-08-28 16:17:42 +0800
Browse Files
【一键订C端：餐厅处理中缺少取消预定】https://www.tapd.cn/57419716/bugtrace/bugs/view?bug_id=1157419716001002795
fb4abdd5

by vking
2019-08-28 15:38:41 +0800
Browse Files
【一键订C端：订座详情页显示预订人信息不完整】https://www.tapd.cn/57419716/bugtrace/bugs/view?bug_id=1157419716001002792
33d9202e

by vking
2019-08-28 14:45:15 +0800
Browse Files
【一键订C端：拒绝的在线订单，在无效预订中没有显示包间需求】https://www.tapd.cn/57419716/bugtrace/bugs/view?bu… ...
8a440871
```
…g_id=1157419716001002790
```
by vking
2019-08-28 14:35:06 +0800
Browse Files
Merge remote-tracking branch 'origin/master'
33688282

by vking
2019-08-28 11:57:30 +0800
Browse Files
【一键订C端：输入备注，提交预订未预留出】https://www.tapd.cn/57419716/bugtrace/bugs/view?bug_id=1157419716001002780
21fcf8dc

by vking
2019-08-28 11:57:25 +0800
Browse Files
no message
b9548150

by liuxuqinfhp1220
2019-08-28 11:38:25 +0800
Browse Files
商户在线预订展示调整
 8ca2c31d

by vking
2019-08-28 11:06:46 +0800
Browse Files
Merge remote-tracking branch 'origin/master'
038b2199

by vking
2019-08-28 09:52:52 +0800
Browse Files
【一键订C端：在线预订提交成功后，处理订单提示信息未按照接单时间提示】https://www.tapd.cn/57419716/bugtrace/bugs/vi… ...
fa56b4cc
```
…ew?bug_id=1157419716001002772
```
by vking
2019-08-28 09:52:44 +0800
Browse Files

27 Aug, 2019

21 commits

no message
532e7a8b

by liuxuqinfhp1220
2019-08-27 19:08:29 +0800
Browse Files
【一键订C端：安排成功的在线预订，订座详情页包间名称显示不正确】https://www.tapd.cn/57419716/bugtrace/bugs/view?… ...
d73556c9
```
…bug_id=1157419716001002768
```
by vking
2019-08-27 18:05:09 +0800
Browse Files
Merge remote-tracking branch 'origin/master'
f5ade986

by vking
2019-08-27 17:29:22 +0800
Browse Files
商户在线预订展示调整
e4d279b9

by vking
2019-08-27 17:29:17 +0800
Browse Files
no message
211e64a4

by liuxuqinfhp1220
2019-08-27 17:05:08 +0800
Browse Files
no message
59d37a22

by liuxuqinfhp1220
2019-08-27 15:02:44 +0800
Browse Files
预订卡片调整
 6e11165a

by vking
2019-08-27 14:40:02 +0800
Browse Files
预订卡片调整
 a7c65bd4

by vking
2019-08-27 14:36:32 +0800
Browse Files
Merge remote-tracking branch 'origin/master' ...
eb63e538
```
# Conflicts:
#	pages/customer/detail_owner.js
```
by vking
2019-08-27 14:28:06 +0800
Browse Files
预订卡片调整
2dbd50f0

by vking
2019-08-27 14:27:39 +0800
Browse Files
no message
186f297f

by liuxuqinfhp1220
2019-08-27 14:21:51 +0800
Browse Files
no message
ddb5768e

by liuxuqinfhp1220
2019-08-27 12:20:05 +0800
Browse Files
no message
90d8928a

by liuxuqinfhp1220
2019-08-27 12:04:22 +0800
Browse Files
no message
09726eb7

by liuxuqinfhp1220
2019-08-27 11:55:27 +0800
Browse Files
no message
5ae2d7fd

by liuxuqinfhp1220
2019-08-27 11:23:01 +0800
Browse Files
Merge remote-tracking branch 'origin/master'
597cace0

by vking
2019-08-27 11:15:42 +0800
Browse Files
预订卡片调整
b94ca266

by vking
2019-08-27 11:15:37 +0800
Browse Files
no message
b7553d00

by liuxuqinfhp1220
2019-08-27 10:24:44 +0800
Browse Files
no message
1255e0e3

by liuxuqinfhp1220
2019-08-27 10:18:54 +0800
Browse Files
no message
f234ad96

by liuxuqinfhp1220
2019-08-27 10:15:50 +0800
Browse Files
no message
ea0328b4

by liuxuqinfhp1220
2019-08-27 10:12:07 +0800
Browse Files

26 Aug, 2019

2 commits

no message
77b36e67

by liuxuqinfhp1220
2019-08-26 18:36:56 +0800
Browse Files
no message
3309e3c8

by liuxuqinfhp1220
2019-08-26 18:28:00 +0800
Browse Files