wangshusheng / YOHOBUYPC · Commits

03 Mar, 2016

26 commits

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

by 王水玲
2016-03-03 17:49:40 +0800
Browse Files
新人专享列表
524663bd

by 王水玲
2016-03-03 17:48:04 +0800
Browse Files
更新活动静态资源版本号
571d5e8c

by 毕凯
2016-03-03 17:23:24 +0800
Browse Files
修复app中不能领券的bug ...
906171a1
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-03-03 17:18:34 +0800
Browse Files
fix
442f549b

by Rock Zhang
2016-03-03 17:07:21 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap ...
8e9c2183
```
Conflicts:
	static/dist/myohobuy/1.3.8/index.css
	static/dist/myohobuy/1.3.8/lib.js
```
by Rock Zhang
2016-03-03 17:05:49 +0800
Browse Files
更新新势力领券活动有关逻辑
06e548db

by Rock Zhang
2016-03-03 17:03:06 +0800
Browse Files
seajs 路径修改
974aec16

by 毕凯
2016-03-03 16:02:46 +0800
Browse Files
静态资源
b55c4f61

by Rock Zhang
2016-03-03 16:01:54 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap ...
ddf03d33
```
Conflicts:
	static/dist/myohobuy/1.3.8/index.css
	static/dist/myohobuy/1.3.8/lib.js
```
by Rock Zhang
2016-03-03 15:47:10 +0800
Browse Files
静态资源打包更新
9e42dde9

by 毕凯
2016-03-03 15:45:08 +0800
Browse Files
更新到201603031526静态资源
bb0acd6d

by Rock Zhang
2016-03-03 15:26:07 +0800
Browse Files
gulp ge提交
df7cacd8

by 梁志锋
2016-03-03 15:21:40 +0800
Browse Files
gulp ge提交
581f61c9

by 梁志锋
2016-03-03 15:06:41 +0800
Browse Files
侧边栏下半部分减小2像素
8e11c5ca

by 梁志锋
2016-03-03 14:49:52 +0800
Browse Files
Merge branch 'develop/wap' of git.dev.yoho.cn:web/yohobuy into develop/wap
3c2b1910

by 毕凯
2016-03-03 14:07:14 +0800
Browse Files
更新活动静态资源版本号
899e70e9

by 毕凯
2016-03-03 14:07:02 +0800
Browse Files
gulp ge文件提交
d6d756e9

by 梁志锋
2016-03-03 13:29:00 +0800
Browse Files
gulp ge文件提交
8b9eb5a0

by 梁志锋
2016-03-03 13:11:50 +0800
Browse Files
Merge branch 'develop/wap' of http://git.dev.yoho.cn/web/yohobuy into develop/wap
2084120c

by 梁志锋
2016-03-03 13:11:00 +0800
Browse Files
gulp ge提交
a999c09f

by 梁志锋
2016-03-03 13:10:11 +0800
Browse Files
首页新人专享修改
9cf961e1

by 王水玲
2016-03-03 10:56:08 +0800
Browse Files
首页新人专享修改
71c89be6

by 王水玲
2016-03-03 10:55:35 +0800
Browse Files
Merge branch 'feature/newpeople' into develop/wap
e41e36c3

by 王水玲
2016-03-03 10:02:35 +0800
Browse Files
首页新人专享模块添加
d90d0311

by 王水玲
2016-03-03 09:48:30 +0800
Browse Files
首页新人专享模块添加
317d6515

by 王水玲
2016-03-03 09:47:37 +0800
Browse Files

02 Mar, 2016

14 commits

侧边栏下半部分减小2像素
a61b7830

by 梁志锋
2016-03-02 19:59:51 +0800
Browse Files
收藏浏览记录的失效商品点击效果
7c3823fe

by 梁志锋
2016-03-02 19:51:45 +0800
Browse Files
收藏浏览记录的失效商品点击效果
d811f26a

by 梁志锋
2016-03-02 19:49:33 +0800
Browse Files
Merge remote-tracking branch 'origin/develop/wap' into develop/wap ...
941e5189
```
# Conflicts:
#	yohobuy/m.yohobuy.com/application/controllers/Home.php
```
by 梁志锋
2016-03-02 19:47:50 +0800
Browse Files
收藏浏览记录的失效商品点击效果
fc966ef8

by 梁志锋
2016-03-02 19:46:08 +0800
Browse Files
Merge branch 'feature/wap/postcss' into develop/wap
f2d1dd5d

by 毕凯
2016-03-02 18:31:49 +0800
Browse Files
侧边栏逛返回点击效果
92a19b16

by 梁志锋
2016-03-02 17:48:16 +0800
Browse Files
修改女生节新势力领券活动中的微信分享地址
092dc23d

by Rock Zhang
2016-03-02 17:46:24 +0800
Browse Files
侧边栏逛返回点击效果
db9e52ac

by 梁志锋
2016-03-02 17:45:20 +0800
Browse Files
更新到201603021735静态资源
59b17eda

by Rock Zhang
2016-03-02 17:35:35 +0800
Browse Files
修复个人中心优惠券显示的问题
7033dd3b

by Rock Zhang
2016-03-02 17:31:43 +0800
Browse Files
scss 文件备份
d424e1a3

by 毕凯
2016-03-02 17:13:05 +0800
Browse Files
css 优化
6a3e0594

by 毕凯
2016-03-02 17:04:28 +0800
Browse Files
code review by fei.hong: do modify coupon newuser huodong
5815f259

by hf
2016-03-02 16:47:53 +0800
Browse Files