Commits · 7a0dd3ee38919629030ab50fee2d04c050e7d03a · 张杰 / Opple-iOS

30 Nov, 2016 6 commits
- 修改项说明： · 7a0dd3ee
  曹云霄 authored Nov 30, 2016
  
  7a0dd3ee
- Merge branch 'master' into learningCenter · 5f5604f4
  曹云霄 authored Nov 30, 2016
```
# Conflicts:
#	Class/CardViewController.m
```
  5f5604f4
- 修改项说明：彻底修复分享商品图片偶发性失败《图片过大》 · b364a629
  曹云霄 authored Nov 30, 2016
  
  b364a629
- 修改项说明： · 99549096
  曹云霄 authored Nov 30, 2016
  
  99549096
- 修改项说明：修复checking状态下的京东E卡查看问题 · d1e6e4b4
  曹云霄 authored Nov 30, 2016
  
  d1e6e4b4
- 修改项说明： · 74c8d60d
  曹云霄 authored Nov 30, 2016
  
  74c8d60d
29 Nov, 2016 6 commits
- 修改项说明： · cfaceaa9
  曹云霄 authored Nov 29, 2016
  
  cfaceaa9
- 修改项说明： · 5e864a4b
  曹云霄 authored Nov 29, 2016
  
  5e864a4b
- 修改项说明：学习详情开发 · c6a6955a
  曹云霄 authored Nov 29, 2016
  
  c6a6955a
- Merge branch 'master' into learningCenter · 5db12ac8
  曹云霄 authored Nov 29, 2016
```
# Conflicts:
#	Tools/ShareGoodsViewController.m
```
  5db12ac8
- 修改项说明：优化分享商品、添加友盟统计 · 3ea3a1d0
  曹云霄 authored Nov 29, 2016
  
  3ea3a1d0
- 修改项说明：完成积分相应模块开发，等待后台接口 · 8c2af504
  曹云霄 authored Nov 29, 2016
  
  8c2af504
28 Nov, 2016 2 commits
- 修改项说明： · e79add47
  曹云霄 authored Nov 28, 2016
  
  e79add47
- 修改项说明：闯关界面开发 · cc1064c8
  曹云霄 authored Nov 28, 2016
  
  cc1064c8
26 Nov, 2016 1 commit
- 修改项说明：视频缓存处理 · a2fecce1
  曹云霄 authored Nov 26, 2016
  
  a2fecce1
25 Nov, 2016 1 commit
- 修改项说明：学习详情页开发，自定义视频播放器 · 81fff7a1
  曹云霄 authored Nov 25, 2016
  
  81fff7a1
24 Nov, 2016 5 commits
- Merge branch 'master' into learningCenter · 16b9503b
  曹云霄 authored Nov 24, 2016
```
# Conflicts:
#	Class/CardDetailsViewController.m
#	Lighting/OppleMain.storyboard
修复WkWebview不能播放视频，完成公告开发
```
  16b9503b
- 修改项说明：修复导购抽奖闪退 · 912fec60
  曹云霄 authored Nov 24, 2016
  
  912fec60
- 修改项说明：公告开发 · 06f6352e
  曹云霄 authored Nov 24, 2016
  
  06f6352e
- 修改项说明： · ec8c4c9b
  曹云霄 authored Nov 24, 2016
  
  ec8c4c9b
- 修改项说明： · 57c457f7
  曹云霄 authored Nov 24, 2016
  
  57c457f7
23 Nov, 2016 10 commits
- 修改项说明：公告开发 · 02a78e8b
  曹云霄 authored Nov 23, 2016
  
  02a78e8b
- Merge branch 'master' into learningCenter · d2b3a199
  曹云霄 authored Nov 23, 2016
  
  d2b3a199
- 修改项说明：微信卡劵扫描错误处理、支付框增加价格计算方式 · caf061a8
  曹云霄 authored Nov 23, 2016
  
  caf061a8
- 修改项说明： · f4261d69
  曹云霄 authored Nov 23, 2016
  
  f4261d69
- Merge branch 'master' into learningCenter · 169dd272
  曹云霄 authored Nov 23, 2016
  
  169dd272
- 修改项说明：去掉所有length判断，它可能导致崩溃 · a3e5a2ea
  曹云霄 authored Nov 23, 2016
  
  a3e5a2ea
- 修改项说明： · 9e44f071
  曹云霄 authored Nov 23, 2016
  
  9e44f071
- 修改项说明： · c1aa50ee
  曹云霄 authored Nov 23, 2016
  
  c1aa50ee
- 修改项说明： · b70036b6
  曹云霄 authored Nov 23, 2016
  
  b70036b6
- 修改项说明： · c0e25e6a
  曹云霄 authored Nov 23, 2016
  
  c0e25e6a
22 Nov, 2016 7 commits
- 修改项说明： · b608322b
  曹云霄 authored Nov 22, 2016
  
  b608322b
- 修改项说明：积分功能开发 · a03062f0
  曹云霄 authored Nov 22, 2016
  
  a03062f0
- 修改项说明：打包1.2.4正式版 · a948779e
  曹云霄 authored Nov 22, 2016
  
  a948779e
- 修改项说明：申请兑换奖品开发 · e171a48c
  曹云霄 authored Nov 22, 2016
  
  e171a48c
- 修改项说明：积分明细，兑奖记录开发 · 871db568
  曹云霄 authored Nov 22, 2016
  
  871db568
- Merge branch 'master' into learningCenter · 16c67bd6
  曹云霄 authored Nov 22, 2016
  
  16c67bd6
- 修改项说明： · 2ad75b5e
  曹云霄 authored Nov 22, 2016
  
  2ad75b5e
21 Nov, 2016 2 commits
- 修改项说明：积分开发 · f42bd4cf
  曹云霄 authored Nov 21, 2016
  
  f42bd4cf
- 修改项说明： · 411e96c3
  曹云霄 authored Nov 21, 2016
  
  411e96c3