diff --git a/src/app/admin/api-merchants/list/list.component.html b/src/app/admin/api-merchants/list/list.component.html index 07489a6..818db18 100644 --- a/src/app/admin/api-merchants/list/list.component.html +++ b/src/app/admin/api-merchants/list/list.component.html @@ -309,7 +309,7 @@ - + diff --git a/src/app/admin/config-manage/integral-rebate/integral-rebate.component.html b/src/app/admin/config-manage/integral-rebate/integral-rebate.component.html index d43eb2a..e5217e1 100644 --- a/src/app/admin/config-manage/integral-rebate/integral-rebate.component.html +++ b/src/app/admin/config-manage/integral-rebate/integral-rebate.component.html @@ -11,60 +11,19 @@ 产品类型 - - - - + + + + + + + + + -
- - 产品 - - - - - - -
-
- - 产品 - - - - - - -
-
- - 产品 - - - - - - - - -
-
- - 产品 - - - - - - - - -
- - @@ -88,6 +47,7 @@ 编号 积分返利比例 类型 - 产品 + 返利时间范围 创建时间 操作 @@ -114,7 +74,7 @@ {{i + 1}} {{data.percentage + "%"}} {{data.type | integralType}} - {{data.type | integralProduct : data.productId}} + {{data.startTime | date: 'yyyy-MM-dd HH:mm'}} - {{data.endTime | date: 'yyyy-MM-dd HH:mm'}} {{data.createTime | date: 'yyyy-MM-dd HH:mm'}} @@ -136,46 +96,15 @@ 产品类型 - - - - - - - - - 卡券产品 - - - - - - - - 在线加油产品 - - - - - - - - 话费产品 - - - - - - - - - - 第三方产品 - - - - - + + + + + + + + + @@ -185,7 +114,6 @@ - 积分返利比例 diff --git a/src/app/admin/config-manage/third-product/third-product.component.html b/src/app/admin/config-manage/third-product/third-product.component.html index 9330f1f..9676a12 100644 --- a/src/app/admin/config-manage/third-product/third-product.component.html +++ b/src/app/admin/config-manage/third-product/third-product.component.html @@ -37,6 +37,7 @@