fe / yohobuy-portal-fe2 · Commits

29 Sep, 2017

3 commits

Merge branch 'dev_限定和秒杀互斥' into test6.2
bc71067d

by zhaoqing
2017-09-29 15:53:22 +0800
Browse Files
去除SKN限制长度
445ecae6

by zhaoqing
2017-09-29 10:05:28 +0800
Browse Files
限售商品
aefbf70a

by zhaoqing
2017-09-29 09:55:06 +0800
Browse Files

27 Sep, 2017

1 commit

倒计时楼层
c0a461ac

by wangwei
2017-09-27 13:50:51 +0800
Browse Files

22 Sep, 2017

5 commits

限定和秒杀商品互斥
930f1c16

by zhaoqing
2017-09-22 16:33:12 +0800
Browse Files
build
64c6ddef

by xuhongyun
2017-09-22 15:14:24 +0800
Browse Files
Merge branch 'test6.1' into gray
ddb6581a

by mali
2017-09-22 15:19:48 +0800
Browse Files
Merge branch 'dev6.1' into test6.1
e1031402

by mali
2017-09-22 15:19:33 +0800
Browse Files
第一张图加尺寸文字，324*596，别校验 ...
305100fc
```
第二张图，购物车图片不要必填
```
by chenchao
2017-09-22 15:14:56 +0800
Browse Files

21 Sep, 2017

1 commit

build
1a069679

by xuhongyun
2017-09-21 16:00:49 +0800
Browse Files

20 Sep, 2017

5 commits

Merge branch 'dev6.1' into test6.1
0615dfdd

by mali
2017-09-20 15:46:17 +0800
Browse Files
店铺添加BLK类型
cf4aeac6

by mali
2017-09-20 15:45:30 +0800
Browse Files
Merge branch 'dev6.1' into test6.1
17f1bb2a

by mali
2017-09-20 11:49:33 +0800
Browse Files
Merge branch 'dev_店铺BLK' into dev6.1
1cf931d6

by mali
2017-09-20 11:49:15 +0800
Browse Files
店铺添加BLK类型
ee05d827

by mali
2017-09-20 11:49:03 +0800
Browse Files

19 Sep, 2017

2 commits

update
75eb36fd

by wangwei
2017-09-19 10:59:17 +0800
Browse Files
update
def01c0c

by wangwei
2017-09-19 10:58:27 +0800
Browse Files

18 Sep, 2017

5 commits

build
be7f1372

by xuhongyun
2017-09-18 18:07:05 +0800
Browse Files
Merge branch 'dev6.1' into test6.1
ee25bd17

by Lixiaodi
2017-09-18 15:23:54 +0800
Browse Files
增加检索条件
2961dd86

by Lixiaodi
2017-09-18 15:23:45 +0800
Browse Files
Merge branch 'dev6.1' into test6.1
b0716a9a

by Lixiaodi
2017-09-18 14:47:15 +0800
Browse Files
促销标签增加筛选项
68a47f73

by Lixiaodi
2017-09-18 11:44:26 +0800
Browse Files

15 Sep, 2017

6 commits

Merge branch 'dev6.1' into test6.1
d475db43

by Lixiaodi
2017-09-15 13:57:33 +0800
Browse Files
添加展示标记
bcd2f69a

by Lixiaodi
2017-09-15 13:43:20 +0800
Browse Files
Merge branch 'dev6.1' into test6.1
783364c6

by Lixiaodi
2017-09-15 11:19:37 +0800
Browse Files
促销管理添加是否展示
85364a52

by Lixiaodi
2017-09-15 11:19:23 +0800
Browse Files
Merge branch 'dev6.1' into test6.1
14418cd9

by wangwei
2017-09-15 10:06:56 +0800
Browse Files
部门
1448d709

by wangwei
2017-09-15 10:06:41 +0800
Browse Files

14 Sep, 2017

3 commits

Merge branch 'dev6.1' into test6.1 ...
cc99e49e
```
Conflicts:
	code/index.js
```
by wangwei
2017-09-14 13:44:01 +0800
Browse Files
index
e264d924

by wangwei
2017-09-14 13:43:18 +0800
Browse Files
优惠券部门
dad5edb3

by wangwei
2017-09-14 13:41:12 +0800
Browse Files

13 Sep, 2017

4 commits

可销售平台
25c028a0

by mali
2017-09-13 18:32:00 +0800
Browse Files
build
5373dd73

by xuhongyun
2017-09-13 11:20:42 +0800
Browse Files
Merge branch 'dev_vip修改'
d163f498

by mali
2017-09-13 11:25:48 +0800
Browse Files
商品vip bug修改
711abc8e

by zhaoqing
2017-09-13 11:22:51 +0800
Browse Files

12 Sep, 2017

5 commits

build
2c524544

by xuhongyun
2017-09-12 16:12:40 +0800
Browse Files
VIP修改
c4504d06

by zhaoqing
2017-09-12 15:23:50 +0800
Browse Files
Merge branch 'dev_0911_关联商品多样式' into test6.1
ece2de62

by tanling
2017-09-12 14:19:32 +0800
Browse Files
关联商品多样式
b3d52ee0

by tanling
2017-09-12 14:18:30 +0800
Browse Files
Merge branch 'dev_0911_关联商品多样式' into test6.1
c31cd402

by tanling
2017-09-12 10:37:10 +0800
Browse Files