Merge branch 'master' of http://gitea.dctpay.com/yuanye/puhui-go-web

src/app/app.config.ts

@@ -1,5 +1,5 @@
 import { ApplicationConfig, importProvidersFrom } from '@angular/core';
-import { provideRouter } from '@angular/router';
+import {provideRouter, RouteReuseStrategy} from '@angular/router';
 
 import { routes } from './app.routes';
 import { provideClientHydration } from '@angular/platform-browser';
@@ -11,6 +11,7 @@ import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
 import {BrowserAnimationsModule, provideAnimations} from '@angular/platform-browser/animations';
 import {InitGuardService} from "./utils/initGuard.service";
 import {InterceptorService} from "./utils/Interceptor.service";
+import {AiRouteReuseStrategy} from "./utils/routeReuseStrategy";
 
 registerLocaleData(zh);
 
@@ -24,6 +25,7 @@ export const appConfig: ApplicationConfig = {
     provideAnimations(),
     BrowserAnimationsModule,
     InitGuardService, // 校验登录
-    { provide: HTTP_INTERCEPTORS, useClass: InterceptorService, multi: true}
+    { provide: HTTP_INTERCEPTORS, useClass: InterceptorService, multi: true},
+    { provide: RouteReuseStrategy, useClass: AiRouteReuseStrategy }
   ]
 };

src/app/pages/trade/comp-order/comp-order.component.html

@@ -85,6 +85,7 @@
     <div nz-col [nzSpan]="24" class="search-area">
       <button nz-button [nzType]="'primary'" (click)="searchFormSubmit()">查询</button>
       <button nz-button (click)="searchFormReset()">重置</button>
+      <button nz-button [nzType]="'primary'" (click)="export()">导出数据明细</button>
       <a class="collapse" (click)="isCollapse = !isCollapse">
         更多查询条件
         <i nz-icon [nzType]="!isCollapse ? 'down' : 'up'"></i>
@@ -164,7 +165,7 @@
         </a>
         <nz-dropdown-menu #menu="nzDropdownMenu">
           <ul nz-menu nzSelectable>
-            <li nz-menu-item nzDanger >删除</li>
+            <li nz-menu-item>暂无操作</li>
           </ul>
         </nz-dropdown-menu>
       </td>

src/app/pages/trade/comp-order/comp-order.component.ts

@@ -32,6 +32,7 @@ import {DateSelectType, DateUtils} from "../../../utils/dateUtils.service";
 import {NzTreeComponent} from "ng-zorro-antd/tree";
 import {NzDescriptionsModule} from "ng-zorro-antd/descriptions";
 import {NzTabComponent, NzTabSetComponent, NzTabsModule} from "ng-zorro-antd/tabs";
+import {environment} from "../../../../environments/environment";
 
 @Component({
   selector: 'app-comp-order',
@@ -89,6 +90,7 @@ import {NzTabComponent, NzTabSetComponent, NzTabsModule} from "ng-zorro-antd/tab
   styleUrl: './comp-order.component.less'
 })
 export class CompOrderComponent {
+  imageUrl = environment.imageUrl;
   // 表单页数
   tablePageNum = 1;
   // 表单数据
@@ -209,4 +211,15 @@ export class CompOrderComponent {
     this.orderDetail = {};
     this.orderDetailVisible = false;
   }
+
+  /**
+   * 导出订单
+   */
+  export() {
+    this.orderService.export(this.searchForm.value, (data: any) => {
+        if (data['return_code'] == '000000') {
+          window.location.href = this.imageUrl + 'temporary/' + data['return_data'];
+        }
+    });
+  }
 }

src/app/pages/trade/order-after-sales/order-after-sales.component.html

@@ -2,27 +2,27 @@
   <div nz-row [nzGutter]="24">
     <div nz-col [nzSpan]="6">
       <nz-form-item>
-        <nz-form-label>申请单号</nz-form-label>
+        <nz-form-label>用户手机号</nz-form-label>
         <nz-form-control>
-          <input nz-input nzSize="large" formControlName="applyNo" placeholder="请输入" />
+          <input nzSize="large" nz-input formControlName="userPhone" placeholder="请输入" />
         </nz-form-control>
       </nz-form-item>
     </div>
     <div nz-col [nzSpan]="6">
       <nz-form-item>
-        <nz-form-label>申请类型</nz-form-label>
+        <nz-form-label>申请单号</nz-form-label>
         <nz-form-control>
-          <nz-select nzSize="large" formControlName="type" nzAllowClear [nzPlaceHolder]="'请选择'">
-            <nz-option *ngFor="let item of applyTypeArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
-          </nz-select>
+          <input nz-input nzSize="large" formControlName="applyNo" placeholder="请输入" />
         </nz-form-control>
       </nz-form-item>
     </div>
     <div nz-col [nzSpan]="6">
       <nz-form-item>
-        <nz-form-label>用户手机号</nz-form-label>
+        <nz-form-label>申请类型</nz-form-label>
         <nz-form-control>
-          <input nzSize="large" nz-input formControlName="userPhone" placeholder="请输入" />
+          <nz-select nzSize="large" formControlName="type" nzAllowClear [nzPlaceHolder]="'请选择'">
+            <nz-option *ngFor="let item of applyTypeArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
+          </nz-select>
         </nz-form-control>
       </nz-form-item>
     </div>
@@ -76,7 +76,7 @@
   <tr>
     <th nzWidth="150px">申请单号</th>
     <th nzWidth="100px">申请类型</th>
-    <th nzWidth="130px">客户电话</th>
+    <th nzWidth="130px">用户手机号</th>
     <th nzWidth="150px">商品单号</th>
     <th nzWidth="100px">产品类型</th>
     <th nzWidth="200px">产品名称</th>

src/app/pages/trade/order-refund/order-refund.component.html

@@ -2,7 +2,7 @@
   <div nz-row [nzGutter]="24">
     <div nz-col [nzSpan]="6">
       <nz-form-item>
-        <nz-form-label>用户电话</nz-form-label>
+        <nz-form-label>用户手机号</nz-form-label>
         <nz-form-control>
           <input nzSize="large" nz-input formControlName="userPhone" placeholder="请输入" />
         </nz-form-control>
@@ -72,7 +72,7 @@
           [nzData]="tableData.list" >
   <thead>
   <tr>
-    <th nzWidth="130px">用户电话</th>
+    <th nzWidth="130px">用户手机号</th>
     <th nzWidth="160px">退款单号</th>
     <th nzWidth="180px">交易单号</th>
     <th nzWidth="130px">商品单号</th>
@@ -121,7 +121,7 @@
     <nz-tabset nzType="card" nzSize="small">
       <nz-tab nzTitle="退款详情">
         <nz-descriptions nzBordered [nzColumn]="{ xxl: 2, xl: 2, lg: 2, md: 2, sm: 2, xs: 1 }">
-          <nz-descriptions-item nzTitle="用户电话">{{refundDetail.refund.userPhone}}</nz-descriptions-item>
+          <nz-descriptions-item nzTitle="用户手机号">{{refundDetail.refund.userPhone}}</nz-descriptions-item>
           <nz-descriptions-item nzTitle="退款单号">{{refundDetail.refund.refundOrderNo}}</nz-descriptions-item>
           <nz-descriptions-item nzTitle="交易单号">{{refundDetail.refund.orderNo}}</nz-descriptions-item>
           <nz-descriptions-item nzTitle="商品单号">{{refundDetail.refund.orderChildNo}}</nz-descriptions-item>

src/app/services/trade/order-coupon.service.ts

@@ -22,6 +22,18 @@ export class OrderCouponService {
     });
   }
 
+  /**
+   * 导出订单
+   * @param param
+   * @param callBack
+   */
+  public export(param: any, callBack:any) {
+    param.time = new Date().getTime();
+    this.http.get(environment.orderUrl + 'coupon/export?'+ObjectData.objectByString(param)).subscribe(data => {
+      callBack(data);
+    });
+  }
+
   /**
    * 查询订单详情
    * @param param