diff --git a/src/app/admin/order/order-h-list/order-h-list.component.html b/src/app/admin/order/order-h-list/order-h-list.component.html
index 749be77..f46bfc9 100644
--- a/src/app/admin/order/order-h-list/order-h-list.component.html
+++ b/src/app/admin/order/order-h-list/order-h-list.component.html
@@ -89,6 +89,17 @@
+
+
+ 充值类型
+
+
+
+
+
+
+
+
diff --git a/src/app/admin/order/order-h-list/order-h-list.component.ts b/src/app/admin/order/order-h-list/order-h-list.component.ts
index e7cdbb3..247ddfa 100644
--- a/src/app/admin/order/order-h-list/order-h-list.component.ts
+++ b/src/app/admin/order/order-h-list/order-h-list.component.ts
@@ -56,6 +56,7 @@ export class OrderHListComponent implements OnInit {
status: [null],
orderNo: [null],
rechargeModel: [null],
+ rechargeType: [null],
rechargeContent: [null],
idCard: [null],
userPhone: [null],
diff --git a/src/app/admin/recharge-order/price-list/price-list.component.html b/src/app/admin/recharge-order/price-list/price-list.component.html
index fff4158..2f7c58b 100644
--- a/src/app/admin/recharge-order/price-list/price-list.component.html
+++ b/src/app/admin/recharge-order/price-list/price-list.component.html
@@ -21,20 +21,23 @@
-<<<<<<< HEAD
- 充值类型
-
-
-
-
-=======
展示区域
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9
+
+
+
+
+
+
+ 充值类型
+
+
+
+
@@ -76,10 +79,7 @@
| 编号 |
金额类型 |
-<<<<<<< HEAD
充值类型 |
-=======
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9
展示区域 |
@@ -93,14 +93,8 @@
| {{i + 1}} |
{{data.type | rechargePrice}} |
-<<<<<<< HEAD
{{data.rechargeType== 1? '快充':'慢充'}} |
{{data.showType | showType}} |
-=======
- {{data.showType | priceShow}} |
-
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9
-
{{data.price}} |
{{data.realPrice}} |
{{data.createTime | date: 'yyyy-MM-dd HH:mm'}} |
diff --git a/src/app/admin/recharge-order/price-list/price-list.component.ts b/src/app/admin/recharge-order/price-list/price-list.component.ts
index 1d473a9..36691eb 100644
--- a/src/app/admin/recharge-order/price-list/price-list.component.ts
+++ b/src/app/admin/recharge-order/price-list/price-list.component.ts
@@ -50,11 +50,8 @@ export class PriceListComponent implements OnInit {
public init(): void {
this.searchForm = this.form.group({
type: [null],
-<<<<<<< HEAD
rechargeType: [null],
-=======
showType: [null],
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9
});
this.validateForm = this.form.group({
type: [null, [Validators.required]],
@@ -62,7 +59,6 @@ export class PriceListComponent implements OnInit {
price: [null, [Validators.required]],
rechargeType: [null, [Validators.required]],
realPrice: [{value: null, disabled: true}, [Validators.required]],
- showType: [null, [Validators.required]],
discount: [null, [Validators.required]],
sort: [null, [Validators.required]],
// channel: [null, [Validators.required]],
diff --git a/src/app/app-common.module.ts b/src/app/app-common.module.ts
index 8c337cc..10a9425 100644
--- a/src/app/app-common.module.ts
+++ b/src/app/app-common.module.ts
@@ -35,16 +35,11 @@ import {
PreOrderStatusPipe,
ButtonPipe,
DiscountPackageStatusPipe,
- PriceShowPipe
+ PriceShowPipe,
+ ShowTypePipe
} from './pipes';
-<<<<<<< HEAD
-import { PreOrderStatusPipe } from './pipes/order/pre-order-status.pipe';
-import { ButtonPipe } from './pipes/commons/button.pipe';
-import { DiscountPackageStatusPipe } from './pipes/discount-package-status.pipe';
-import { ShowTypePipe } from './pipes/show-type.pipe';
-=======
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9
+
@@ -75,11 +70,8 @@ const PIPES = [
PreOrderStatusPipe,
ButtonPipe,
DiscountPackageStatusPipe,
-<<<<<<< HEAD
ShowTypePipe,
-=======
PriceShowPipe,
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9
];
diff --git a/src/app/pipes/index.ts b/src/app/pipes/index.ts
index 6258084..5fad168 100644
--- a/src/app/pipes/index.ts
+++ b/src/app/pipes/index.ts
@@ -23,8 +23,5 @@ export * from './audit/refund-status.pipe';
export * from './order/pre-order-status.pipe';
export * from './commons/button.pipe';
export * from './discount-package-status.pipe';
-<<<<<<< HEAD
export * from './show-type.pipe';
-=======
export * from './price-show.pipe';
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 04051b6..5a795b3 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,17 +4,10 @@
export const environment = {
production: false,
-<<<<<<< HEAD
// baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
// imageUrl: 'http://localhost:9302/filesystem/',
- baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
- imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
-=======
- baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
- imageUrl: 'http://localhost:9302/filesystem/',
- // baseUrl: 'https://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
- // imageUrl: 'https://hsg.dctpay.com/filesystem/',
->>>>>>> 79b068eb5f3f130730e5c51b857b9cc72de104f9
+ baseUrl: 'https://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+ imageUrl: 'https://hsg.dctpay.com/filesystem/',
key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',
};