fe / YOHOBUYPC · Commits

24 Dec, 2015

21 commits

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
62d273f6

by hf
2015-12-24 13:36:40 +0800
Browse Files
do merge develop to test cart feature
cc1ff3c0

by hf
2015-12-24 13:36:27 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
9b714eca

by 梁志锋
2015-12-24 13:25:17 +0800
Browse Files
dialog 模版的操作改成单例
1f5028df

by 梁志锋
2015-12-24 13:25:05 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
a95dbd48

by 毕凯
2015-12-24 13:24:01 +0800
Browse Files
预售商品提示字体大小
cbe0964d

by 毕凯
2015-12-24 13:23:55 +0800
Browse Files
dialog的点透问题
d80cba33

by 梁志锋
2015-12-24 12:38:21 +0800
Browse Files
Merge branch 'fix/issue' into 'develop' ...
c2221061
```
优化购物车页面为你优选加载的代码

See merge request !75
```
by 梁志锋
2015-12-24 12:28:34 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/issue
f5b1d516

by biao
2015-12-24 12:26:15 +0800
Browse Files
优化购物车页面为你优选加载的代码. code review by LZF
82d81e54

by biao
2015-12-24 12:26:06 +0800
Browse Files
Merge branch 'fix/issue' into 'develop' ...
c5b00f3f
```
购物车删除商品的代码优化

See merge request !74
```
by 梁志锋
2015-12-24 12:24:52 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/issue
c062ab2c

by biao
2015-12-24 11:57:57 +0800
Browse Files
购物车删除商品的代码优化. code review by LZF
78903450

by biao
2015-12-24 11:57:43 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
41299240

by 毕凯
2015-12-24 11:49:17 +0800
Browse Files
Merge branch 'fix/issue' into 'develop' ...
3753e973
```
1.删除购物车物品后，页面刷新不请求为你优选。2.减小购物车中商品数字的大小

See merge request !73
```
by 梁志锋
2015-12-24 11:49:30 +0800
Browse Directory »
地址选择优化
6418aa1f

by 毕凯
2015-12-24 11:49:07 +0800
Browse Directory »
do merge develop to test cart feature
80264529

by hf
2015-12-24 11:43:01 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/issue
48068cb1

by biao
2015-12-24 11:40:00 +0800
Browse Directory »
1.删除购物车物品后，页面刷新不请求为你优选。2.减小购物车中商品数字的大小. code review by LZF
22651992

by biao
2015-12-24 11:37:25 +0800
Browse Directory »
Merge branch 'master' into develop
bd56d9d0

by hf
2015-12-24 11:33:12 +0800
Browse Files
订单确认页面输入框大小
25d07fb8

by 毕凯
2015-12-24 10:39:08 +0800
Browse Files

23 Dec, 2015

19 commits

do add weixin pay call api auth sign
809900ec

by hf
2015-12-24 02:22:27 +0800
Browse Files
do add union codes
9868a65c

by hf
2015-12-24 02:16:23 +0800
Browse Files
do add weixin pay call api auth sign
2e581900

by hf
2015-12-24 02:13:39 +0800
Browse Files
do add weixin pay call api auth sign
beca0aef

by hf
2015-12-24 01:54:42 +0800
Browse Directory »
do add union codes
67ca323d

by hf
2015-12-24 01:51:49 +0800
Browse Files
do add union codes
f5e80c23

by hf
2015-12-24 01:21:47 +0800
Browse Files
do add union codes
c8a05c7a

by hf
2015-12-24 01:20:21 +0800
Browse Files
do add union code and fixes bug to weixin pay
14ef5337

by hf
2015-12-24 00:25:30 +0800
Browse Files
do add union code and fixes bug to weixin pay
682dd171

by hf
2015-12-23 23:27:46 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into hotfix/bug ...
37b04c28
```
Conflicts:
	template/m.yohobuy.com/actions/cart/index/order-ensure.phtml
```
by Rock Zhang
2015-12-23 23:07:19 +0800
Browse Directory »
do add union code and fixes bug to weixin pay
c9f081c9

by hf
2015-12-23 23:07:06 +0800
Browse Directory »
修复选择优惠券的bug（每次点击才请求搜索接口，判定优惠券是否存在） ...
1a18af4f
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-23 23:00:42 +0800
Browse Files
统计代码部分回滚
f25a931d

by 梁志锋
2015-12-23 22:40:05 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into hotfix/bug ...
d2f86567
```
Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/Home.php
```
by Rock Zhang
2015-12-23 22:33:25 +0800
Browse Files
添加微信支付有关功能
4b20bcd4

by Rock Zhang
2015-12-23 22:32:02 +0800
Browse Directory »
去除结算页面请求的单地址查询，优惠券可用性验证等接口，从而优化性能 ...
dfc2f127
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-23 22:28:13 +0800
Browse Files
订单详情页面不显示可用优惠卷数据
cf94996d

by 梁志锋
2015-12-23 22:16:18 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
ca5646ec

by 梁志锋
2015-12-23 21:29:58 +0800
Browse Files
购物车有数据时不需要请求为你优选数据
e7137e58

by 梁志锋
2015-12-23 21:29:31 +0800
Browse Files