Commits · a4a53ec495864a8dad61526d2eada1ac97a37747 · 张杰 / xffruit

09 Nov, 2015 1 commit
- 规格描述 · a4a53ec4
  陈俊俊 authored Nov 09, 2015
  
  a4a53ec4
05 Nov, 2015 8 commits
- no message · 5cd4c129
  管鹏飞 authored Nov 05, 2015
  
  5cd4c129
- no message · edad2f9d
  管鹏飞 authored Nov 05, 2015
  
  edad2f9d
- Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001 · 4346f77e
  管鹏飞 authored Nov 05, 2015
```
Conflicts:
	XFFruit.xcodeproj/project.pbxproj
	XFFruit/Info.plist
	XFFruit/Macro/ICRAppMacro.h
```
  4346f77e
- no message · 25942065
  管鹏飞 authored Nov 05, 2015
  
  25942065
- 采购通知选择多人 · 1de7a49b
  陈俊俊 authored Nov 05, 2015
  
  1de7a49b
- 获取后台数据分页 · a5276e21
  陈俊俊 authored Nov 05, 2015
  
  a5276e21
- Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001 · f6c441e0
  陈俊俊 authored Nov 05, 2015
```
Conflicts:
	XFFruit/Macro/ICRAppMacro.h
```
  f6c441e0
- 获取数据 · f8f1d4dc
  陈俊俊 authored Nov 05, 2015
  
  f8f1d4dc
04 Nov, 2015 9 commits
- no message · d19e561a
  zhu authored Nov 04, 2015
  
  d19e561a
- Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001 · cb1475f6
  管鹏飞 authored Nov 04, 2015
```
Conflicts:
	XFFruit.xcodeproj/project.pbxproj
```
  cb1475f6
- 修改排序 · 1f988c40
  管鹏飞 authored Nov 04, 2015
  
  1f988c40
- no message · 925052ef
  管鹏飞 authored Nov 04, 2015
  
  925052ef
- 选择发运单 · 5e8b2a95
  陈俊俊 authored Nov 04, 2015
  
  5e8b2a95
- Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001 · 832a8059
  陈俊俊 authored Nov 04, 2015
```
Conflicts:
	XFFruit.xcodeproj/project.pbxproj
```
  832a8059
- 基础信息条数 · 29bc6b1f
  陈俊俊 authored Nov 04, 2015
  
  29bc6b1f
- 登录页界面优化 · c1f2c955
  freecui authored Nov 04, 2015
```
输入框默认显示：
请输入公司认证码
请输入用户名
请输入密码
错误处理：
如果填写错误，接到后台反馈报错后，要将错误信息弹出反馈给用户。
```
  c1f2c955
- Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into #DEV_20150805_001 · da4f8c34
  freecui authored Nov 04, 2015
  
  da4f8c34
03 Nov, 2015 22 commits
- Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001 · 5e08d536
  管鹏飞 authored Nov 03, 2015
```
Conflicts:
	XFFruit.xcodeproj/project.pbxproj
```
  5e08d536
- Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001 · 215f4e25
  管鹏飞 authored Nov 03, 2015
```
Conflicts:
	XFFruit.xcodeproj/project.pbxproj
```
  215f4e25
- 日期格式转换 · 3b0a571f
  陈俊俊 authored Nov 03, 2015
  
  3b0a571f
- 发布版本 · 6874b2c5
  管鹏飞 authored Nov 03, 2015
  
  6874b2c5
- Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001 · f6c4704a
  陈俊俊 authored Nov 03, 2015
```
Conflicts:
	XFFruit.xcodeproj/project.pbxproj
```
  f6c4704a
- no message · 6497d802
  陈俊俊 authored Nov 03, 2015
  
  6497d802
- Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001 · f117c3f1
  zhu authored Nov 03, 2015
```
Conflicts:
	XFFruit/AppDelegate/ICRAppDelegate.m
```
  f117c3f1
- no message · 3e58fda4
  zhu authored Nov 03, 2015
  
  3e58fda4
- 行情调研行情反馈Url · af4a4c56
  陈俊俊 authored Nov 03, 2015
  
  af4a4c56
- Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001 · 974cfd18
  陈俊俊 authored Nov 03, 2015
  
  974cfd18
- 没有新版本不提示 · 54686c7a
  陈俊俊 authored Nov 03, 2015
  
  54686c7a
- 正式环境地址 · ba6abd65
  管鹏飞 authored Nov 03, 2015
  
  ba6abd65
- 商品只能查有效的 · 58d217ff
  管鹏飞 authored Nov 03, 2015
  
  58d217ff
- 登录 · 9b32d9f3
  管鹏飞 authored Nov 03, 2015
  
  9b32d9f3
- Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into #DEV_20150805_001 · 010c235e
  freecui authored Nov 03, 2015
  
  010c235e
- Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into DEV_20150805_001 · 33311f56
  管鹏飞 authored Nov 03, 2015
  
  33311f56
- no message · aff33cac
  陈俊俊 authored Nov 03, 2015
  
  aff33cac
- 版本 · accd72fe
  陈俊俊 authored Nov 03, 2015
  
  accd72fe
- bug · cb7eb2f0
  陈俊俊 authored Nov 03, 2015
  
  cb7eb2f0
- hulk发布ipa · 36795730
  管鹏飞 authored Nov 03, 2015
  
  36795730
- Merge branch 'DEV_20150805_001' of http://121.42.32.57/root/xffruit into #DEV_20150805_001 · 6f33c727
  freecui authored Nov 03, 2015
  
  6f33c727
- 配置 · cb7feb46
  freecui authored Nov 03, 2015
  
  cb7feb46