Commits · d08ae8df31b3e09fa4d1dab28ff54a14f657df26 · FM00017 / fmtakeout · GitLab

15 Jan, 2019 2 commits
- Merge branch 'feature/prttest' into develop · d08ae8df
```
# Conflicts:
#	takeout/takeout.pro
1.合并登陆和订单新界面和打印本地化;
```
  李定达 committed Jan 15, 2019
  d08ae8df Browse Files
- 1.打印调整为本地db配置;2.档口打印准备 · 2665c388
  李定达 committed Jan 15, 2019
  
  2665c388 Browse Files
14 Jan, 2019 1 commit
- 优化登陆界面 · 160e42a0
  xiaoqing.gu committed Jan 14, 2019
  
  160e42a0 Browse Files
11 Jan, 2019 2 commits
- 1、添加新的登陆界面 2、修改新订单详情界面的配送时间问题 · 3891324e
  xiaoqing.gu committed Jan 11, 2019
  
  3891324e Browse Files
- 修改订单详情界面的外卖配送时间 · 928fddb8
  xiaoqing.gu committed Jan 11, 2019
  
  928fddb8 Browse Files
09 Jan, 2019 1 commit
- 新订单界面优化 · b23a661a
  xiaoqing.gu committed Jan 09, 2019
  
  b23a661a Browse Files
08 Jan, 2019 3 commits
- 合并新订单详情和新主界面代码 · f3cf8eae
  xiaoqing.gu committed Jan 08, 2019
  
  f3cf8eae Browse Files
- Merge branch 'feature/orderInfoShow' into develop · 5c0112b7
  xiaoqing.gu committed Jan 08, 2019
  
  5c0112b7 Browse Files
- 新订单详情界面 · d9635eb4
  xiaoqing.gu committed Jan 08, 2019
  
  d9635eb4 Browse Files
07 Jan, 2019 1 commit
- 1.主界面调整对接订单详情界面准备 · 4133ef9b
  李定达 committed Jan 08, 2019
  
  4133ef9b Browse Files
04 Jan, 2019 4 commits
- Merge branch 'hotfix/workpath' into develop · cff8e853
  李定达 committed Jan 04, 2019
  
  cff8e853 Browse Files
- 1.修改工作路径到外卖程序所在路径 · eeb3d9ed
  李定达 committed Jan 04, 2019
  
  eeb3d9ed Browse Files
- Merge branch 'feature/mainshowchange' into develop · f8915e85
  李定达 committed Jan 04, 2019
  
  f8915e85 Browse Files
- 1.新界面主界面初步开发完成;2.修复了一些翻页的bug · bb54d3fc
  李定达 committed Jan 04, 2019
  
  bb54d3fc Browse Files
25 Dec, 2018 1 commit
- 1.新界面初步调整完成; · 2e70299b
  李定达 committed Dec 25, 2018
  
  2e70299b Browse Files
11 Dec, 2018 1 commit
- 1.网络异常添加提示音 · 6e3fc6fd
  李定达 committed Dec 11, 2018
  
  6e3fc6fd Browse Files
10 Dec, 2018 3 commits
- Merge branch 'release/3.0.0.13update' · d11dba8d
  李定达 committed Dec 10, 2018
  
  d11dba8d Browse Files
- Merge branch 'feature/pickuporderprt' into develop · f76cdae7
  李定达 committed Dec 10, 2018
  
  f76cdae7 Browse Files
- 1.新订单扫码取餐bug;2.修复扫码取餐背景透明问题;3.修改版本号 · 21d131f8
  李定达 committed Dec 10, 2018
  
  21d131f8 Browse Files
06 Dec, 2018 1 commit
- 1.分离主机副机串口打印配置; · bdc6c083
  李定达 committed Dec 06, 2018
  
  bdc6c083 Browse Files
05 Dec, 2018 1 commit
- 1.调整界面栏目分割;2.调整悬浮窗拖动不灵问题 · 5603a0b2
  李定达 committed Dec 05, 2018
  
  5603a0b2 Browse Files
30 Nov, 2018 2 commits
- 1.添加预定单处理工作流; · 045b057c
  李定达 committed Nov 30, 2018
  
  045b057c Browse Files
- 1.悬浮窗缩放;2.扫码取餐 · 25f2c553
  李定达 committed Nov 30, 2018
  
  25f2c553 Browse Files
28 Nov, 2018 1 commit
- 1.修复拉单超时时间bug;2.调整网络异常拉单补偿 · a2c63bdd
  李定达 committed Nov 28, 2018
  
  a2c63bdd Browse Files
27 Nov, 2018 1 commit
- 1.调整悬浮窗展示无订单状态下点击次才能进入主界面; · 2fcdb97e
  李定达 committed Nov 27, 2018
  
  2fcdb97e Browse Files
26 Nov, 2018 1 commit
- 1.调整标签打印大小;2.调整网络异常错误提示; · 7078eb4e
  李定达 committed Nov 26, 2018
  
  7078eb4e Browse Files
22 Nov, 2018 1 commit
- 1.调整网络异常的提示时间;2.调整线程的安全的退出;3.重构工作流模块 · 191a20ff
  李定达 committed Nov 22, 2018
  
  191a20ff Browse Files
21 Nov, 2018 2 commits
- Merge branch 'release/network_messagebox' · d940d5f5
  朱博 committed Nov 21, 2018
  
  d940d5f5 Browse Files
- Merge tag 'network_messagebox' into develop · 3ad9f0de
  朱博 committed Nov 21, 2018
  
  3ad9f0de Browse Files
20 Nov, 2018 1 commit
- 修改网络错误提示 · c73ece29
  朱博 committed Nov 20, 2018
  
  c73ece29 Browse Files
19 Nov, 2018 1 commit
- Merge branch 'release/SaaS-O2O' · 5dea90d5
  李定达 committed Nov 19, 2018
  
  5dea90d5 Browse Files
09 Nov, 2018 2 commits
- 1.打印中不再提示;2.送出时间调整;3.修复无打印机名称无法保存打印配置的bug;4.修改版本号 · fe831517
  李定达 committed Nov 09, 2018
  
  fe831517 Browse Files
- 1.添加QA测试环境区分;2.决绝退单的订单不再提示;3.打印移动到单独的线程; · 50e8bc98
  李定达 committed Nov 09, 2018
  
  50e8bc98 Browse Files
07 Nov, 2018 2 commits
- 1.修复拉单传递store_unify_id字段 · d85b2178
  李定达 committed Nov 07, 2018
  
  d85b2178 Browse Files
- 1.添声音素材;2.添加资源素材;3.打开界面声音响一次,不打开界面一直响;4.修改版本号 · 6c0db390
  李定达 committed Nov 07, 2018
  
  6c0db390 Browse Files
01 Nov, 2018 1 commit
- 1.添加自提退单和外卖退单界面展示;2.悬浮窗重新调整调整 · b8fda1b3
  李定达 committed Nov 01, 2018
  
  b8fda1b3 Browse Files
30 Oct, 2018 4 commits
- 1.悬浮窗拖动范围限制;2.部分日志降级为debug;3.o2o打印模板丰富逻辑添加 · 6ea54e48
  李定达 committed Oct 30, 2018
  
  6ea54e48 Browse Files
- Merge branch 'hotfix/chineseprtname' into develop · 977e83b5
  李定达 committed Oct 30, 2018
  
  977e83b5 Browse Files
- Merge branch 'hotfix/chineseprtname' · 94ff05f2
  李定达 committed Oct 30, 2018
  
  94ff05f2 Browse Files
- 1.修复中文名打印机不支持bug · 8a0a8bcf
  李定达 committed Oct 30, 2018
  
  8a0a8bcf Browse Files