fe / yohobuy-portal-fe2 · Commits

02 Jun, 2020

2 commits

bug修复
70840084

by shuaiguo
2020-06-02 10:43:44 +0800
Browse Files
添加&更新兑券
066e41c7

by shuaiguo
2020-06-02 10:24:46 +0800
Browse Files

01 Jun, 2020

4 commits

兑券新增
582422ea

by shuaiguo
2020-06-01 16:29:29 +0800
Browse Files
兑券删除
4498c120

by shuaiguo
2020-06-01 15:53:25 +0800
Browse Files
添加兑券管理页面
7ad4ebb7

by shuaiguo
2020-06-01 11:47:57 +0800
Browse Files
添加兑券资源位模块
834907a0

by shuaiguo
2020-06-01 10:40:10 +0800
Browse Files

27 May, 2020

4 commits

build
655fa863

by xuhongyun
2020-05-27 19:17:10 +0800
Browse Files
Merge branch 'hotfix/shop-edit'
6aaf79b7

by shuaiguo
2020-05-27 19:17:46 +0800
Browse Files
fix(shop): shop edit
480f4267

by shuaiguo
2020-05-27 19:05:52 +0800
Browse Files
fix(shop): 店铺编辑
dd266241

by shuaiguo
2020-05-27 18:58:57 +0800
Browse Files

21 May, 2020

1 commit

Merge branch 'gray'
a0e76357

by shuaiguo
2020-05-21 18:21:31 +0800
Browse Files

19 May, 2020

2 commits

build
8bb73131

by xuhongyun
2020-05-19 18:08:55 +0800
Browse Files
Merge branch 'develop' into gray
f0f05af2

by shuaiguo
2020-05-19 18:08:24 +0800
Browse Files

09 May, 2020

11 commits

fix(促销管理)：促销操作
22e11379

by shuaiguo
2020-05-09 16:32:55 +0800
Browse Files
build
d070be54

by xuhongyun
2020-05-09 16:19:11 +0800
Browse Files
Merge branch 'hotfix/guess-like'
e821d0eb

by shuaiguo
2020-05-09 16:19:25 +0800
Browse Files
Merge branch 'hotfix/guess-like' into develop
51b88d07

by shuaiguo
2020-05-09 16:18:29 +0800
Browse Files
fix(资源管理)：猜你喜欢
4d09c2cd

by shuaiguo
2020-05-09 16:18:04 +0800
Browse Files
Merge branch 'master' into develop
929e1237

by shuaiguo
2020-05-09 15:41:47 +0800
Browse Files
fix(资源管理)：猜你喜欢参数清空处理
9ee0121a

by shuaiguo
2020-05-09 15:37:33 +0800
Browse Files
build
4e6cf0bf

by xuhongyun
2020-05-09 15:37:05 +0800
Browse Files
Merge branch 'hotfix/guess-like'
ee4b53d1

by shuaiguo
2020-05-09 15:37:59 +0800
Browse Files
fix(促销管理)：默认值
6daf61d9

by shuaiguo
2020-05-09 12:03:06 +0800
Browse Files
feat(促销管理)：每满减平行促销
d7e1435c

by shuaiguo
2020-05-09 11:54:04 +0800
Browse Files

08 May, 2020

1 commit

Merge branch 'master' into develop
43371825

by shuaiguo
2020-05-08 11:46:01 +0800
Browse Files

29 Apr, 2020

5 commits

Merge branch 'refs/heads/gray'
a0dab305

by shuaiguo
2020-04-29 17:31:51 +0800
Browse Files
build
84470a36

by xuhongyun
2020-04-29 10:54:58 +0800
Browse Files
Merge branch 'refs/heads/develop' into gray
047ad35e

by shuaiguo
2020-04-29 10:55:08 +0800
Browse Files
fix(基础商品)：经营模式选择
9af7be86

by shuaiguo
2020-04-29 10:52:37 +0800
Browse Files
build
40d7b6bc

by xuhongyun
2020-04-29 10:11:45 +0800
Browse Files

28 Apr, 2020

2 commits

Merge branch 'gray' into develop ...
a5232766
```
# Conflicts:
#	code/apps/marketing/views/ProductPool/Index.html
```
by wangshusheng
2020-04-28 16:00:51 +0800
Browse Files
修改展示类型
063e73e8

by wangshusheng
2020-04-28 15:51:29 +0800
Browse Files

27 Apr, 2020

7 commits

build
cb40f365

by xuhongyun
2020-04-27 15:29:35 +0800
Browse Files
Merge branch 'refs/heads/feature/guess-like' into gray
08aede8f

by shuaiguo
2020-04-27 15:29:39 +0800
Browse Files
Merge branch 'refs/heads/feature/undertake' into gray ...
7738d9ff
```
# Conflicts:
#	code/apps/goods/views/priceManage/Index.html
#	code/apps/marketing/views/ProductPool/Index.html
```
by shuaiguo
2020-04-27 15:28:34 +0800
Browse Files
Merge branch 'refs/heads/feature/undertake' into develop
e62e0b09

by shuaiguo
2020-04-27 15:14:56 +0800
Browse Files
fix(变价管理)：移除一件代发
c4d70d5f

by shuaiguo
2020-04-27 15:14:31 +0800
Browse Files
Merge branch 'refs/heads/feature/guess-like' into develop
c82bd781

by shuaiguo
2020-04-27 11:42:36 +0800
Browse Files
feat(猜你喜欢)：支持json格式
17194fa6

by shuaiguo
2020-04-27 11:41:58 +0800
Browse Files

24 Apr, 2020

1 commit

Merge branch 'refs/heads/feature/undertake' into develop
25608f6b

by shuaiguo
2020-04-24 18:01:31 +0800
Browse Files