fe / yoho-blk · Commits

25 Jul, 2016

40 commits

Merge branch 'fix/confirm' into develop
2ec02462

by biao
2016-07-25 17:52:58 +0800
Browse Files
update for confirm recevie
db58146b

by biao
2016-07-25 17:52:14 +0800
Browse Files
资讯
7b2c68e5

by zhangxiaoru
2016-07-25 17:40:56 +0800
Browse Files
资讯
573cf7da

by zhangxiaoru
2016-07-25 17:40:42 +0800
Browse Files
资讯
3e6bebe3

by zhangxiaoru
2016-07-25 17:40:19 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/yoho-blk into develop
5e369fb5

by yyq
2016-07-25 17:21:43 +0800
Browse Files
商品颜色色值
22a1103c

by yyq
2016-07-25 17:21:00 +0800
Browse Files
品牌简介node处理
943beba6

by yyq
2016-07-25 17:16:55 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/yoho-blk into develop
2f890c95

by biao
2016-07-25 17:08:55 +0800
Browse Files
Merge branch 'feature/return' into develop
ff898d90

by biao
2016-07-25 17:08:42 +0800
Browse Files
update for blur
727067c9

by biao
2016-07-25 17:08:16 +0800
Browse Files
editorial
936e1b4d

by zhangxiaoru
2016-07-25 16:53:30 +0800
Browse Files
editorial
e01ff01a

by zhangxiaoru
2016-07-25 16:52:29 +0800
Browse Files
Merge branch 'feature/return' of http://git.yoho.cn/fe/yoho-blk into feature/return
a1e1d1fe

by biao
2016-07-25 16:26:54 +0800
Browse Files
update for validate
ca6f039a

by biao
2016-07-25 16:24:28 +0800
Browse Files
brand url of payment goods list
0083f01f

by xuqi
2016-07-25 16:15:20 +0800
Browse Files
调整模板。
903ee606

by htoooth
2016-07-25 16:12:32 +0800
Browse Files
Merge remote-tracking branch 'origin/release/1.0' into release/1.0
6ceb2b1a

by htoooth
2016-07-25 16:04:07 +0800
Browse Files
remove unuseless file
5999e660

by htoooth
2016-07-25 16:03:51 +0800
Browse Files
调整 CSS。
baa43906

by htoooth
2016-07-25 16:00:42 +0800
Browse Files
exchange
72d26df7

by zhangxiaoru
2016-07-25 15:55:22 +0800
Browse Files
exchange
6b42bc6a

by zhangxiaoru
2016-07-25 15:53:55 +0800
Browse Files
exchange
0b019730

by zhangxiaoru
2016-07-25 15:53:03 +0800
Browse Files
handle merge
4411ba15

by 姜枫
2016-07-25 15:51:00 +0800
Browse Files
修复格式。
6fa57fbd

by htoooth
2016-07-25 15:50:29 +0800
Browse Files
handle merge
bb58fbb4

by 姜枫
2016-07-25 15:50:20 +0800
Browse Files
remove console.log
4f7454f0

by 姜枫
2016-07-25 15:44:27 +0800
Browse Files
Merge remote-tracking branch 'origin/release/1.0' into release/1.0 ...
3f04d614
```
# Conflicts:
#	config/common.js
```
by htoooth
2016-07-25 15:24:42 +0800
Browse Files
修复重复绑定的问题。
3a828c06

by htoooth
2016-07-25 15:23:05 +0800
Browse Files
Merge branch 'feature/return' into develop
8dbaa6de

by yyq
2016-07-25 15:16:02 +0800
Browse Files
api: http://testapi.yoho.cn:28078/, // devapi.yoho.cn:58078 testapi.yoho.cn:2807… ...
56bab103
```
…8 devapi.yoho.cn:58078
```
by 姜枫
2016-07-25 15:13:08 +0800
Browse Files
fix bug 225
2aaa452f

by 姜枫
2016-07-25 15:12:35 +0800
Browse Files
Merge branch 'feature/return' of git.yoho.cn:fe/yoho-blk into feature/return
9f439234

by yyq
2016-07-25 15:08:46 +0800
Browse Files
退换货方法注释
29352c33

by yyq
2016-07-25 15:08:10 +0800
Browse Files
change css
9bacd16e

by htoooth
2016-07-25 15:05:18 +0800
Browse Files
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
92e717a6

by jinhu.tung
2016-07-25 14:37:05 +0800
Browse Files
remove products at least one
dcbdcadf

by jinhu.tung
2016-07-25 14:36:53 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
6216c625

by xuqi
2016-07-25 14:31:04 +0800
Browse Files
Merge branch 'feature/shopping' into release/1.0
7900ce5d

by jinhu.tung
2016-07-25 14:30:44 +0800
Browse Files
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
25f52749

by jinhu.tung
2016-07-25 14:30:00 +0800
Browse Files