From f465578e7fbfd187a7343b1d8e4bed14d77ba7a8 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 6 May 2022 17:02:32 +0800 Subject: [PATCH] fix bug --- proxy.conf.js | 4 ++-- .../index/partner-list.component.ts | 2 +- .../list/detail/detail.component.ts | 20 +++++++++++-------- .../services/business/shipper-base.service.ts | 9 +++++++-- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index d58ece8c..28e2be41 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-06 16:05:45 + * @LastEditTime : 2022-05-06 16:57:23 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index a72ff7af..2d7a60ef 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -55,7 +55,7 @@ export class PartnerListComponent { }; loadSelectOptions() { - this.service.getRebateConfig().subscribe(res => { + this.service.getRebateConfig({stateLocked: 1}).subscribe(res => { if (res) { console.log(res); diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.ts b/src/app/routes/vehicle/components/list/detail/detail.component.ts index 418b62b2..66707ca1 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts @@ -203,14 +203,18 @@ export class VehicleComponentsListDetailComponent implements OnInit { *查看评价 */ viewEvaluate(item: any) { - console.log(item); - this.st.reload(); - this.getDetailList(); - const params = { - imgList: [item.carProtocal], - index: 0 - }; - this.nzImageService.preview([{ src: item.carProtocal}]); + // console.log(item); + // this.st.reload(); + // this.getDetailList(); + // const params = { + // imgList: [item.carProtocal], + // index: 0 + // }; + // this.nzImageService.preview([{ src: item.carProtocal}]); + this.modal.createStatic(VehicleImgViewComponent, { i: item }).subscribe(() => { + this.st.reload(); + this.getDetailList(); + }); } /** *查看评价 diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index 804c531a..ff9837af 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -383,8 +383,13 @@ export class ShipperBaseService extends BaseService { * 获取全部返佣配置 * @returns */ - getRebateConfig() { - const params = {}; + getRebateConfig(value?: any) { + const params:any = {}; + if(value) { + params.stateLocked = 1 + } + console.log(params); + return this.request(this.$api_get_rebate_config, params, 'POST').pipe( map(res => { if (res) {