fe / YOHOBUYWAP · Commits

29 Apr, 2016

19 commits

Merge branch 'feature/coupon' into beta/wap
41a035d8

by 郭成尧
2016-04-29 13:32:34 +0800
Browse Files
Merge branch 'feature/coupon' of http://git.dev.yoho.cn/web/yohobuywap into feature/coupon ...
97f14868
```
some
```
by 郭成尧
2016-04-29 13:31:28 +0800
Browse Files
修改了templateName判断
213d073e

by 郭成尧
2016-04-29 13:31:18 +0800
Browse Files
优惠券可用颜色
13b5d317

by 毕凯
2016-04-29 13:25:22 +0800
Browse Files
Merge branch 'feature/coupon' of http://git.dev.yoho.cn/web/yohobuywap into feature/coupon
d33138d7

by liangxs
2016-04-29 13:23:14 +0800
Browse Files
领券banner图片变形bug和蒙层点击bug修复
c1568d09

by liangxs
2016-04-29 13:22:55 +0800
Browse Files
冲突解决
95054400

by 郭成尧
2016-04-29 12:59:26 +0800
Browse Files
两个TITLE问题解决
67a88480

by 郭成尧
2016-04-29 12:58:04 +0800
Browse Files
Merge branch 'feature/coupon' into beta/wap
22cc71e0

by 郭成尧
2016-04-29 12:53:35 +0800
Browse Files
Merge branch 'feature/coupon' of http://git.dev.yoho.cn/web/yohobuywap into feature/coupon ...
22417ee0
```
some
```
by 郭成尧
2016-04-29 12:52:44 +0800
Browse Files
title可以设置
47536035

by 郭成尧
2016-04-29 12:52:15 +0800
Browse Files
星潮gulp ge
6bb1faab

by 王水玲
2016-04-29 11:22:47 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
a9f01894

by 王水玲
2016-04-29 11:21:13 +0800
Browse Files
星潮样式修改
af725b0b

by 王水玲
2016-04-29 11:19:34 +0800
Browse Files
星潮 gulp ge
85cfd0d3

by 王水玲
2016-04-29 10:16:37 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
d52d2166

by 王水玲
2016-04-29 10:14:54 +0800
Browse Files
Merge branch 'develop/wap' of http://git.dev.yoho.cn/web/yohobuywap into develop/wap
1d054f3d

by 王水玲
2016-04-29 10:14:10 +0800
Browse Files
星潮bug修改
eeb3cfe0

by 王水玲
2016-04-29 10:14:00 +0800
Browse Files
gulp ge
9a5ca703

by 毕凯
2016-04-29 09:55:29 +0800
Browse Files

28 Apr, 2016

21 commits

Merge branch 'hotfix/wapCat' into beta/wap
29d0d067

by 郝肖肖
2016-04-28 19:28:42 +0800
Browse Files
Merge branch 'develop/wap' of http://git.dev.yoho.cn/web/yohobuywap into develop/wap
be4c69ae

by 郝肖肖
2016-04-28 19:27:36 +0800
Browse Files
Merge branch 'hotfix/wapCat' into develop/wap
29151721

by 郝肖肖
2016-04-28 19:27:12 +0800
Browse Files
判断变量是否定义
8af40c77

by 郝肖肖
2016-04-28 19:26:43 +0800
Browse Files
星潮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