Commits · 3f08dc2e41fcd302b8935bb158b94667251f1d1e · xiaojing.zhang / fmPOS · GitLab

05 May, 2017 1 commit
- 1. 修正打印驱动未加载时，启动崩溃问题; 2. 打印测试乱码问题; 3. 升级检测商户 ID 从通用配置读取 · 3f08dc2e
  Carwyn committed May 05, 2017
  
  3f08dc2e Browse Files
03 May, 2017 1 commit
- 1. 配置模块去掉未完善部分; 2. 配置 Key 分离; 3. 界面添加版权显示 · ff1d3fb9
  Carwyn committed May 04, 2017
  
  ff1d3fb9 Browse Files
27 Apr, 2017 2 commits
- 1. 外卖资源上传; 2. exe 添加图标 · 9fb8b27e
  Carwyn committed Apr 27, 2017
  
  9fb8b27e Browse Files
- 1. 取消同步模块调试下载部分; 2.添加外卖配置; 3.业务插件析构时释放锁 · 3d0abcfb
  Carwyn committed Apr 27, 2017
  
  3d0abcfb Browse Files
26 Apr, 2017 1 commit
- 1.设置添加界面文件 · 1d30b086
  Carwyn committed Apr 26, 2017
  
  1d30b086 Browse Files
20 Apr, 2017 1 commit
- 1. 解决业务插件在主线程调用停止服务卡死问题; 2. 所有插件在析构中调用停止服务接口; 3. 按加载顺序停止服务; 4. 其他 · 4049a277
  Carwyn committed Apr 20, 2017
  
  4049a277 Browse Files
18 Apr, 2017 2 commits
- 1. 日志不输出到文件问题解决 · 62334778
  Carwyn committed Apr 18, 2017
  
  62334778 Browse Files
- 1. 退出偶尔会假死问题【临时解决】 · 38c45c6f
  Carwyn committed Apr 18, 2017
  
  38c45c6f Browse Files
17 Apr, 2017 4 commits
- 1.添加打印子项目 · 94516899
  Carwyn committed Apr 17, 2017
  
  94516899 Browse Files
- 1. 重做 "基础接口调整，使用 InitService 初始化服务，UninitService 释放服务" · cc5542bc
  Carwyn committed Apr 17, 2017
  
  cc5542bc Browse Files
- Revert "1. 基础接口调整，使用 InitService 初始化服务，UninitService 释放服务" · 62ee3e06
```
This reverts commit 9bb5223e.
```
  Carwyn committed Apr 17, 2017
  62ee3e06 Browse Files
- 1. 基础接口调整，使用 InitService 初始化服务，UninitService 释放服务 · 9bb5223e
  Carwyn committed Apr 17, 2017
  
  9bb5223e Browse Files
11 Apr, 2017 1 commit
- 1. 在导航、会员子模块上更新Toast通知。 · 6a340d7a
  NitefullWind committed Apr 11, 2017
  
  6a340d7a Browse Files
10 Apr, 2017 1 commit
- 1.更新日志模块，使用方式不需参数，但初次需要调用 InitContext() 方法，否则只打印到控制台 · 98dd8859
  Carwyn committed Apr 10, 2017
  
  98dd8859 Browse Files
07 Apr, 2017 3 commits
- 1. 整合会员子项目。 2. 导航子项目中调整导航按钮及登录界面的样式。 · 7bdb9186
  NitefullWind committed Apr 07, 2017
  
  7bdb9186 Browse Files
- 1.在支付子项目中重做169dbe7 · c7bf79d2
  Carwyn committed Apr 07, 2017
  
  c7bf79d2 Browse Files
- 1.添加会员、外卖子项目 · 842e482e
  Carwyn committed Apr 07, 2017
  
  842e482e Browse Files
06 Apr, 2017 5 commits
- 1. 在支付子项目中重做提交 4d882ee · d0c9a561
  Carwyn committed Apr 07, 2017
  
  d0c9a561 Browse Files
- 1.设置、支付、导航界面变更为子项目 · 4fef05e0
  Carwyn committed Apr 07, 2017
  
  4fef05e0 Browse Files
- Merge branch 'fmp_home' · d8fe97ad
  NitefullWind committed Apr 06, 2017
  
  d8fe97ad Browse Files
- 1. 导航模块实现闪烁通知功能。 · 0544763e
  NitefullWind committed Apr 06, 2017
  
  0544763e Browse Files
- 1.支付界面细节优化、运行时警告消除、部分多余资源文件删除; 2.修正退出崩溃问题; 3.插件管理器事件响应类改进，通过成员数组管理; 4.添加 qt.conf 管理插件目录; 5.运行依赖整理 · 17f2ea8c
  Carwyn committed Apr 06, 2017
  
  17f2ea8c Browse Files
30 Mar, 2017 2 commits
- Merge branch 'master' of git.oschina.net:kong__mo/fmPOS · 63e2e165
  NitefullWind committed Mar 30, 2017
  
  63e2e165 Browse Files
- Fixes: 1. 日志 level 0 时，写空文件问题; 2.升级下载、部署路径支持配置; 3.升级辅助程序名称支持配置; 4.日志、升级、网络模块其他细节优化 · b7d2e09b
  Carwyn committed Mar 30, 2017
  
  b7d2e09b Browse Files
29 Mar, 2017 2 commits
- 1. Merge branch 'fmp_ePay' · 7149527b
```
# Conflicts:
#	debug/bin/fmPos.ini
```
  NitefullWind committed Mar 29, 2017
  7149527b Browse Files
- $LIDINGDA\ldd's avatar$
  
  1.界面调整 · 9c3ad5fe
  LIDINGDA\ldd committed Mar 29, 2017
  
  9c3ad5fe Browse Files
28 Mar, 2017 2 commits
- $LIDINGDA\ldd's avatar$
  
  1.界面重写;2.删销售单 · a64ce3fc
  LIDINGDA\ldd committed Mar 28, 2017
  
  a64ce3fc Browse Files
- 1. 使用日志和配置插件。 · dfe0183c
  NitefullWind committed Mar 28, 2017
  
  dfe0183c Browse Files
21 Mar, 2017 1 commit
- 1. 新增托盘菜单。 · df933c8a
  NitefullWind committed Mar 21, 2017
  
  df933c8a Browse Files
17 Mar, 2017 7 commits
- Merge branch 'fmp_ePay' · 2c355087
  Carwyn committed Mar 17, 2017
  
  2c355087 Browse Files
- 1.EXE生成名修改为FreemudPOS · 4d8b761a
  Carwyn committed Mar 17, 2017
  
  4d8b761a Browse Files
- Merge remote-tracking branch 'origin/fmp_home' · 1dc2d0d7
  Carwyn committed Mar 17, 2017
  
  1dc2d0d7 Browse Files
- 1. 导航界面使用状态机和动画重新实现。 2. 登录界面去掉阴影和扩展键盘。 · f0da09cb
  NitefullWind committed Mar 17, 2017
  
  f0da09cb Browse Files
- Merge branch 'master' into fmp_ePay · c47f3f37
```
# Conflicts:
#	.gitignore
#	debug/bin/fmPos.ini
#	fmPos.pro
#	fmp_epay/fmp_epay.cpp
#	fmp_epay/fmp_epay.pro
#	fmp_epay/fmp_epay_p.cpp
#	fmp_epay/fmp_pe_handlers.cpp
#	fmp_epay/fmp_pe_handlers.h
#	fmp_epay/version.h
#	fmp_home/fmp_he_handlers.cpp
#	fmp_home/fmp_home_p.cpp
#	fmp_settings/fmp_settings_def.h
#	fmp_settings/version.h
#	fmp_syncer/version.h
```
  Carwyn committed Mar 17, 2017
  c47f3f37 Browse Files
- 1.EXE名称错误修正 · 49b1267d
  Carwyn committed Mar 17, 2017
  
  49b1267d Browse Files
- 1.同步辅助程序修改 · db5c4ed2
  Carwyn committed Mar 17, 2017
  
  db5c4ed2 Browse Files
16 Mar, 2017 2 commits
- $LIDINGDA\ldd's avatar$
  
  1.数据库添加营业日字段;2.添加收银员pos编号营业日获取设置;3.规范界面输入 · 7f6b32d2
  LIDINGDA\ldd committed Mar 16, 2017
  
  7f6b32d2 Browse Files
- 1. 新增网络模块，完成HTTP GET， POST 方法功能；2. 更新模块完；3. EXE 更名为 FreemudPOS；4. 其他 · 835992d3
  Carwyn committed Mar 16, 2017
  
  835992d3 Browse Files
15 Mar, 2017 1 commit
- $LIDINGDA\ldd's avatar$
  
  1.界面调整，查询整合完成 · 168bb6ab
  LIDINGDA\ldd committed Mar 15, 2017
  
  168bb6ab Browse Files
14 Mar, 2017 1 commit
- $LIDINGDA\ldd's avatar$
  
  1.支付，退款基本逻辑调通 · a4fa15b0
  LIDINGDA\ldd committed Mar 14, 2017
  
  a4fa15b0 Browse Files