fe / ufo-platform-fe · Commits

04 Mar, 2020

4 commits

Merge branch 'develop' of git.yoho.cn:fe/ufo-platform-fe into develop ...
7e7e5570
```
 Conflicts:
	src/views/resource-list/index.vue
```
by htoo
2020-03-04 15:37:07 +0800
Browse Files
feat(resource-time): 时间资源位
0a2a749e

by htoo
2020-03-04 15:36:38 +0800
Browse Files
feat(资源位)：列表分页、一张图、两张图支持自定义大小
8df0b810

by shuaiguo
2020-03-04 15:32:43 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/ufo-platform-fe into develop
881ae462

by htoo
2020-03-04 11:09:09 +0800
Browse Files

03 Mar, 2020

2 commits

feat(资源位)：一张图、两张图自定义大小
2e36fa1a

by shuaiguo
2020-03-03 15:13:55 +0800
Browse Files
Merge branch 'refs/heads/feature/second-resource' into develop
d006022e

by shuaiguo
2020-03-03 10:46:56 +0800
Browse Files

02 Mar, 2020

2 commits

fix(资源位)：修改资源位规则
8ccba8a6

by shuaiguo
2020-03-02 17:23:51 +0800
Browse Files
feat(资源位)：新增二级频道跳转
f7024357

by shuaiguo
2020-03-02 16:49:31 +0800
Browse Files

27 Feb, 2020

1 commit

Merge branch 'refs/heads/develop'
856fa885

by shuaiguo
2020-02-27 14:14:47 +0800
Browse Files

21 Feb, 2020

1 commit

fix(优惠券)：编辑优惠券-是否展示在详情页状态修改
a85d2c76

by shuaiguo
2020-02-21 09:33:29 +0800
Browse Files

14 Feb, 2020

1 commit

feat(service-setting): 改为字符串
308916ed

by htoo
2020-02-14 13:50:16 +0800
Browse Files

12 Feb, 2020

1 commit

Merge branch 'refs/heads/feature/show-in-detail-flag' into develop
a6d8b75c

by shuaiguo
2020-02-12 15:46:26 +0800
Browse Files

11 Feb, 2020

2 commits

feat(service-setting): 增加平台服务费设置
792fe463

by htoo
2020-02-11 17:52:44 +0800
Browse Files
feat: 优惠券新增是否展示在详情页
6a7a7018

by shuaiguo
2020-02-11 11:46:56 +0800
Browse Files

16 Jan, 2020

1 commit

Merge branch 'refs/heads/master' into develop
560df047

by shuaiguo
2020-01-16 10:20:19 +0800
Browse Files

15 Jan, 2020

1 commit

Merge branch 'refs/heads/feature/repair-order'
84f4bdde

by shuaiguo
2020-01-15 15:32:22 +0800
Browse Files

08 Jan, 2020

11 commits

feat(退款申请)：增加删除提示
b0661c76

by shuaiguo
2020-01-08 16:23:55 +0800
Browse Files
Merge branch 'feature/repair-order' of http://git.yoho.cn/fe/ufo-platform-fe int… ...
153e3d54
```
…o feature/repair-order
```
by huangyCode
2020-01-08 16:12:43 +0800
Browse Files
修改导出参数
a4e431b4

by huangyCode
2020-01-08 16:12:31 +0800
Browse Files
fix(退款申请)：增加更新操作提示信息
10875d90

by shuaiguo
2020-01-08 15:55:12 +0800
Browse Files
fix(退款申请)：批量删除判空
d87de5ed

by shuaiguo
2020-01-08 15:41:11 +0800
Browse Files
feat(申请退款)：新增删除错误提示
fb5ee56e

by shuaiguo
2020-01-08 15:33:32 +0800
Browse Files
调整列表宽度
1df81b11

by huangyCode
2020-01-08 11:31:35 +0800
Browse Files
修改列表选项
784528c1

by huangyCode
2020-01-08 11:25:35 +0800
Browse Files
feat(退款申请)：只有待退款状态才可编辑&删除
55937066

by shuaiguo
2020-01-08 11:20:27 +0800
Browse Files
退单
b351b531

by huangyCode
2020-01-08 10:13:29 +0800
Browse Files
fix(申请退款)：增加备注信息展示
14961878

by shuaiguo
2020-01-08 09:53:11 +0800
Browse Files

07 Jan, 2020

6 commits

feat(退款申请)：增加导出功能
c02f6593

by shuaiguo
2020-01-07 18:12:26 +0800
Browse Files
退单
52961c51

by huangyCode
2020-01-07 18:07:02 +0800
Browse Files
feat(退款申请)：新增删除功能
8c853a4b

by shuaiguo
2020-01-07 17:22:53 +0800
Browse Files
feat(退款申请)：新增过滤功能
3b1cf52c

by shuaiguo
2020-01-07 16:40:14 +0800
Browse Files
feat(退款纪录)：新增编辑功能
73f7d71d

by shuaiguo
2020-01-07 16:05:34 +0800
Browse Files
feat(退款登记)：增加类表查询
782e1ccb

by shuaiguo
2020-01-07 14:40:22 +0800
Browse Files

06 Jan, 2020

1 commit

退单
4c413a12

by huangyCode
2020-01-06 21:30:31 +0800
Browse Files

02 Jan, 2020

3 commits

feat(refund): 新增申请退款&退款管理
4d7714b1

by shuaiguo
2020-01-02 16:03:00 +0800
Browse Files
Merge branch 'refs/heads/master' into develop
6756d046

by shuaiguo
2020-01-02 11:10:28 +0800
Browse Files
Merge branch 'feature/ufo-v1202' into 'master' ...
fa3fb33e
```
Feature/ufo v1202



See merge request !13
```
by 黄敬囿
2020-01-02 11:08:10 +0800
Browse Files

12 Dec, 2019

2 commits

查看详情增加关闭按钮 review by 杨延青
fbdf9273

by bevishuang
2019-12-12 17:44:04 +0800
Browse Files
优化图片review by 杨延青
50f032b3

by bevishuang
2019-12-12 17:08:44 +0800
Browse Files

11 Dec, 2019

1 commit

UI调整review by 杨延青
ccbbdf06

by bevishuang
2019-12-11 18:10:48 +0800
Browse Files