fe / yohobuy-portal-fe2 · Commits

09 May, 2020

8 commits

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

2 commits

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

by shuaiguo
2020-04-24 18:01:31 +0800
Browse Files
fix(shop): 命名冲突
fbe2929f

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

22 Apr, 2020

4 commits

Merge branch 'refs/heads/feature/guess-like' into develop
05136e33

by shuaiguo
2020-04-22 16:18:21 +0800
Browse Files
feat(猜你喜欢)：类型切换时情空参数
2debe6d8

by shuaiguo
2020-04-22 16:17:55 +0800
Browse Files
Merge branch 'refs/heads/feature/undertake' into develop
0f9fdb9b

by shuaiguo
2020-04-22 11:47:07 +0800
Browse Files
fix(一件代发)：地址命名冲突
31140b4b

by shuaiguo
2020-04-22 11:46:43 +0800
Browse Files

17 Apr, 2020

2 commits

Merge branch 'refs/heads/feature/guess-like' into develop ...
8b307843
```
# Conflicts:
#	code/apps/goods/views/priceManage/Index.html
#	code/apps/marketing/views/ProductPool/Index.html
```
by shuaiguo
2020-04-17 10:53:43 +0800
Browse Files
feat(资源管理)：新增tab类型：买家秀
3dee408f

by shuaiguo
2020-04-17 10:49:21 +0800
Browse Files

14 Apr, 2020

3 commits

Merge branch 'refs/heads/gray'
d4087dd8

by shuaiguo
2020-04-14 18:29:22 +0800
Browse Files
Merge branch 'refs/heads/feature/undertake' into develop
55829a97

by shuaiguo
2020-04-14 11:30:35 +0800
Browse Files
fix(店铺)：一件代发
ae994a81

by shuaiguo
2020-04-14 11:30:05 +0800
Browse Files

13 Apr, 2020

5 commits

build
750edc2c

by xuhongyun
2020-04-13 17:21:42 +0800
Browse Files
fix(product pool): 增加优惠券token
674beeb5

by shuaiguo
2020-04-13 17:20:49 +0800
Browse Files
build
a33f5352

by xuhongyun
2020-04-13 16:56:51 +0800
Browse Files
feat(productPool): 商品除增加领券功能
e97ca439

by shuaiguo
2020-04-13 16:55:03 +0800
Browse Files
Merge branch 'refs/heads/feature/6.9.24' into gray
80b7fb6c

by shuaiguo
2020-04-13 16:40:47 +0800
Browse Files

09 Apr, 2020

1 commit

Merge branch 'refs/heads/feature/undertake' into develop ...
989ba29a
```
# Conflicts:
#	code/apps/shop/controllers/shopAdd.js
```
by shuaiguo
2020-04-09 16:57:12 +0800
Browse Files