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 4914aca..2da2de2 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
@@ -205,6 +205,40 @@
>
+
+ 一级分销比例
+
+
+
+
+
+ 二级分销比例
+
+
+
+
diff --git a/src/app/admin/config-manage/integral-rebate/integral-rebate.component.ts b/src/app/admin/config-manage/integral-rebate/integral-rebate.component.ts
index 53d3b3d..54fe9f1 100644
--- a/src/app/admin/config-manage/integral-rebate/integral-rebate.component.ts
+++ b/src/app/admin/config-manage/integral-rebate/integral-rebate.component.ts
@@ -71,6 +71,8 @@ export class IntegralRebateComponent implements OnInit {
});
this.validateForm = this.form.group({
productId: [null],
+ firstDistribution: [null],
+ secondDistribution: [null],
type: [null, [Validators.required]],
percentage: [null, [Validators.required]],
time: [null, [Validators.required]],
diff --git a/src/app/admin/discount-package/discount-package-edit/discount-package-edit.component.html b/src/app/admin/discount-package/discount-package-edit/discount-package-edit.component.html
index 193702d..e7a0fac 100644
--- a/src/app/admin/discount-package/discount-package-edit/discount-package-edit.component.html
+++ b/src/app/admin/discount-package/discount-package-edit/discount-package-edit.component.html
@@ -66,7 +66,7 @@
- 列表展示图
+ 列表展示图
- 轮播展示图
+ 轮播展示图
- 详情展示图
+ 详情展示图
-
+
预计时间
@@ -204,7 +204,7 @@
-
+
{{orderDetail['highChildOrderList'][0]['goodsName']}}
{{orderDetail['payType'] | paytype}}
diff --git a/src/app/admin/order/pre-order/pre-order.component.ts b/src/app/admin/order/pre-order/pre-order.component.ts
index 1315ede..49ac922 100644
--- a/src/app/admin/order/pre-order/pre-order.component.ts
+++ b/src/app/admin/order/pre-order/pre-order.component.ts
@@ -169,7 +169,8 @@ export class PreOrderComponent implements OnInit {
public getDetail(orderId: number , id: number): void {
this.order.getOrderById(orderId , data => {
if (data['return_code'] === '000000') {
- this.orderDetail = data['return_data'];
+ console.log(data);
+ this.orderDetail = data['return_data'];
} else {
this.message.error(data['return_msg']);
}
@@ -257,13 +258,6 @@ export class PreOrderComponent implements OnInit {
});
}
- handleCancel(): void {
- this.isVisible = false;
- }
-
- handleCancelOrder(): void {
- this.isVisibleDetail = false;
- }
public postRefund(orderNo): void {
this.common.showConfirm('确认订单申请退款', item => {
diff --git a/src/app/pipes/commons/button.pipe.ts b/src/app/pipes/commons/button.pipe.ts
index ad8d493..ac06620 100644
--- a/src/app/pipes/commons/button.pipe.ts
+++ b/src/app/pipes/commons/button.pipe.ts
@@ -13,7 +13,6 @@ export class ButtonPipe implements PipeTransform {
transform(button: string): boolean {
const buttonArray = new Set();
buttonArray.add(button);
- console.log(this.store.get(ADMIN_INFO_OBJECT)['buttonList']);
return this.store.get(ADMIN_INFO_OBJECT)['buttonList'].filter(i => buttonArray.has(i.permissionCode)).length > 0;
}
}