From c33dcceb53bc9794abe05e62a68f48ef895ef758 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Mon, 10 Jul 2023 18:21:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store-discount-activity-edit.component.ts | 2 +- .../trade-checking-detail.component.html | 108 +++++++++--------- .../trade-checking.component.html | 83 +++++++------- .../trade-order-list.component.html | 30 ++++- .../trade-order-list.component.scss | 4 + .../trade-order-list.component.ts | 7 ++ .../admin/trade-order/trade-order.module.ts | 2 + src/environments/environment.ts | 10 +- 8 files changed, 144 insertions(+), 102 deletions(-) diff --git a/src/app/admin/store-discount-activity/store-discount-activity-edit/store-discount-activity-edit.component.ts b/src/app/admin/store-discount-activity/store-discount-activity-edit/store-discount-activity-edit.component.ts index 4dbbdc8..4cdde36 100644 --- a/src/app/admin/store-discount-activity/store-discount-activity-edit/store-discount-activity-edit.component.ts +++ b/src/app/admin/store-discount-activity/store-discount-activity-edit/store-discount-activity-edit.component.ts @@ -65,7 +65,7 @@ export class StoreDiscountActivityEditComponent implements OnInit { } }); - this.merService.getMerList({pageNum: 1, pageSize: 99999}, data => { + this.merService.getMerList({merStatus: 1, pageNum: 1, pageSize: 99999}, data => { this.merArray = data['return_data']['list']; }); } diff --git a/src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.html b/src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.html index cf2f9a3..5d490f4 100644 --- a/src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.html +++ b/src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.html @@ -122,58 +122,62 @@ diff --git a/src/app/admin/trade-checking/trade-checking/trade-checking.component.html b/src/app/admin/trade-checking/trade-checking/trade-checking.component.html index f75c7c2..89f276a 100644 --- a/src/app/admin/trade-checking/trade-checking/trade-checking.component.html +++ b/src/app/admin/trade-checking/trade-checking/trade-checking.component.html @@ -88,45 +88,50 @@ + diff --git a/src/app/admin/trade-order/trade-order-list/trade-order-list.component.html b/src/app/admin/trade-order/trade-order-list/trade-order-list.component.html index e630d0f..96a04c0 100644 --- a/src/app/admin/trade-order/trade-order-list/trade-order-list.component.html +++ b/src/app/admin/trade-order/trade-order-list/trade-order-list.component.html @@ -14,6 +14,7 @@ +
账户端交易单号 @@ -22,9 +23,10 @@
+
- 支付模式 + 支付方式 @@ -35,9 +37,12 @@
+ + +
- 状态 + 交易状态 @@ -53,7 +58,7 @@
- 支付时间 + 交易时间
+
+ + 特殊字段 + + + + +
+
商户号 @@ -72,6 +86,7 @@
+
商户名称 @@ -80,6 +95,7 @@
+
商户简称 @@ -88,6 +104,7 @@
+
门店名称 @@ -102,6 +119,9 @@
+ 更多条件 + +
@@ -134,10 +154,10 @@ 门店优惠 优惠券优惠 实付金额 - 状态 + 交易状态 创建方式 创建时间 - 支付时间 + 交易时间 入账商户号 特殊字符 业务员 diff --git a/src/app/admin/trade-order/trade-order-list/trade-order-list.component.scss b/src/app/admin/trade-order/trade-order-list/trade-order-list.component.scss index 690993b..4ca382c 100644 --- a/src/app/admin/trade-order/trade-order-list/trade-order-list.component.scss +++ b/src/app/admin/trade-order/trade-order-list/trade-order-list.component.scss @@ -1,3 +1,7 @@ .table-td-operation a { padding: 0px 5px; } +.collapse { + margin-left: 8px; + font-size: 12px; +} diff --git a/src/app/admin/trade-order/trade-order-list/trade-order-list.component.ts b/src/app/admin/trade-order/trade-order-list/trade-order-list.component.ts index afe136c..e557d89 100644 --- a/src/app/admin/trade-order/trade-order-list/trade-order-list.component.ts +++ b/src/app/admin/trade-order/trade-order-list/trade-order-list.component.ts @@ -28,6 +28,8 @@ export class TradeOrderListComponent implements OnInit { msg: '加载中' }; + isCollapse = false; + constructor(private store: LocalStorageService, // 数据请求 private modal: NzModalService, private message: NzMessageService, @@ -59,6 +61,7 @@ export class TradeOrderListComponent implements OnInit { payTimeS: [null], payTimeE: [null], status: [null], + specialField: [null], }); this.requestData(1); } @@ -150,4 +153,8 @@ export class TradeOrderListComponent implements OnInit { }); } + toggleCollapse(): void { + this.isCollapse = !this.isCollapse; + } + } diff --git a/src/app/admin/trade-order/trade-order.module.ts b/src/app/admin/trade-order/trade-order.module.ts index 7948dfa..17bbe7b 100644 --- a/src/app/admin/trade-order/trade-order.module.ts +++ b/src/app/admin/trade-order/trade-order.module.ts @@ -8,6 +8,7 @@ import {AppCommonModule} from '../../app-common.module'; import { TradeOrderDetailComponent } from './trade-order-detail/trade-order-detail.component'; import {NgZorroAntdModule} from 'ng-zorro-antd'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; +import {TradeCheckingRoutingModule} from '../trade-checking/trade-checking-routing.module'; @NgModule({ @@ -15,6 +16,7 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms'; imports: [ CommonModule, TradeOrderRoutingModule, + TradeCheckingRoutingModule, NgZorroAntdModule, ReactiveFormsModule, FormsModule, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 842ae3e..27d9c15 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -5,12 +5,12 @@ export const environment = { production: false, // baseUrl: 'https://gratia-pay.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) - // baseUrl: 'https://gratia-pay.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) - // imageUrl: 'https://gratia-pay.dctpay.com/filesystem/', - // obsUrl: 'https://gratia-pay-test.obs.cn-southwest-2.myhuaweicloud.com', - baseUrl: 'http://localhost:9602/brest/', // 测试环境服务器地址(请求数据地址) - imageUrl: 'http://localhost:9602/filesystem/', + baseUrl: 'https://gratia-pay.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) + imageUrl: 'https://gratia-pay.dctpay.com/filesystem/', obsUrl: 'https://gratia-pay-test.obs.cn-southwest-2.myhuaweicloud.com', + // baseUrl: 'http://localhost:9602/brest/', // 测试环境服务器地址(请求数据地址) + // imageUrl: 'http://localhost:9602/filesystem/', + // obsUrl: 'https://gratia-pay-test.obs.cn-southwest-2.myhuaweicloud.com', }; /*