解决冲突

This commit is contained in:
wangshiming
2022-03-31 14:03:18 +08:00
parent a1b294eb8a
commit 1d1418ac44
2 changed files with 4 additions and 4 deletions

View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming
* @LastEditTime : 2022-03-31 10:07:26
* @LastEditTime : 2022-03-31 14:02:38
* @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -20,7 +20,7 @@ module.exports = {
// }
'//api': {
target: {
host: 'tms-api-dev.eascs.com',
host: 'tms-api-test.eascs.com',
protocol: 'https:',
port: 443
},

View File

@ -159,10 +159,10 @@
<sv label="服务包">
{{ i?.insuranceTypeLabel}}
</sv>
<sv label="货物价值">
<sv label="货物价值" *ngIf="i?.insuranceType !== '3'">
{{i?.goodsValue !==null?(i?.goodsValue|currency)+'元':'-'}}
</sv>
<sv label="服务包费用">
<sv label="服务包费用" *ngIf="i?.insuranceType !== '3'">
{{i?.insurancePremium!==null?(i?.insurancePremium |currency)+'元':'-'}}
</sv>
</sv-container>