fe / yohoblk-wap · Commits

25 Dec, 2017

1 commit

Merge remote-tracking branch 'origin/release/4.0' into feature/new-category ...
3205ce43
```
# Conflicts:
#	src/components/resources/index.js
#	src/pages/channel/index.js
```
by 李奇
2017-12-25 09:48:01 +0800
Browse Files

22 Dec, 2017

10 commits

swipe
d9de0924

by 陈峰
2017-12-22 18:16:36 +0800
Browse Files
products
1b62e51c

by 陈峰
2017-12-22 17:40:30 +0800
Browse Files
添加焦点图组件
fdbc0178

by 李奇
2017-12-22 17:18:20 +0800
Browse Files
two image single image
9c0e4ce4

by 陈峰
2017-12-22 16:20:17 +0800
Browse Files
fonts
59ad41c8

by 陈峰
2017-12-22 15:25:08 +0800
Browse Files
home
489f9ae9

by 陈峰
2017-12-22 14:46:18 +0800
Browse Files
commit
0c567280

by 陈峰
2017-12-22 14:11:55 +0800
Browse Files
merge
d4e4b762

by 陈峰
2017-12-22 13:43:35 +0800
Browse Files
update
e349c160

by 陈峰
2017-12-22 13:38:34 +0800
Browse Files
merge
166dc848

by 陈峰
2017-12-22 10:58:37 +0800
Browse Files

04 Dec, 2017

5 commits

时间延长
ccd007a1

by 李奇
2017-12-04 17:43:35 +0800
Browse Files
Revert "去除老的_YOHOUID、_YOHOTOKEN先关逻辑" ...
0692529d
```
This reverts commit 5b299241.
```
by 李奇
2017-12-04 17:41:42 +0800
Browse Files
Revert "提示时间延长" ...
c21da277
```
This reverts commit d029b594.
```
by 李奇
2017-12-04 17:39:08 +0800
Browse Files
去除老的_YOHOUID、_YOHOTOKEN先关逻辑
5b299241

by 李奇
2017-12-04 17:02:09 +0800
Browse Files
提示时间延长
d029b594

by 李奇
2017-12-04 10:26:32 +0800
Browse Files

01 Dec, 2017

2 commits

限定BLK APP提示
131a37f1

by 李奇
2017-12-01 18:37:29 +0800
Browse Files
BLK老版本没有sessionKey导致的401提示升级
083abaff

by 李奇
2017-12-01 18:28:21 +0800
Browse Files

28 Nov, 2017

2 commits

修改开发环境配置到test2
7a777aaf

by 李奇
2017-11-28 12:09:21 +0800
Browse Files
修改开发环境配置到test2
48cd266c

by 李奇
2017-11-28 10:42:30 +0800
Browse Files

27 Nov, 2017

1 commit

Merge branch 'master' into feature/add-sessionKey
95f1495c

by 李奇
2017-11-27 10:15:00 +0800
Browse Files

17 Nov, 2017

2 commits

Update package.json
002be747

by 陈峰
2017-11-17 13:38:59 +0800
Browse Files
Merge branch 'hotfix/iphonex' into 'master' ...
572f907a
```
Hotfix/iphonex



See merge request !56
```
by 陈峰
2017-11-17 13:36:16 +0800
Browse Files

16 Nov, 2017

3 commits

退货页面双头部修改
2a78eb67

by 李奇
2017-11-16 18:05:14 +0800
Browse Files
开发环境配置修改
c2b2e4ef

by 李奇
2017-11-16 17:11:38 +0800
Browse Files
定金预售商品显示已售罄;分享链接修正
70786aaa

by 李奇
2017-11-16 16:46:09 +0800
Browse Files

15 Nov, 2017

2 commits

Revert "商品列表ios灵敏度" ...
dbe4a020
```
This reverts commit 924d3a84
```
by 陈峰
2017-11-15 14:27:48 +0800
Browse Files
Revert "品牌列表灵敏度" ...
c4e06f30
```
This reverts commit 2317447b
```
by 陈峰
2017-11-15 14:27:39 +0800
Browse Files

13 Nov, 2017

5 commits

Merge branch 'master' of http://git.yoho.cn/fe/yohoblk-wap
1a896fa3

by 陈峰
2017-11-13 15:31:15 +0800
Browse Files
品牌列表灵敏度
2317447b

by 陈峰
2017-11-13 15:16:35 +0800
Browse Files
Update package.json
8553dc37

by 陈峰
2017-11-13 13:57:33 +0800
Browse Files
Update package.json
8858ef31

by 陈峰
2017-11-13 13:57:06 +0800
Browse Files
商品列表ios灵敏度
924d3a84

by 陈峰
2017-11-13 12:02:26 +0800
Browse Files

08 Nov, 2017

3 commits

Update package.json
df4178a7

by 陈峰
2017-11-08 16:48:15 +0800
Browse Files
Update package.json
3e3eb957

by 陈峰
2017-11-08 16:43:35 +0800
Browse Files
remove memcahe slave
8cdf36ed

by 陈峰
2017-11-08 16:42:47 +0800
Browse Files

02 Nov, 2017

1 commit

session_key添加
9c560b66

by 李奇
2017-11-02 17:50:54 +0800
Browse Files

24 Oct, 2017

3 commits

2.0.22
d007adf3

by 陈峰
2017-10-24 18:51:35 +0800
Browse Files
commit
8fb67132

by 陈峰
2017-10-24 18:51:06 +0800
Browse Files
Merge remote-tracking branch 'origin/master' into feature/add-sessionKey
82a1e190

by 李奇
2017-10-24 09:33:15 +0800
Browse Files