fe / YOHOBUYPC · Commits

15 Dec, 2015

8 commits

冲突修改
59e9d432

by uedxwg
2015-12-15 13:46:40 +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 '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 Directory »
临时修改
bc9ac89d

by uedxwg
2015-12-15 10:20:56 +0800
Browse Directory »
商品购物车 --code reviewed by LZF
46346312

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

14 Dec, 2015

32 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 Directory »
code review by hf: do reset order detail page code
00c826dc

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

by hf
2015-12-14 21:25:35 +0800
Browse Directory »
增加 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 Directory »
code review by hf: do product detail page add to cart package data
819c9f68

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

by uedxwg
2015-12-14 20:36:05 +0800
Browse Directory »
赠加 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 Directory »
modify yohocoin
a9dd2753

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

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

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

by uedxwg
2015-12-14 17:51:44 +0800
Browse Directory »
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 File »
帮助中心列表详情页
b080bd48

by cailing
2015-12-14 17:14:18 +0800
Browse Directory »
帮助中心
36279628

by cailing
2015-12-14 17:04:22 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
41a9eee3

by uedxwg
2015-12-14 17:02:33 +0800
Browse Directory »
临时提交
58e40a7d

by uedxwg
2015-12-14 17:02:06 +0800
Browse Files
对接收货地址
e72f6be7

by 毕凯
2015-12-14 16:56:30 +0800
Browse Files
整合优惠券
53de6ef0

by 毕凯
2015-12-14 16:40:15 +0800
Browse Directory »
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
716f42ea

by Rock Zhang
2015-12-14 16:24:46 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
65526daf

by 梁志锋
2015-12-14 16:21:28 +0800
Browse Directory »
添加购物车结算页面修改属性时重新运算的路由接口 ...
402bea46
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-14 16:21:02 +0800
Browse Directory »
yas版本升级
9275e082

by 梁志锋
2015-12-14 16:20:07 +0800
Browse Files
yas版本升级
e00b5819

by 梁志锋
2015-12-14 16:19:52 +0800
Browse Files
yas版本升级
5b5f2a78

by 梁志锋
2015-12-14 16:11:17 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
4f1f49f9

by 毕凯
2015-12-14 16:06:06 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into feature/cart ...
dae67e29
```
Conflicts:
	library/LibModels/Wap/Home/CartData.php
	yohobuy/m.yohobuy.com/application/controllers/ShoppingCart.php
	yohobuy/m.yohobuy.com/application/models/Index/Cart.php
```
by Rock Zhang
2015-12-14 16:03:57 +0800
Browse Directory »
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
594509ba

by 毕凯
2015-12-14 15:58:15 +0800
Browse Directory »