fe / yohobuy-portal-fe2 · Commits

14 Apr, 2020

1 commit

fix(店铺)：一件代发
ae994a81

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

09 Apr, 2020

5 commits

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
fix(一件代发)：数据兼容&接口字段定义
8561e2b5

by shuaiguo
2020-04-09 16:55:11 +0800
Browse Files
fix(shop):移除注释
68581738

by shuaiguo
2020-04-09 10:39:39 +0800
Browse Files
Merge branch 'refs/heads/feature/undertake' into develop ...
38d53a4c
```
# Conflicts:
#	code/yarn.lock
```
by shuaiguo
2020-04-09 10:38:53 +0800
Browse Files
feat(店铺创建)：增加支付宝信息
ccca9bbe

by shuaiguo
2020-04-09 10:32:52 +0800
Browse Files

08 Apr, 2020

1 commit

修改添加商品池弹框样式
76491acc

by 邱骏
2020-04-08 14:52:59 +0800
Browse Files

07 Apr, 2020

2 commits

Merge branch 'feature/tax-save' into 'develop' ...
8f89c5ba
```
变价管理增加保税仓筛选项



See merge request !20
```
by shuaiguo
2020-04-07 10:52:24 +0800
Browse Files
变价管理增加保税仓选项
0cad35b2

by 邱骏
2020-04-07 10:48:14 +0800
Browse Files

03 Apr, 2020

4 commits

Merge branch 'refs/heads/feature/6.9.24' into develop
40e5dfe9

by shuaiguo
2020-04-03 16:00:35 +0800
Browse Files
fix(促销编辑)：每满减
7d0e136b

by shuaiguo
2020-04-03 16:00:06 +0800
Browse Files
Merge branch 'refs/heads/feature/6.9.24' into develop
a2bea181

by shuaiguo
2020-04-03 15:02:38 +0800
Browse Files
feat(促销管理)：每满减
ecd68756

by shuaiguo
2020-04-03 15:01:58 +0800
Browse Files

02 Apr, 2020

6 commits

Merge remote-tracking branch 'refs/remotes/origin/feature/product-pool-add-coupon' into develop
f50cece3

by shuaiguo
2020-04-02 18:33:51 +0800
Browse Files
商品池支持优惠券
37e9567f

by 邱骏
2020-04-02 18:32:19 +0800
Browse Files
Merge branch 'refs/heads/feature/undertake' into develop
c4229ef9

by shuaiguo
2020-04-02 10:59:22 +0800
Browse Files
feat(一件代发)：更新
fea86866

by shuaiguo
2020-04-02 10:58:56 +0800
Browse Files
Merge branch 'refs/heads/feature/undertake' into develop
92f3874d

by shuaiguo
2020-04-02 10:39:38 +0800
Browse Files
feat(一件代发)：店铺编辑
b5e77a5d

by shuaiguo
2020-04-02 10:38:58 +0800
Browse Files

01 Apr, 2020

6 commits

fix(一件代发)：创建店铺一件代发
df55c49f

by shuaiguo
2020-04-01 17:15:05 +0800
Browse Files
fix(一件代发)：店铺新增地址选择
d623f1d5

by shuaiguo
2020-04-01 16:52:57 +0800
Browse Files
feat(买满减)：促销管理
b109bed7

by shuaiguo
2020-04-01 15:54:56 +0800
Browse Files
fix(一件代发)
dfa4b942

by shuaiguo
2020-04-01 15:08:51 +0800
Browse Files
feat(一件代发)：基础商品、上下架审核、变价管理
465cef47

by shuaiguo
2020-04-01 14:50:05 +0800
Browse Files
feat(一件代发)：店铺创建增加一件代发模式
df5ba3fe

by shuaiguo
2020-04-01 13:42:52 +0800
Browse Files

31 Mar, 2020

4 commits

Merge branch 'refs/heads/master' into feature/6.9.24
3b4862a4

by shuaiguo
2020-03-31 14:55:50 +0800
Browse Files
Merge branch 'refs/heads/master' into feature/undertake
4feaf4e7

by shuaiguo
2020-03-31 14:55:32 +0800
Browse Files
增加枚举值
c12aa83b

by iknitting
2020-03-31 14:42:56 +0800
Browse Files
Merge branch 'refs/heads/master' into gray
a9323f68

by shuaiguo
2020-03-31 13:55:02 +0800
Browse Files

30 Mar, 2020

4 commits

Merge branch 'refs/heads/master' into gray
1bad323b

by shuaiguo
2020-03-30 18:34:27 +0800
Browse Files
Merge branch 'refs/heads/gray'
2eb32d01

by shuaiguo
2020-03-30 18:34:12 +0800
Browse Files
build
4646e022

by xuhongyun
2020-03-30 18:18:45 +0800
Browse Files
selltype增加枚举值
024014f2

by iknitting
2020-03-30 10:40:48 +0800
Browse Files

26 Mar, 2020

7 commits

build
68b4599b

by xuhongyun
2020-03-26 18:26:16 +0800
Browse Files
Merge branch 'refs/heads/test6.9.23' into gray
ccf2a1cb

by shuaiguo
2020-03-26 18:40:01 +0800
Browse Files
fix(入口图片)：图片取错
60c9e0dc

by shuaiguo
2020-03-26 18:39:39 +0800
Browse Files
feat(入口图片)：增加删除操作
1250cf2f

by shuaiguo
2020-03-26 17:06:22 +0800
Browse Files
build
a37aac71

by xuhongyun
2020-03-26 16:51:42 +0800
Browse Files
Merge branch 'refs/heads/test6.9.23' into gray
0c571256

by shuaiguo
2020-03-26 17:06:56 +0800
Browse Files
build
0ece046b

by xuhongyun
2020-03-26 14:17:56 +0800
Browse Files