fe / yoho-blk · Commits

15 Jul, 2016

30 commits

add css
4d8ab5ff

by htoooth
2016-07-15 14:27:18 +0800
Browse Files
fix css
10a05b2a

by htoooth
2016-07-15 14:25:17 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into develop
676b2d5b

by htoooth
2016-07-15 11:20:18 +0800
Browse Files
remove dependency lib
f3f9b550

by htoooth
2016-07-15 11:18:40 +0800
Browse Files
handle merge
c6e0c68a

by 姜枫
2016-07-15 11:18:07 +0800
Browse Files
handle merge
a0a821bd

by 姜枫
2016-07-15 11:17:56 +0800
Browse Files
修改店铺介绍不显示问题
f90539ce

by 姜枫
2016-07-15 11:17:42 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/yoho-blk into develop
50c6ac81

by xuqi
2016-07-15 11:17:36 +0800
Browse Files
修改店铺介绍不显示问题
f1ece1fe

by 姜枫
2016-07-15 11:17:32 +0800
Browse Files
uid to req.user.uid
29f30ed5

by xuqi
2016-07-15 11:15:34 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into develop
59431c79

by htoooth
2016-07-15 11:12:21 +0800
Browse Files
add user auth
6c9867e6

by htoooth
2016-07-15 10:59:53 +0800
Browse Files
address controllers
e09161e5

by 姜敏
2016-07-15 10:08:07 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/yoho-blk into develop
2c8842a5

by xuqi
2016-07-15 10:00:53 +0800
Browse Files
result data
b7b45c6f

by xuqi
2016-07-15 09:58:07 +0800
Browse Files
handle merge
50a5de76

by 姜枫
2016-07-15 09:57:03 +0800
Browse Files
merge from feature/product
33a351ad

by 姜枫
2016-07-15 09:56:19 +0800
Browse Files
handle merge
e4716f90

by 姜枫
2016-07-15 09:55:22 +0800
Browse Files
Merge branch 'passport' into develop
8170ae41

by htoooth
2016-07-15 09:55:17 +0800
Browse Files
完善列表，添加店铺首页
a6bfd70c

by 姜枫
2016-07-15 09:55:03 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/yoho-blk into develop
30abd0d6

by htoooth
2016-07-15 09:54:59 +0800
Browse Files
fix
a800ff81

by htoooth
2016-07-15 09:54:28 +0800
Browse Files
address return
fbb575ca

by 姜敏
2016-07-15 09:53:28 +0800
Browse Files
fix
a9348cad

by htoooth
2016-07-15 09:52:51 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/yoho-blk into develop
a1afb2ca

by 姜敏
2016-07-15 09:52:29 +0800
Browse Files
个人中心--yoho币和收货地址修复样式和接口
37498704

by 姜敏
2016-07-15 09:52:19 +0800
Browse Files
个人中心--yoho币和收货地址修复样式和接口
f63abec9

by 姜敏
2016-07-15 09:51:46 +0800
Browse Files
address return
4bfa5ada

by xuqi
2016-07-15 09:46:03 +0800
Browse Files
Merge branch 'feature/shopping' into develop ...
b1872346
```
Conflicts:
	public/scss/me/_address.css
```
by xuqi
2016-07-15 09:31:36 +0800
Browse Files
use my uid
0b18a106

by xuqi
2016-07-15 09:27:04 +0800
Browse Files

14 Jul, 2016

10 commits

order submit
931e84dd

by xuqi
2016-07-14 20:37:42 +0800
Browse Files
add fix
52b78e08

by htoooth
2016-07-14 20:20:16 +0800
Browse Files
page style & price operation
b46b6440

by xuqi
2016-07-14 19:49:06 +0800
Browse Files
fix
fed8b51b

by htoooth
2016-07-14 18:17:25 +0800
Browse Files
bv nav
18b69710

by xuqi
2016-07-14 17:46:40 +0800
Browse Files
remove default address set when add/update
990e79ee

by xuqi
2016-07-14 17:34:10 +0800
Browse Files
fix
ad92c123

by htoooth
2016-07-14 17:15:19 +0800
Browse Files
fix
fca518f1

by htoooth
2016-07-14 17:12:09 +0800
Browse Files
order submit
1c50d95d

by xuqi
2016-07-14 17:00:38 +0800
Browse Files
refactor
8f8efca7

by htoooth
2016-07-14 16:49:27 +0800
Browse Files