解决冲突
This commit is contained in:
		| @ -4,7 +4,7 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2021-12-15 13:17:42 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-02-24 10:45:43 | ||||
|  * @LastEditTime : 2022-02-24 10:47:39 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.html | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
| --> | ||||
| @ -19,7 +19,8 @@ | ||||
|     (运输费:{{ data?.totalFreight | currency }},附加费:{{ data?.totalSurcharge | currency }},附加费率:{{ (data?.totalRate * 100).toFixed(2) + '%' }}) | ||||
|   </p> | ||||
|   <p> | ||||
|     <label nz-checkbox [(ngModel)]="aggreechecked">确认已阅读并知晓<a>《变更协议》</a></label> | ||||
|     <label nz-checkbox [(ngModel)]="aggreechecked"></label> | ||||
|     <span> 确认已阅读并知晓 <a target="_blank" [routerLink]="['/agreement']" [queryParams]="{ type: 11 }">《变更协议》</a></span> | ||||
|   </p> | ||||
| </div> | ||||
|  | ||||
|  | ||||
		Reference in New Issue
	
	Block a user