fe / YOHOBUYWAP · Commits

28 Apr, 2016

29 commits

星潮gulp ge
4b48080d

by 王水玲
2016-04-28 19:03:22 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
019ebbc8

by 王水玲
2016-04-28 19:00:05 +0800
Browse Files
Merge branch 'develop/wap' of http://git.dev.yoho.cn/web/yohobuywap into develop/wap
100ad9e6

by 王水玲
2016-04-28 18:59:09 +0800
Browse Files
星潮bug修改
28fe5851

by 王水玲
2016-04-28 18:58:43 +0800
Browse Files
解决 dist打包冲突
434eb86b

by 郝肖肖
2016-04-28 18:49:44 +0800
Browse Files
h5 购物车支付状态
59ee8f27

by 郝肖肖
2016-04-28 18:33:55 +0800
Browse Files
新潮gulp ge
0f28766e

by 王水玲
2016-04-28 17:35:30 +0800
Browse Files
星潮bug修改
0258d200

by 王水玲
2016-04-28 17:10:31 +0800
Browse Files
Merge branch 'develop/wap' of http://git.dev.yoho.cn/web/yohobuywap into develop/wap
41fe841f

by 王水玲
2016-04-28 16:56:43 +0800
Browse Files
星潮bug修改
25329fcb

by 王水玲
2016-04-28 16:56:16 +0800
Browse Files
Merge branch 'beta/wap' of http://git.dev.yoho.cn/web/yohobuywap into beta/wap ...
d491248b
```
# Conflicts:
#	static/dist/myohobuy/1.3.17/index.css
#	static/dist/myohobuy/1.3.17/index.js
```
by liangxs
2016-04-28 16:30:47 +0800
Browse Files
重新编译js css color-bug合并
c69a5446

by xiaowei
2016-04-28 16:08:11 +0800
Browse Files
side color bug
bb070375

by xiaowei
2016-04-28 15:33:40 +0800
Browse Files
领券中心楼层白边bug修改
58b63db4

by liangxs
2016-04-28 15:17:59 +0800
Browse Files
星潮gulpge
0f93cbdf

by yangyang
2016-04-28 15:11:04 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
a59eb365

by yangyang
2016-04-28 15:09:02 +0800
Browse Files
Merge branch 'feature/coupon' into beta/wap
36e48650

by liangxs
2016-04-28 15:07:48 +0800
Browse Files
星潮gulp ge
2286395c

by 王水玲
2016-04-28 15:03:39 +0800
Browse Files
Merge branch 'develop/wap' of http://git.dev.yoho.cn/web/yohobuywap into develop/wap
8dea67ef

by yangyang
2016-04-28 14:56:59 +0800
Browse Files
Merge branch 'feature/coupon' of http://git.dev.yoho.cn/web/yohobuywap into feature/coupon
8d67c5db

by liangxs
2016-04-28 14:56:48 +0800
Browse Files
修改新潮教室逛打开方式
64daf059

by yangyang
2016-04-28 14:56:48 +0800
Browse Files
未登录时领券弹框bug和楼层有红白修复
c61f9d09

by liangxs
2016-04-28 14:55:53 +0800
Browse Files
Merge branch 'feature/coupon' into beta/wap
a32384b5

by 郭成尧
2016-04-28 14:33:57 +0800
Browse Files
merge branch 'feature/coupon' of http://git.dev.yoho.cn/web/yohobuywap into feature/coupon ...
a0c516b8
```
some_code
```
by 郭成尧
2016-04-28 14:29:11 +0800
Browse Files
是否是APP判断改回原来的方式
905bccdb

by 郭成尧
2016-04-28 14:28:54 +0800
Browse Files
消息提醒中的删除按钮位置调整
3308500a

by 张丽霞
2016-04-28 13:24:27 +0800
Browse Files
星潮bug修改
1a9b1966

by 王水玲
2016-04-28 12:25:53 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
7519df4f

by Rock Zhang
2016-04-28 09:52:13 +0800
Browse Files
按时间排序我的消息 ...
d9f5880b
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-04-28 09:51:12 +0800
Browse Files

27 Apr, 2016

11 commits

领券中心空白提示
70bcf2e5

by liangxs
2016-04-27 19:11:02 +0800
Browse Files
Merge branch 'feature/coupon' into beta/wap
afac2dca

by liangxs
2016-04-27 19:08:17 +0800
Browse Files
领券页面空白提示框
b788adf5

by liangxs
2016-04-27 18:39:56 +0800
Browse Files
gulp ge
330edd07

by 毕凯
2016-04-27 18:10:07 +0800
Browse Files
删除按钮位置跳转
1ff1e48f

by 毕凯
2016-04-27 18:09:26 +0800
Browse Files
我的消息标题过长的问题
27eb4680

by 阿达
2016-04-27 18:02:36 +0800
Browse Files
我的消息中未读消息小红点位置调整
982c7f02

by 张丽霞
2016-04-27 17:58:15 +0800
Browse Files
把被梁删掉的代码补回去
c4871de4

by 郭成尧
2016-04-27 17:24:32 +0800
Browse Files
Merge branch 'feature/coupon' of http://git.dev.yoho.cn/web/yohobuywap into feature/coupon ...
7f8124dc
```
some
```
by 郭成尧
2016-04-27 17:23:04 +0800
Browse Files
领券bug修复
5e48cffc

by liangxs
2016-04-27 17:13:52 +0800
Browse Files
Merge branch 'feature/coupon' of http://git.dev.yoho.cn/web/yohobuywap into feature/coupon ...
8afcbf1e
```
# Conflicts:
#	template/m.yohobuy.com/actions/index/coupon/index.phtml
```
by liangxs
2016-04-27 17:09:28 +0800
Browse Files