wangshusheng / YOHOBUYPC · Commits

85330e1fd5f7ea5d52e5723a1484ceb58c99ce74

16 Dec, 2015

40 commits

修复优惠券为空时的 bug
332fccfc

by 毕凯
9 years ago
Browse Files
修复模板加价购和赠品模板请求接口返回的bug，需要返回模板的html代码，不能渲染 ...
12d10b4d
```
Code Review By Rock Zhang
```
by Rock Zhang
9 years ago
Browse Files
Merge branch 'feature/cart' into develop
e3ee1e6a

by Rock Zhang
9 years ago
Browse Directory »
修改加价购或者赠品信息图片大小 ...
b6e4da12
```
Code Review By Rock Zhang
```
by Rock Zhang
9 years ago
Browse Directory »
fixes bug to product detail page recom reference
12b61e26

by hf
9 years ago
Browse Directory »
Merge branch 'feature/cart' of git.dev.yoho.cn:web/yohobuy into feature/cart ...
f0eceb99
```
Conflicts:
	static/js/cart/chose-panel.js
```
by Rock Zhang
9 years ago
Browse Files
修复加价购商品详情的bug ...
914486b3
```
Code Review By Rock Zhang
```
by Rock Zhang
9 years ago
Browse Files
resolve confilct
9ac948a2

by biao
9 years ago
Browse Files
update for select all feature for cart. code review by LZF
21e9bc4f

by biao
9 years ago
Browse Files
fixes bug refs YW-1678
7a7fe887

by hf
9 years ago
Browse Directory »
订单页面增加客服电话
2b532f38

by 毕凯
9 years ago
Browse Directory »
code review by hf: do fixes order detail page bugs
2d2df212

by hf
9 years ago
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
ba44a9d9

by hf
9 years ago
Browse Directory »
code review by hf: do modify product detail page
df118cce

by hf
9 years ago
Browse Directory »
合并代码
57833dbf

by 毕凯
9 years ago
Browse Directory »
修改获取加价购商品详情storage_sum不存在报错的bug
2c9c4e47

by Rock Zhang
9 years ago
Browse Directory »
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into develop
6a66e15c

by 梁志锋
9 years ago
Browse Directory »
添加加价购商品的promotionId
4873700f

by Rock Zhang
9 years ago
Browse Directory »
添加加价购、商品详情以及赠品的模板返回路由 ...
b9766af7
```
Code Review By Rock Zhang
```
by Rock Zhang
9 years ago
Browse Directory »
提取出购物车商品、加价购商品以及赠品详情的处理逻辑
f26bc329

by Rock Zhang
9 years ago
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
021a15af

by 梁志锋
9 years ago
Browse Directory »
Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into develop
62cac7f7

by 梁志锋
9 years ago
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
59d271e8

by hf
9 years ago
Browse Directory »
code review by hf: do reset add to cart operate
d7a98aba

by hf
9 years ago
Browse Directory »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
214a69c6

by Rock Zhang
9 years ago
Browse Directory »
修改购物车商品为空时进入结算页跳转页的地址 ...
9594af85
```
Code Review By Rock Zhang
```
by Rock Zhang
9 years ago
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
02f38062

by hf
9 years ago
Browse Directory »
do fixes bug to login errors
51851c15

by hf
9 years ago
Browse Directory »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
130c0647

by Rock Zhang
9 years ago
Browse Directory »
修复有货币流水页面有货币总数显示不正确的bug ...
32132a2f
```
Code Review By Rock Zhang
```
by Rock Zhang
9 years ago
Browse Directory »
增加加价购页面
27ac04fa

by 毕凯
9 years ago
Browse Directory »
shopping-cart -> cart
afcbea37

by 毕凯
9 years ago
Browse Directory »
Merge branch 'feature/cart' into 'develop' ...
3ab3f9b0
```
Feature/cart

购物车商结算修改

See merge request !33
```
by 赵彪
9 years ago
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
c8a34a6b

by 毕凯
9 years ago
Browse Directory »
shopping-cart -> cart
111bab9a

by 毕凯
9 years ago
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
67156926

by hf
9 years ago
Browse Directory »
code review by hf: do reset add to cart operate
aa7d2d0f

by hf
9 years ago
Browse Directory »
手机号绑定
cb0e5c5c

by xiaowei
9 years ago
Browse Directory »
'修改个人中心导航条'
5b062cff

by uedxwg
9 years ago
Browse Directory »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
3c10e80e

by Rock Zhang
9 years ago
Browse Directory »