fe / yohobuy-portal-fe2 · Commits

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

12 Sep, 2017

5 commits

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
关联商品多样式
75a74de5

by tanling
2017-09-12 10:33:41 +0800
Browse Files
暂存
1f26791d

by wangwei
2017-09-12 09:38:57 +0800
Browse Files

11 Sep, 2017

1 commit

关联商品样式多样化
9f6b1845

by tanling
2017-09-11 20:47:49 +0800
Browse Files

08 Sep, 2017

1 commit

split deposit advance and advace product
8380bb6d

by chenchao
2017-09-08 20:07:27 +0800
Browse Files

04 Sep, 2017

2 commits

build
af6fb879

by xuhongyun
2017-09-04 18:09:07 +0800
Browse Files
去除店铺应用功能
96b872f0

by zhaoqing
2017-09-04 15:39:13 +0800
Browse Files

28 Aug, 2017

5 commits

build
c892daf1

by xuhongyun
2017-08-28 10:09:29 +0800
Browse Files
Merge branch 'master' into gray ...
7646d937
```
Conflicts:
	dist/yohobuy-portal-fe/5.0.2/jquery/brand.Edit.js
	dist/yohobuy-portal-fe/5.0.2/jquery/shop.modular.Decorator.js
```
by mali
2017-08-28 10:14:05 +0800
Browse Files
build
a6334daa

by xuhongyun
2017-08-28 10:07:30 +0800
Browse Files
Merge branch 'master' into dev_店铺bug
89ed40d4

by zhaoqing
2017-08-28 10:09:30 +0800
Browse Files
发源地bug修复
b2005e23

by zhaoqing
2017-08-28 10:04:36 +0800
Browse Files

25 Aug, 2017

1 commit

品牌发源地问题修复
c464a704

by zhaoqing
2017-08-25 19:47:38 +0800
Browse Files

24 Aug, 2017

2 commits

bug修复
e47ef58c

by zhaoqing
2017-08-24 10:00:16 +0800
Browse Files
build
f45dfeeb

by xuhongyun
2017-08-24 09:56:02 +0800
Browse Files

23 Aug, 2017

8 commits

build
ddc9782a

by xuhongyun
2017-08-23 16:18:15 +0800
Browse Files
Merge branch 'master' into dev_店铺bug
e417e1f1

by mali
2017-08-23 16:16:03 +0800
Browse Files
Merge branch 'master' into dev_品牌发源地
6fb542a2

by mali
2017-08-23 16:15:34 +0800
Browse Files
build
6fc9da96

by xuhongyun
2017-08-23 16:11:11 +0800
Browse Files
build
1b3970fa

by xuhongyun
2017-08-23 15:54:02 +0800
Browse Files
备注说明
71bb398b

by mali
2017-08-23 15:59:01 +0800
Browse Files
店铺bug修复
e6b36de7

by zhaoqing
2017-08-23 15:38:19 +0800
Browse Files
Merge branch 'master' into gray
255959a7

by mali
2017-08-23 10:23:02 +0800
Browse Files

22 Aug, 2017

4 commits

品牌发源地
2219514a

by zhaoqing
2017-08-22 19:58:35 +0800
Browse Files
build project
cd6ab4e8

by xuhongyun
2017-08-22 18:04:13 +0800
Browse Files
增加修改密码功能
8f937858

by xuhongyun
2017-08-22 17:52:37 +0800
Browse Files
增加登录用户名及角色信息
6d1ecaad

by xuhongyun
2017-08-22 17:14:42 +0800
Browse Files

21 Aug, 2017

1 commit

build
07ba8d2c

by xuhongyun
2017-08-21 14:15:21 +0800
Browse Files

19 Aug, 2017

1 commit

build
5705e37f

by xuhongyun
2017-08-19 11:34:00 +0800
Browse Files