Skip to content

Y
ydLife
Commit 313e2db8 by sunchao
Options

pdf跳转bug修复

parent 90a35ae4
Showing with 12 additions and 13 deletions
src/app/my/product/product.component.html
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<div> <div>
<span style="color: #F16A5D;">￥</span><strong>{{productInfoItem.price | number:'1.0-0'}}</strong><span>元起 | 每人每年</span> <span style="color: #F16A5D;">￥</span><strong>{{productInfoItem.price | number:'1.0-0'}}</strong><span>元起 | 每人每年</span>
</div> </div>
<span class="iconfont icon-ar-r"></span> <span class="iconfont icon-ar-r" style="font-size: 15px;"></span>
</div> </div>
<div class="tagsContent" *ngIf="productInfoItem['tags'] && !productInfoItem.showAll"> <div class="tagsContent" *ngIf="productInfoItem['tags'] && !productInfoItem.showAll">
<div *ngFor="let tagItem of productInfoItem['tags'].slice(0,6)"> <div *ngFor="let tagItem of productInfoItem['tags'].slice(0,6)">
......
src/app/my/product/product.component.scss
...@@ -223,11 +223,10 @@ ...@@ -223,11 +223,10 @@
padding-right: 15px; padding-right: 15px;
> div:first-child { > div:first-child {
width: 55px; width: 55px;
height: 26px;
text-align: center; text-align: center;
border: 1px solid #F16A5D; border: 2px solid #F16A5D;
border-radius: 10px; border-radius: 10px;
color: #F16A5D; color: #726665;
font-size: 15px; font-size: 15px;
font-weight: normal; font-weight: normal;
} }
......
src/app/my/salary-detail/salary-detail.component.html
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
<div class="item"> <div class="item">
<div class="title">个人销售(A)</div> <div class="title">个人销售(A)</div>
<div class="item_detail" (click)="jumpToFirstYearSales(fycSalesInfo,'首年度直接销售佣金',1,1)" *ngIf="fycSalesInfo"> <div class="item_detail" (click)="jumpToFirstYearSales(fycSalesInfo,'首年度直接销售佣金',1,1)" *ngIf="fycSalesInfo">
<span>首年度直接销售佣金</span> <span>首年直接销售佣金</span>
<span class="red">{{fycSalesInfo.commission | number: "1.2-2" }}<i class="iconfont icon-ar-r"></i> </span> <span class="red">{{fycSalesInfo.commission | number: "1.2-2" }}<i class="iconfont icon-ar-r"></i> </span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales(rycSalesInfo,'续年度直接销售佣金',1,2)" *ngIf="rycSalesInfo"> <div class="item_detail" (click)="jumpToFirstYearSales(rycSalesInfo,'续年度直接销售佣金',1,2)" *ngIf="rycSalesInfo">
<span>续年度直接销售佣金</span> <span>续年直接销售佣金</span>
<span class="red">{{rycSalesInfo.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span> <span class="red">{{rycSalesInfo.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales(monthlySalesAddWeight,'月度销售加码奖金',1,2)" *ngIf="monthlySalesAddWeight"> <div class="item_detail" (click)="jumpToFirstYearSales(monthlySalesAddWeight,'月度销售加码奖金',1,2)" *ngIf="monthlySalesAddWeight">
...@@ -49,12 +49,12 @@ ...@@ -49,12 +49,12 @@
<span>特别管理奖金</span> <span>特别管理奖金</span>
<span class="red">{{specialManagementAward.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span> <span class="red">{{specialManagementAward.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales(recommendAward,'推介奖金',1,7)" *ngIf="recommendAward"> <div class="item_detail" (click)="jumpToFirstYearSales(recommendAward,'推荐奖金',1,7)" *ngIf="recommendAward">
<span>推介奖金</span> <span>推荐奖金</span>
<span class="red">{{recommendAward.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span> <span class="red">{{recommendAward.commission | number: "1.2-2"}} <i class="iconfont icon-ar-r"></i></span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales(systemRecommendAward,'体系推介奖',2,8)" *ngIf="systemRecommendAward"> <div class="item_detail" (click)="jumpToFirstYearSales(systemRecommendAward,'体系推荐奖',2,8)" *ngIf="systemRecommendAward">
<span>体系推介奖金</span> <span>体系推荐奖金</span>
<span class="red">{{systemRecommendAward.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span> <span class="red">{{systemRecommendAward.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales(fycMeritsInfo,'团队管理绩效达标奖金',2,5)" *ngIf="fycMeritsInfo"> <div class="item_detail" (click)="jumpToFirstYearSales(fycMeritsInfo,'团队管理绩效达标奖金',2,5)" *ngIf="fycMeritsInfo">
...@@ -69,8 +69,8 @@ ...@@ -69,8 +69,8 @@
<span>直接辅导岗位津贴</span> <span>直接辅导岗位津贴</span>
<span class="red">{{directCounseling.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span> <span class="red">{{directCounseling.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales(indirectCounseling,'间接辅导岗位津贴',2,6)" *ngIf="indirectCounseling"> <div class="item_detail" (click)="jumpToFirstYearSales(indirectCounseling,'隔代辅导岗位津贴',2,6)" *ngIf="indirectCounseling">
<span>间接辅导岗位津贴</span> <span>隔代辅导岗位津贴</span>
<span class="red">{{indirectCounseling.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span> <span class="red">{{indirectCounseling.commission | number: "1.2-2"}}<i class="iconfont icon-ar-r"></i></span>
</div> </div>
<div class="item_detail" (click)="jumpToFirstYearSales(breedingBonus,'育成奖金',2,6)" *ngIf="breedingBonus"> <div class="item_detail" (click)="jumpToFirstYearSales(breedingBonus,'育成奖金',2,6)" *ngIf="breedingBonus">
......
src/app/my/salary-detail/salary-detail.component.ts
...@@ -237,7 +237,7 @@ export class SalaryDetailComponent implements OnInit { ...@@ -237,7 +237,7 @@ export class SalaryDetailComponent implements OnInit {
jumpToFirstYearSales(item,salaryName,type,salaryType){ jumpToFirstYearSales(item,salaryName,type,salaryType){
if(this.isBasic == 1 && salaryName !='银盾在线佣金'){ if(this.isBasic == 1 && salaryName !='银盾在线佣金'){
if(item.pdfOssPath){ if(item.pdfOssPath){
window.location.href = item.pdfOssPath; window.open( item.pdfOssPath)
} }
}else{ }else{
this.router.navigate([`/salary_detail/${salaryType}`],{queryParams:{type:type,salaryName:salaryName,years:this.years,month:this.month,agent_id:this.agent_id,isBasic:this.isBasic}}); this.router.navigate([`/salary_detail/${salaryType}`],{queryParams:{type:type,salaryName:salaryName,years:this.years,month:this.month,agent_id:this.agent_id,isBasic:this.isBasic}});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment