1

src/app/app.routes.ts

@@ -1,7 +1,6 @@
 import { Routes } from '@angular/router';
 import {IndexComponent} from "./pages/body/index/index.component";
 import {InitGuardService} from "./utils/initGuard.service";
-import {ERROR_ROUTES} from "./pages/error/error.routes";
 import {Error404Component} from "./pages/error/error404/error404.component";
 export const routes: Routes = [
   {path: '', pathMatch: 'full', redirectTo: 'admin/index'},

src/app/pages/body/index/index.component.ts

@@ -210,6 +210,8 @@ export class IndexComponent {
         this.storage.remove(DATA);
         this.storage.remove(USER_TOKEN);
         this.storage.remove(INIT_FLAG);
+        location.reload();
+
         this.router.navigateByUrl('/login').then();
       } else {
         this.message.error(data['return_msg']);

src/app/pages/error/error401/error401.component.ts

@@ -35,7 +35,8 @@ export class Error401Component {
         this.storage.remove(DATA);
         this.storage.remove(USER_TOKEN);
         this.storage.remove(INIT_FLAG);
-        this.router.navigateByUrl('/login').then();
+        this.router.navigate(['/login']).then(r => console.log(r));
+
       } else {
         this.message.error(data['return_msg']);
       }

src/app/pages/login/login.module.ts

@@ -1,12 +1,10 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 
-import { NzSliderModule } from 'ng-zorro-antd/slider';
 @NgModule({
   declarations: [],
   imports: [
     CommonModule,
-    NzSliderModule,
   ]
 })
 export class LoginModule { }

src/app/pages/login/login/login.component.ts

@@ -100,7 +100,8 @@ export class LoginComponent {
           this.storage.set(DATA, data['return_data']['object']);
           this.storage.set(USER_TOKEN, data['return_data']['token']);
           this.storage.set(INIT_FLAG, true);
-          this.router.navigateByUrl('/admin/index').then(r => console.log("返回内容" ,r));
+          this.router.navigateByUrl('/admin/index');
+
         } else {
           this.message.error(data['return_msg']);
         }

src/app/pages/settlement/detail/detail.component.ts

@@ -77,7 +77,8 @@ export class DetailComponent {
       finishTimeE: [''],
       payType: [''],
     });
-
+    let timeObj = DateUtils.getDate(new Date(), Number(5));
+    this.searchForm.controls['finishTimeArray'].setValue([timeObj.timeS, timeObj.timeE]);
     this.objectType =  this.storage.get(DATA)['account']['objectType'];
     this.getRequest();
     this.merList();

src/app/pages/settlement/list/list.component.html

@@ -54,7 +54,7 @@
     <th>商户名称</th>
     <th>支付方式</th>
     <th>业务类型</th>
-    <th>结算日期</th>
+    <th>结算金额</th>
     <th>结算日期</th>
   </tr>
   </thead>

src/app/pages/settlement/list/list.component.ts

@@ -82,7 +82,8 @@ export class ListComponent {
       finishTimeE: [''],
       payType: [''],
     });
-
+    let timeObj = DateUtils.getDate(new Date(), Number(5));
+    this.searchForm.controls['finishTimeArray'].setValue([timeObj.timeS, timeObj.timeE]);
     this.objectType =  this.storage.get(DATA)['account']['objectType'];
     this.getRequest();
     this.merList();

src/app/pages/settlement/sum/sum.component.html

@@ -53,7 +53,7 @@
   <tr>
     <th>业务类型</th>
     <th>支付方式</th>
-    <th>支付金额</th>
+    <th>结算金额</th>
     <th>结算日期</th>
   </tr>
   </thead>

src/app/pages/settlement/sum/sum.component.ts

@@ -79,7 +79,8 @@ export class SumComponent {
       finishTimeE: [''],
       payType: [''],
     });
-
+    let timeObj = DateUtils.getDate(new Date(), Number(5));
+    this.searchForm.controls['finishTimeArray'].setValue([timeObj.timeS, timeObj.timeE]);
     this.objectType =  this.storage.get(DATA)['account']['objectType'];
     this.getRequest();
     this.merList();

src/app/pipes/file/business-type.pipe.ts

@@ -22,6 +22,12 @@ export class BusinessTypePipe implements PipeTransform {
         return '物流上传订单';
       case 7:
         return '物流下载订单';
+      case 10:
+        return '结算详情';
+      case 11:
+        return '结算统计';
+      case 12:
+        return '结算总和';
       default:
         return '未知状态'
     }

src/environments/environment.ts

@@ -4,15 +4,15 @@
 
 export const environment = {
   production: false,
-  baseUrl: 'https://phg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+  // baseUrl: 'https://phg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  orderUrl: 'https://phg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
+  // orderUrl: 'https://phg.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
-  userUrl: 'https://phg.dctpay.com/user/', // 测试环境服务器地址(请求数据地址)
+  // userUrl: 'https://phg.dctpay.com/user/', // 测试环境服务器地址(请求数据地址)
-  imageUrl: 'https://phg.obs.cn-southwest-2.myhuaweicloud.com/',
+  // imageUrl: 'https://phg.obs.cn-southwest-2.myhuaweicloud.com/',
   //
-  // baseUrl: 'http://localhost:9702/brest/', // 测试环境服务器地址(请求数据地址)
+  baseUrl: 'http://localhost:9702/brest/', // 测试环境服务器地址(请求数据地址)
-  // orderUrl: 'http://localhost:9703/order/', // 测试环境服务器地址(请求数据地址)
+  orderUrl: 'http://localhost:9703/order/', // 测试环境服务器地址(请求数据地址)
-  // userUrl: 'http://localhost:9704/user/', // 测试环境服务器地址(请求数据地址)
+  userUrl: 'http://localhost:9704/user/', // 测试环境服务器地址(请求数据地址)
-  // imageUrl: 'https://phg-test.obs.cn-southwest-2.myhuaweicloud.com/',
+  imageUrl: 'https://phg-test.obs.cn-southwest-2.myhuaweicloud.com/',
 
 };