fe / yoho-blk · Commits

22 Jul, 2016

40 commits

Merge remote-tracking branch 'origin/develop' into release/1.0 ...
30512600
```
Conflicts:
	apps/me/router.js
```
by xuqi
2016-07-22 19:23:58 +0800
Browse Files
Merge branch 'feature/shopping' into release/1.0
fa5e7778

by jinhu.tung
2016-07-22 18:56:36 +0800
Browse Files
edit product stylesheet
24c99a78

by jinhu.tung
2016-07-22 18:54:57 +0800
Browse Files
online service
3acd7850

by xuqi
2016-07-22 18:33:49 +0800
Browse Files
Merge branch 'feature/my-order' into develop
87842133

by biao
2016-07-22 18:16:19 +0800
Browse Files
fix some bugs
91ff33d7

by biao
2016-07-22 18:15:51 +0800
Browse Files
个人设置url中的checkCode验证
15046f0a

by 姜敏
2016-07-22 18:10:58 +0800
Browse Files
Merge branch 'feature/shopping' into release/1.0
757c0941

by jinhu.tung
2016-07-22 17:58:42 +0800
Browse Files
edit cart product
9fc9279d

by jinhu.tung
2016-07-22 17:56:48 +0800
Browse Files
Merge remote-tracking branch 'origin/release/1.0' into release/1.0
63d82aae

by htoooth
2016-07-22 17:36:02 +0800
Browse Files
头部的客服电话修改
199b4e19

by htoooth
2016-07-22 17:35:48 +0800
Browse Files
error and style
0b30e64b

by jinhu.tung
2016-07-22 17:32:10 +0800
Browse Files
catch error
c79df398

by jinhu.tung
2016-07-22 17:29:07 +0800
Browse Files
catch error in middleware
4d9f998d

by jinhu.tung
2016-07-22 17:27:55 +0800
Browse Files
cover header botter-bottom
40adf8d4

by jinhu.tung
2016-07-22 17:23:31 +0800
Browse Files
Merge branch 'feature/my-order' into develop
19838471

by biao
2016-07-22 17:07:08 +0800
Browse Files
optimise code style
2273a10e

by biao
2016-07-22 16:33:29 +0800
Browse Files
update for revert re add
a52b4a42

by biao
2016-07-22 16:32:53 +0800
Browse Files
Merge branch 'feature/return' into feature/my-order
fa757ab8

by biao
2016-07-22 16:15:01 +0800
Browse Files
Merge branch 'feature/return' of http://git.yoho.cn/fe/yoho-blk into feature/return
0db30a30

by biao
2016-07-22 16:12:17 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/yoho-blk into develop
a4a28e6f

by jinhu.tung
2016-07-22 16:12:15 +0800
Browse Files
update for set active color
ea01b69c

by biao
2016-07-22 16:12:04 +0800
Browse Files
静态资源调整
10af4fa3

by yyq
2016-07-22 16:11:02 +0800
Browse Files
href to pay
beccf7be

by xuqi
2016-07-22 16:07:46 +0800
Browse Files
display address at least 5 characters
0ee34806

by jinhu.tung
2016-07-22 16:05:15 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
df9111bd

by xuqi
2016-07-22 16:04:40 +0800
Browse Files
bread style
37bf5eea

by xuqi
2016-07-22 16:04:24 +0800
Browse Files
handle merge
b586f4cf

by 姜枫
2016-07-22 16:01:13 +0800
Browse Files
add goto alipay
416434bb

by 姜枫
2016-07-22 16:00:24 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
ab7e7291

by xuqi
2016-07-22 15:58:08 +0800
Browse Files
require common
31f6e076

by xuqi
2016-07-22 15:57:50 +0800
Browse Files
退货详情左侧菜单
3c19a691

by yyq
2016-07-22 15:53:09 +0800
Browse Files
handle merge
95ec5c3b

by 姜枫
2016-07-22 15:45:56 +0800
Browse Files
handle merge
f5b7e267

by 姜枫
2016-07-22 15:45:48 +0800
Browse Files
退货详情左侧菜单
2b855b86

by yyq
2016-07-22 15:45:40 +0800
Browse Files
alipay
e8d6ccba

by 姜枫
2016-07-22 15:44:22 +0800
Browse Files
alipay
ccd5582a

by 姜枫
2016-07-22 15:44:14 +0800
Browse Files
Merge branch 'feature/return' into develop
dc2d1da6

by yyq
2016-07-22 15:31:45 +0800
Browse Files
shopping cart add css namespace
e37c0964

by jinhu.tung
2016-07-22 15:28:46 +0800
Browse Files
update for refund entry
b11d577d

by biao
2016-07-22 15:26:24 +0800
Browse Files