fe / YOHOBUYWAP · Commits

23 Dec, 2015

36 commits

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 Files
修复选择优惠券的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 Files
去除结算页面请求的单地址查询，优惠券可用性验证等接口，从而优化性能 ...
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
优化结算页面的性能 ...
5c34bfac
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-23 19:21:14 +0800
Browse Files
侧边栏 z-index值增大
db6e957d

by 毕凯
2015-12-23 17:21:24 +0800
Browse Files
商品列表统计代码修改
5bf159a9

by 梁志锋
2015-12-23 16:22:50 +0800
Browse Files
yas不能采用debug版本
27d4fbe6

by 梁志锋
2015-12-23 15:53:05 +0800
Browse Files
统计代码在load结束之后执行优先保证业务逻辑 code review by hf
7f3ab3ff

by 梁志锋
2015-12-23 15:32:39 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
967a4551

by 梁志锋
2015-12-23 15:21:22 +0800
Browse Files
统计代码在load结束之后执行优先保证业务逻辑 code review by hf
a3c73515

by 梁志锋
2015-12-23 15:20:51 +0800
Browse Files
Merge branch 'fix/issue' into 'develop' ...
83485276
```
解决购物车页面弹出时，商品详情页会滚动的问题

See merge request !72
```
by 毕凯
2015-12-23 14:34:02 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into fix/issue
fe274182

by biao
2015-12-23 14:30:23 +0800
Browse Files
解决购物车页面弹出时，商品详情页会滚动的问题。 code review by BIKAI.
42d653e3

by biao
2015-12-23 14:30:11 +0800
Browse Files
resolve conflict
58d95491

by biao
2015-12-23 11:38:04 +0800
Browse Files
Merge branch 'zhaobiao/yohobuy-fix/issue' into develop
66f02a01

by biao
2015-12-23 11:36:25 +0800
Browse Files
optimise the few-tag position according to the good img update. code reivew by XWG
35051590

by biao
2015-12-23 11:31:54 +0800
Browse Files
Merge branch 'fix/issue' into 'develop' ...
fe2ccc9e
```
购物车图片清晰度优化. code review by XWG

See merge request !70
```
by weiguang.xie
2015-12-23 11:24:14 +0800
Browse Files
update for optimise the good image in cart
e3ce0372

by biao
2015-12-23 11:18:29 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
f5bd151a

by 毕凯
2015-12-23 11:07:17 +0800
Browse Files
购物车加价购标签样式
32ad48fd

by 毕凯
2015-12-23 11:07:13 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
a1f5af61

by 梁志锋
2015-12-23 11:03:54 +0800
Browse Files
购物车中失效商品不能删除
4ea133a0

by 梁志锋
2015-12-23 11:03:06 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
d8013269

by Rock Zhang
2015-12-23 10:56:02 +0800
Browse Files
修改购物车商品图片大小为120x160
4dcf899e

by Rock Zhang
2015-12-23 10:55:48 +0800
Browse Files
加价购商品图片和商品名称之间没有间隔
5efdef40

by 毕凯
2015-12-23 10:54:11 +0800
Browse Files
Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
df8ecd95

by Rock Zhang
2015-12-23 10:51:51 +0800
Browse Files
修复购物车中VIP价格缺少的bug ...
1c71d66d
```
Code Review By Rock Zhang
```
by Rock Zhang
2015-12-23 10:51:10 +0800
Browse Files
Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
c8271c24

by 毕凯
2015-12-23 10:46:24 +0800
Browse Files
订单页面选择地址删除地址清cookie
af3b7ceb

by 毕凯
2015-12-23 10:46:18 +0800
Browse Files
去除url调试信息
2f56279f

by Rock Zhang
2015-12-23 09:49:59 +0800
Browse Files

22 Dec, 2015

4 commits

Merge branch 'master' of http://git.dev.yoho.cn/web/yohobuy
7ecd8ff7

by hf
2015-12-22 20:45:21 +0800
Browse Files
do fixes bug to weixin pay
619f8bbd

by hf
2015-12-22 20:44:46 +0800
Browse Files
christmas临时修改下载文件
9021c95f

by whb
2015-12-22 15:59:37 +0800
Browse Files
临时修改下载文件
8c6968d6

by whb
2015-12-22 15:42:31 +0800
Browse Files