merge
This commit is contained in:
parent
6ae789281b
commit
a46e2641f0
@ -20,12 +20,8 @@
|
|||||||
<div fxFlex="40" align="center" fxLayoutAlign="center center">
|
<div fxFlex="40" align="center" fxLayoutAlign="center center">
|
||||||
<div *ngIf="item.controls['img'] && item.value.img != ''">
|
<div *ngIf="item.controls['img'] && item.value.img != ''">
|
||||||
<img [src]="item.value.img" ngxViewer style="width:85px; height: 85px;float:right">
|
<img [src]="item.value.img" ngxViewer style="width:85px; height: 85px;float:right">
|
||||||
<<<<<<< HEAD
|
|
||||||
</div><br>
|
|
||||||
=======
|
|
||||||
</div>
|
</div>
|
||||||
<span (click)="capture($event,i,item)">
|
<span (click)="capture($event,i,item)">
|
||||||
>>>>>>> 76b66f0681e274e77b54115baf2b71c241b35a58
|
|
||||||
<app-capture-btn addMoreBtn="true" *ngIf="camera_btn[i] == true" class="file-btn" (imageDataEmitter)="capture($event,i,item)"></app-capture-btn>
|
<app-capture-btn addMoreBtn="true" *ngIf="camera_btn[i] == true" class="file-btn" (imageDataEmitter)="capture($event,i,item)"></app-capture-btn>
|
||||||
</span>
|
</span>
|
||||||
<!-- <div style="width: 100%"> -->
|
<!-- <div style="width: 100%"> -->
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user