Commits · 338cdd9ebb1c2544ae29480b68f207572706b054 · cemarose / ios1x · GitLab

14 Jul, 2017 19 commits
- Merge branch 'master' of git.oschina.net:kollway-kollway/newcemarose · 338cdd9e
  lee authored Jul 14, 2017
  
  338cdd9e Browse Files
- u · a0e3bcda
  lee authored Jul 14, 2017
  
  a0e3bcda Browse Files
- Merge branch 'master' of https://git.oschina.net/kollway-kollway/newcemarose · c3f046f7
```
# Conflicts:
#	iCemarose/Class/UI/NewHome/KWMNewHomeVC.m
```
  houweibin authored Jul 14, 2017
  c3f046f7 Browse Files
- 1，套装cell查看更多 · 343bf742
```
2，wishlist api demain
3，套装cell样式调整。---使价格能显示完整
```
  houweibin authored Jul 14, 2017
  343bf742 Browse Files
- Merge branch 'master' of git.oschina.net:kollway-kollway/newcemarose · a07e140b
  lee authored Jul 14, 2017
  
  a07e140b Browse Files
- u · c5965b3d
  lee authored Jul 14, 2017
  
  c5965b3d Browse Files
- u · 81145eba
  lee authored Jul 14, 2017
  
  81145eba Browse Files
- u · 4ae110f7
  lee authored Jul 14, 2017
  
  4ae110f7 Browse Files
- add size guide · defc1736
  lee authored Jul 14, 2017
  
  defc1736 Browse Files
- Merge branch 'master' of https://git.oschina.net/kollway-kollway/newcemarose · 058a9d44
  houweibin authored Jul 14, 2017
  
  058a9d44 Browse Files
- 详情页404 toast问题 · 7ba20fed
  houweibin authored Jul 14, 2017
  
  7ba20fed Browse Files
- Merge branch 'master' of git.oschina.net:kollway-kollway/newcemarose · 942e6a36
  lee authored Jul 14, 2017
  
  942e6a36 Browse Files
- u service filter souldout product · 631bbb4f
  lee authored Jul 14, 2017
  
  631bbb4f Browse Files
- 1，分类图标 · 2664fe89
```
2，查看更多
3，其他
```
  houweibin authored Jul 14, 2017
  2664fe89 Browse Files
- u add service up home bug · 69ae7ccc
  lee authored Jul 14, 2017
  
  69ae7ccc Browse Files
- wishListVC 跳转购物车 · ce33fcfb
  houweibin authored Jul 14, 2017
  
  ce33fcfb Browse Files
- Merge branch 'master' of https://git.oschina.net/kollway-kollway/newcemarose · 827cd36c
  houweibin authored Jul 14, 2017
  
  827cd36c Browse Files
- wishlist逻辑调整 · 8d5eb243
  houweibin authored Jul 14, 2017
  
  8d5eb243 Browse Files
- u · 23f1b4a7
  lee authored Jul 14, 2017
  
  23f1b4a7 Browse Files
13 Jul, 2017 12 commits
- Merge branch 'master' of https://git.oschina.net/kollway-kollway/newcemarose · 050f30f1
  houweibin authored Jul 13, 2017
  
  050f30f1 Browse Files
- 1，商品详情完善 · af1531be
```
2，fix error
```
  houweibin authored Jul 13, 2017
  af1531be Browse Files
- u · 1ed601f7
  lee authored Jul 13, 2017
  
  1ed601f7 Browse Files
- u · 64c060f4
  lee authored Jul 13, 2017
  
  64c060f4 Browse Files
- ucategory filter · da881b65
  lee authored Jul 13, 2017
  
  da881b65 Browse Files
- u · 803ed47b
  lee authored Jul 13, 2017
  
  803ed47b Browse Files
- a deep blog home com · 85b6a274
  lee authored Jul 13, 2017
  
  85b6a274 Browse Files
- uhome u default sort · 89357459
  lee authored Jul 13, 2017
  
  89357459 Browse Files
- u home · 961869d1
  lee authored Jul 13, 2017
  
  961869d1 Browse Files
- Merge branch 'master' of git.oschina.net:kollway-kollway/newcemarose · ebf81198
  lee authored Jul 13, 2017
  
  ebf81198 Browse Files
- u home · 0714da2a
  lee authored Jul 13, 2017
  
  0714da2a Browse Files
- Improve · a6794736
  lee authored Jul 13, 2017
  
  a6794736 Browse Files
12 Jul, 2017 7 commits
- 新商品选择规格页添加颜色逻辑 · 97e77983
  houweibin authored Jul 12, 2017
  
  97e77983 Browse Files
- Merge branch 'master' of https://git.oschina.net/kollway-kollway/newcemarose · 52b6375a
  houweibin authored Jul 12, 2017
  
  52b6375a Browse Files
- small fix · 40c76005
  houweibin authored Jul 12, 2017
  
  40c76005 Browse Files
- 1，small fix · 7557dc54
  houweibin authored Jul 12, 2017
  
  7557dc54 Browse Files
- Merge branch 'master' of git.oschina.net:kollway-kollway/newcemarose · 187d6b44
  lee authored Jul 12, 2017
  
  187d6b44 Browse Files
- 1，放出新版本页面 · af78e5ba
```
2，fix ui
```
  houweibin authored Jul 12, 2017
  af78e5ba Browse Files
- Merge branch 'master' of git.oschina.net:kollway-kollway/newcemarose · 2041dd27
  lee authored Jul 12, 2017
  
  2041dd27 Browse Files
11 Jul, 2017 2 commits
- 1，fix error · 52b1c54f
```
2，加入新首页test数据
```
  houweibin authored Jul 11, 2017
  52b1c54f Browse Files
- u' · 60fa6510
  lee authored Jul 11, 2017
  
  60fa6510 Browse Files