Commits · d70937953e0c2fae613ba1da0c7217d3e1d2a321 · FM00017 / fmtakeout · GitLab

24 Jan, 2019 1 commit
- 1.大版本调整 · d7093795
  李定达 committed Jan 24, 2019
  
  d7093795 Browse Files
23 Jan, 2019 8 commits
- 1.修复界面bug · f9711b6e
  李定达 committed Jan 23, 2019
  
  f9711b6e Browse Files
- Merge branch 'feature/scangetorder' into develop · 26bde266
  李定达 committed Jan 23, 2019
  
  26bde266 Browse Files
- 1.扫码取餐调整完成;2.界面优化完成;3.自动登陆 · 1d0a8acc
  李定达 committed Jan 23, 2019
  
  1d0a8acc Browse Files
- Merge branch 'feature/improve' into develop · dfaf2311
  xiaoqing.gu committed Jan 23, 2019
  
  dfaf2311 Browse Files
- 修改新订单界面关闭按钮样式表 · 81a4e522
  xiaoqing.gu committed Jan 23, 2019
  
  81a4e522 Browse Files
- 修改新订单界面商品显示问题、按钮样式表、关闭按钮 · 4b614eae
  xiaoqing.gu committed Jan 23, 2019
  
  4b614eae Browse Files
- Merge branch 'feature/stallsshow' into develop · d947008d
```
# Conflicts:
#	takeout/control/stallsgetwork.cpp
#	takeout/view/newmainform.cpp
#	takeout/view/newmainform.ui
1.界面调整基本完成;
```
  李定达 committed Jan 23, 2019
  d947008d Browse Files
- 1.打印对接完成;2.界面优化;3.界面添加扫码取餐 · 5b51d0b3
  李定达 committed Jan 23, 2019
  
  5b51d0b3 Browse Files
21 Jan, 2019 1 commit
- 1.重新包装答打印函数;2.调整打印机池,调整档口池;3.打印测试对接并测试完成;4.修复部分界面展示异常; · 171242f7
  李定达 committed Jan 21, 2019
  
  171242f7 Browse Files
18 Jan, 2019 1 commit
- 1、分离获取档口信息的代码成单独的函数 2、修改主界面的样式表 · c39f8eab
  xiaoqing.gu committed Jan 18, 2019
  
  c39f8eab Browse Files
17 Jan, 2019 1 commit
- 1、添加档口选择 2、显示档口菜单 3、修改登录界面 · 4f8ef409
  xiaoqing.gu committed Jan 17, 2019
  
  4f8ef409 Browse Files
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 1 commit
- Merge branch 'release/network_messagebox' · d940d5f5
  朱博 committed Nov 21, 2018
  
  d940d5f5 Browse Files