fe / YOHOBUYWAP · Commits

15 Dec, 2015

21 commits

添加格式化购物车商品，格式化加价购商品辅助函数，添加对商品的数据格式处理 ...
33e7e044
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-15 16:36:18 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart
7b1c5acd

by Rock Zhang
2015-12-15 14:43:59 +0800
Browse Files
修复模板书写错误导致模板引擎渲染错误导致的bug ...
61cf76ce
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-15 14:30:57 +0800
Browse Files
增加订单价格计算，订单提交 @张振
e2bba535

by 毕凯
2015-12-15 14:01:14 +0800
Browse Files
增加订单提交
aae01775

by 毕凯
2015-12-15 14:00:26 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
3b881fd5

by uedxwg
2015-12-15 13:47:10 +0800
Browse Files
冲突修改
59e9d432

by uedxwg
2015-12-15 13:46:40 +0800
Browse Files
绑定手机号
0d71d35a

by xiaowei
2015-12-15 13:33:22 +0800
Browse Files
订单确认增加价格价格计算
e452f7fe

by 毕凯
2015-12-15 13:26:48 +0800
Browse Files
update
6e61bc02

by uedxwg
2015-12-15 13:21:07 +0800
Browse Files
有货币消费记录
e7a0366e

by uedxwg
2015-12-15 13:18:34 +0800
Browse Files
Merge branch 'cart' into 'feature/cart' ...
bfbfebb7
```
  购物车样式更新

根据设计图更新购物车样式

See merge request !24
```
by 梁志锋
2015-12-15 12:31:03 +0800
Browse Files
update for change the cart style. code review by LZF
5f003c62

by biao
2015-12-15 12:26:02 +0800
Browse Files
显示加价购和赠品
aa1323eb

by Rock Zhang
2015-12-15 10:59:09 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart
c4dce4b0

by Rock Zhang
2015-12-15 10:52:54 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
5bb46c38

by Rock Zhang
2015-12-15 10:52:30 +0800
Browse Files
修复配送方式与配送时间不能保存的bug
70f5a616

by Rock Zhang
2015-12-15 10:48:59 +0800
Browse Files
手机号码绑定
b44cf46e

by xiaowei
2015-12-15 10:29:33 +0800
Browse Files
临时修改
bc9ac89d

by uedxwg
2015-12-15 10:20:56 +0800
Browse Files
初始化 cookie 默认值
d6d83987

by 毕凯
2015-12-15 10:09:37 +0800
Browse Files
商品购物车 --code reviewed by LZF
46346312

by Lynnic
2015-12-15 09:38:50 +0800
Browse Files

14 Dec, 2015

19 commits

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/shoppingCart
6f836809

by Lynnic
2015-12-14 22:06:03 +0800
Browse Files
商品详情页购物车功能 -- code reviewd by LZF
a0be6faf

by Lynnic
2015-12-14 22:04:24 +0800
Browse Files
code review by hf: do reset order detail page code
00c826dc

by hf
2015-12-14 21:57:18 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
70ccd4c3

by hf
2015-12-14 21:25:35 +0800
Browse Files
增加 cookie 操作
6e07cb76

by 毕凯
2015-12-14 21:11:17 +0800
Browse Files
Revert "Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop" ...
79c2d2bf
```
This reverts commit 8f72d0d0, reversing
changes made to 41a9eee3.
```
by Rock Zhang
2015-12-14 21:09:30 +0800
Browse Files
code review by hf: do product detail page add to cart package data
819c9f68

by hf
2015-12-14 21:01:20 +0800
Browse Files
有货币使用详情
04bd1016

by uedxwg
2015-12-14 20:36:05 +0800
Browse Files
赠加 cookie 操作
6696759b

by 毕凯
2015-12-14 20:28:33 +0800
Browse Files
Merge branch 'feature/yoho-coin-new' of http://git.dev.yoho.cn/web/yohobuy into … ...
aa6e8140
```
…feature/yoho-coin-new
```
by uedxwg
2015-12-14 19:47:10 +0800
Browse Files
有货币明细列表
801b4daa

by uedxwg
2015-12-14 19:46:27 +0800
Browse Files
modify yohocoin
8e6b6387

by 周少峰
2015-12-14 19:39:26 +0800
Browse Files
modify yohocoin
a9dd2753

by 周少峰
2015-12-14 19:29:41 +0800
Browse Files
第三方手机登录
fc54d2b4

by xiaowei
2015-12-14 18:42:16 +0800
Browse Files
帮助中心，修改 @ 赵彪
61c59617

by uedxwg
2015-12-14 18:27:54 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
8f72d0d0

by uedxwg
2015-12-14 17:51:44 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop ...
11609314
```
# Conflicts:
#	template/m.yohobuy.com/actions/index/home/i-help.phtml
#	yohobuy/m.yohobuy.com/application/controllers/Home.php
```
by cailing
2015-12-14 17:50:17 +0800
Browse Files
帮助中心列表详情页
b080bd48

by cailing
2015-12-14 17:14:18 +0800
Browse Files
添加异步获取购物车数据的接口 ...
c4eaa998
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-14 17:05:51 +0800
Browse Files