提交代码

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'];
     });
   }

src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.html

@@ -122,6 +122,8 @@
 
 <!--startprint-->
 <div id="print-content" style="display: none">
+    <nz-layout>
+        <nz-content>
             <div class="inner-content">
                 <article nz-typography>
                     <p>
@@ -172,8 +174,10 @@
                     </tr>
                     </tbody>
                 </nz-table>
-</div>
-    <img style="z-index: 0;margin: -70px 0px 0px 500px; position: absolute;" src="https://pay.dctpay.com/filesystem/b6b7e8860b6135101334aa840eb7e17d.png">
+            </div>
+            <img style="z-index: 0;margin: -150px 0px 0px 500px; position: absolute;" src="https://pay.dctpay.com/filesystem/b6b7e8860b6135101334aa840eb7e17d.png">
+        </nz-content>
+    </nz-layout>
 </div>
 <!--endprint-->
 

src/app/admin/trade-checking/trade-checking/trade-checking.component.html

@@ -88,7 +88,10 @@
 
 
 <!--startprint-->
+
 <div id="print-content" style="display: none">
+    <nz-layout>
+        <nz-content>
             <div class="inner-content">
                 <article nz-typography>
                     <p>
@@ -128,5 +131,7 @@
                 </nz-table>
             </div>
             <img style="z-index: 0;margin: -100px 0px 0px 500px; position: absolute;" src="https://pay.dctpay.com/filesystem/b6b7e8860b6135101334aa840eb7e17d.png">
+        </nz-content>
+    </nz-layout>
 </div>
 <!--endprint-->

src/app/admin/trade-order/trade-order-list/trade-order-list.component.html

@@ -14,6 +14,7 @@
                     </nz-form-control>
                 </nz-form-item>
             </div>
+
             <div nz-col nzSpan="8">
                 <nz-form-item>
                     <nz-form-label [nzSpan]="8">账户端交易单号</nz-form-label>
@@ -22,9 +23,10 @@
                     </nz-form-control>
                 </nz-form-item>
             </div>
+
             <div nz-col nzSpan="8">
                 <nz-form-item>
-                    <nz-form-label [nzSpan]="8">支付模式</nz-form-label>
+                    <nz-form-label [nzSpan]="8">支付方式</nz-form-label>
                     <nz-form-control [nzSpan]="14">
                         <nz-select nzAllowClear formControlName="payMode">
                             <nz-option nzLabel="微信" nzValue="WECHAT"></nz-option>
@@ -35,9 +37,12 @@
                     </nz-form-control>
                 </nz-form-item>
             </div>
+        </div>
+
+        <div nz-row *ngIf="isCollapse">
             <div nz-col nzSpan="8">
                 <nz-form-item>
-                    <nz-form-label [nzSpan]="8">状态</nz-form-label>
+                    <nz-form-label [nzSpan]="8">交易状态</nz-form-label>
                     <nz-form-control [nzSpan]="14">
                         <nz-select nzAllowClear formControlName="status">
                             <nz-option nzLabel="待支付" nzValue="1"></nz-option>
@@ -53,7 +58,7 @@
 
             <div nz-col nzSpan="8">
                 <nz-form-item>
-                    <nz-form-label [nzSpan]="8">支付时间</nz-form-label>
+                    <nz-form-label [nzSpan]="8">交易时间</nz-form-label>
                     <nz-form-control [nzSpan]="14">
                         <nz-range-picker
                                 formControlName="payTime"
@@ -64,6 +69,15 @@
                 </nz-form-item>
             </div>
 
+            <div nz-col nzSpan="8">
+                <nz-form-item>
+                    <nz-form-label [nzSpan]="8">特殊字段</nz-form-label>
+                    <nz-form-control [nzSpan]="14">
+                        <input nz-input formControlName="specialField" />
+                    </nz-form-control>
+                </nz-form-item>
+            </div>
+
             <div nz-col nzSpan="8" *ngIf="userObjectType !== 5">
                 <nz-form-item>
                     <nz-form-label [nzSpan]="8">商户号</nz-form-label>
@@ -72,6 +86,7 @@
                     </nz-form-control>
                 </nz-form-item>
             </div>
+
             <div nz-col nzSpan="8" *ngIf="userObjectType !== 5">
                 <nz-form-item>
                     <nz-form-label [nzSpan]="8">商户名称</nz-form-label>
@@ -80,6 +95,7 @@
                     </nz-form-control>
                 </nz-form-item>
             </div>
+
             <div nz-col nzSpan="8" *ngIf="userObjectType !== 5">
                 <nz-form-item>
                     <nz-form-label [nzSpan]="8">商户简称</nz-form-label>
@@ -88,6 +104,7 @@
                     </nz-form-control>
                 </nz-form-item>
             </div>
+
             <div nz-col nzSpan="8" *ngIf="userObjectType !== 5">
                 <nz-form-item>
                     <nz-form-label [nzSpan]="8">门店名称</nz-form-label>
@@ -102,6 +119,9 @@
             <div nz-col nzSpan="24" class="search-button">
                 <button nz-button nzType="primary"><i nz-icon nzType="search" nzTheme="outline"></i>搜索</button>
                 <button nz-button nzType="default" (click)="resetForm()"><i nz-icon nzType="reload" nzTheme="outline"></i>重置</button>
+                <a class="collapse" (click)="toggleCollapse()">更多条件
+                    <i nz-icon [nzType]="isCollapse ? 'down' : 'up'"></i>
+                </a>
             </div>
         </div>
     </form>
@@ -134,10 +154,10 @@
             <th nzWidth="100px">门店优惠</th>
             <th nzWidth="130px">优惠券优惠</th>
             <th nzWidth="100px">实付金额</th>
-            <th nzWidth="100px">状态</th>
+            <th nzWidth="100px">交易状态</th>
             <th nzWidth="90px">创建方式</th>
             <th nzWidth="160px">创建时间</th>
-            <th nzWidth="160px">支付时间</th>
+            <th nzWidth="160px">交易时间</th>
             <th nzWidth="160px">入账商户号</th>
             <th nzWidth="100px">特殊字符</th>
             <th nzWidth="100px">业务员</th>

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;
+}

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;
+  }
+
 }

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,

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',
 };
 
 /*