fe / yohobuy-node · Commits

26 Sep, 2017

2 commits

Merge branch 'feature/channel-op' into gray ...
61cd20cc
```
# Conflicts:
#	config/common.js
```
by htoooth
2017-09-26 12:00:53 +0800
Browse Directory »
fix
d3fe0169

by htoooth
2017-09-26 11:59:04 +0800
Browse Files

25 Sep, 2017

38 commits

reg ctx
1df9514f

by 周少峰
2017-09-25 20:12:13 +0800
Browse Directory »
update version
0068f22f

by 周少峰
2017-09-25 19:58:02 +0800
Browse Files
Merge branch 'release/6.1' into 'gray' ...
757743b2
```
礼品卡获取用户手机号



See merge request !169
```
by 周少峰
2017-09-25 19:57:06 +0800
Browse Directory »
Merge branch 'feature/giftCart' into release/6.1
6ee5b2fe

by 郝肖肖
2017-09-25 19:53:55 +0800
Browse Directory »
mobile
618fcb25

by yyq
2017-09-25 19:53:27 +0800
Browse Files
'礼品卡，用户信息'
00d96607

by 郝肖肖
2017-09-25 19:53:25 +0800
Browse Files
refush
79b08c6e

by yyq
2017-09-25 19:14:27 +0800
Browse Directory »
refush
7b8acfe5

by yyq
2017-09-25 19:12:46 +0800
Browse Files
Merge branch 'release/6.1' of git.yoho.cn:fe/yohobuy-node into release/6.1
ba1d75f3

by yyq
2017-09-25 19:08:28 +0800
Browse Files
mobile
a594811c

by yyq
2017-09-25 19:08:13 +0800
Browse Files
Merge branch 'feature/giftCart' into release/6.1
318766c1

by 郝肖肖
2017-09-25 18:42:06 +0800
Browse Files
'代码检查'
f0de80cb

by 郝肖肖
2017-09-25 18:41:36 +0800
Browse Files
'礼品卡实时获取用户信息'
70c9006b

by 郝肖肖
2017-09-25 18:39:50 +0800
Browse Files
Merge branch 'hotfix/contact' into gray
4685cdfa

by 周少峰
2017-09-25 18:38:20 +0800
Browse Directory »
my message
8a1a0f1d

by 周少峰
2017-09-25 18:37:34 +0800
Browse Directory »
Merge branch 'gray' of git.yoho.cn:fe/yohobuy-node into gray
a183a901

by 周少峰
2017-09-25 18:27:19 +0800
Browse Files
Merge branch 'hotfix/contact' into gray
0d823ae6

by 周少峰
2017-09-25 18:27:16 +0800
Browse Files
- replace *
4ca270b9

by 周少峰
2017-09-25 18:27:03 +0800
Browse Files
Merge branch 'release/6.1' into gray
8d00610d

by yyq
2017-09-25 17:52:32 +0800
Browse Files
invoice detail
db657099

by yyq
2017-09-25 17:52:06 +0800
Browse Files
Merge branch 'master' into gray
cfa466d2

by 周少峰
2017-09-25 17:47:26 +0800
Browse Files
Merge branch 'hotfix/contact'
00be9f2a

by 周少峰
2017-09-25 17:22:17 +0800
Browse Files
tell numb
4b2b30e3

by 周少峰
2017-09-25 17:21:50 +0800
Browse Files
Merge branch 'gray' of git.yoho.cn:fe/yohobuy-node into gray
c8b0d74f

by 周少峰
2017-09-25 16:54:11 +0800
Browse Files
Merge branch 'hotfix/contact' into gray
12bd8343

by 周少峰
2017-09-25 16:53:55 +0800
Browse Files
change contact
72fef056

by 周少峰
2017-09-25 16:53:42 +0800
Browse Files
Merge branch 'hotfix/chanpinKw' into gray
ccbe954e

by yyq
2017-09-25 15:58:23 +0800
Browse Files
chanpin url
449f2500

by yyq
2017-09-25 15:56:52 +0800
Browse Files
Merge branch 'release/6.1' into 'gray' ...
30ed38bc
```
Release/6.1



See merge request !168
```
by 杨延青
2017-09-25 15:30:47 +0800
Browse Files
jit tip
3f1cdb1a

by yyq
2017-09-25 14:23:30 +0800
Browse Files
Merge branch 'release/6.1' of git.yoho.cn:fe/yohobuy-node into release/6.1
47db7344

by yyq
2017-09-25 13:47:50 +0800
Browse Directory »
fix order detail
0212fe80

by yyq
2017-09-25 13:47:26 +0800
Browse Directory »
Merge branch 'release/6.1' into gray
b3ecfd17

by 周少峰
2017-09-25 11:16:48 +0800
Browse Files
Merge branch 'feature/couponStatus' into release/6.1
959b8e16

by 周少峰
2017-09-25 11:16:02 +0800
Browse Files
encryption string
e14b768e

by 周少峰
2017-09-25 11:15:40 +0800
Browse Files
Merge branch 'feature/couponStatus' into release/6.1
6e165909

by 周少峰
2017-09-25 10:49:11 +0800
Browse Files
format chagne
5bce73ee

by 周少峰
2017-09-25 10:46:58 +0800
Browse Files
Merge branch 'feature/couponStatus' into release/6.1
bca00d63

by 周少峰
2017-09-25 10:27:59 +0800
Browse Files