Commit 8c8f98eb by Sweet Zhang

Merge branch 'dev'

parents 60d58a2e c9414bb9
......@@ -53,7 +53,7 @@ export class LoginComponent implements OnInit, OnDestroy {
}
const lifeCustomerInfo = { ...response.data, mobileNo: this.userInfo.mobileNo, commonResult: null };
if (lifeCustomerInfo['customerId'] && lifeCustomerInfo['practitionerId']) {
if (response['data']['practitionerTypeId'] == 28) {
// if (response['data']['practitionerTypeId'] == 28) {
localStorage.setItem('lifeCustomerInfo', JSON.stringify(lifeCustomerInfo));
//如果有openId跳页由后端判断,没有的话根据登录次数前端判断跳页
if (response['data']['getOpenIdUrl']) {
......@@ -78,11 +78,11 @@ export class LoginComponent implements OnInit, OnDestroy {
this.router.navigateByUrl(this.redirect);
}
}
} else {
this.openPopInfo('你好,只有授权的经纪人才可登录,请联系我们的客服4009219290');
// this.openPopInfo(`你好,只有授权的经纪人才可登录,请联系我们的客服 <a href="tel:4009219290">4009219290 </a>`);
return;
}
// } else {
// this.openPopInfo('你好,只有授权的经纪人才可登录,请联系我们的客服4009219290');
// // this.openPopInfo(`你好,只有授权的经纪人才可登录,请联系我们的客服 <a href="tel:4009219290">4009219290 </a>`);
// return;
// }
} else {
this.openPopInfo('暂无查询资格');
......
......@@ -10,10 +10,11 @@
</div>
<img alt="薪资单" src="{{vxUrl}}" *ngIf="vxUrl" (click)="selectPic()">
<ul class="tips">
<li>如果报聘职阶为A3(业务总监),在最近三年内,至少一年同业收入达18万;</li>
<li>如果报聘职阶为S1B(营销高级总监)在最近三年内,至少一年同业收入达48万;</li>
<li>如果报聘职阶为S1A(业务高级总监)在最近三年内,至少一年同业收入达60万;</li>
<li>如果报聘职阶为S2(业务合伙人)在最近三年内,至少一年同业收入达100万;</li>
<li>如果报聘职级位A2(业务经理),保险从业经验1年以上;</li>
<li>如果报聘职级为A3(业务总监),在最近三年内,至少一年同业收入达18万;</li>
<li>如果报聘职级为S1B(营销高级总监)在最近三年内,至少一年同业收入达48万;</li>
<li>如果报聘职级为S1A(业务高级总监)在最近三年内,至少一年同业收入达60万;</li>
<li>如果报聘职级为S2(业务合伙人)在最近三年内,至少一年同业收入达100万;</li>
</ul>
</div>
<footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
......
<div class="wrapper">
<img src="assets/images/pass.png" alt="通过" />
<div style="font-size: 24px;font-weight: bold;margin: 15px auto;">您已提交成功</div>
<p>我们将会在3个工作日完成审核,</p>
<p>一旦审核完成公司将用短信通知您,</p>
<p>请注意查看!</p>
<img src="assets/images/login_logo.png" alt="logo" style="width: 50%;position: absolute;left: 0;right: 0;margin: 0 auto;bottom: 20px;">
<div style="font-size: 22px;font-weight: bold;margin: 15px auto;">您已经成功提交,谢谢!</div>
<div class="before">
<p>我们将在3个工作日完成报聘审核。</p>
<p>一旦审核完成,将以短信方式通知您成功报聘,</p>
<p>请注意查看。</p>
</div>
<div class="after">
<div style="margin-bottom: 15px;font-size: 16px;">通知您报聘成功后:</div>
<ul>
<li>你可以关注“银盾保险经纪”的微信服务号</li>
<li>在服务号里,用手机号登录我们的银盾经纪平台,可查看您经纪合同和公司相关资料。</li>
<li>运营人员将用微信联系你,并邀请您入群</li>
<li>运营人员将给您公司和相关介绍</li>
</ul>
</div>
<!-- <img src="assets/images/login_logo.png" alt="logo" style="width: 50%;position: absolute;left: 0;right: 0;margin: 0 auto;bottom: 20px;"> -->
</div>
<ydlife-alert *ngIf="isNeedAlert" [dialogInfo]="dialogInfo" (popInfo)="getPopInfo()"></ydlife-alert>
......@@ -4,11 +4,34 @@
margin: 0 auto;
img{
width: 30%;
width: 25%;
margin-top: 30%;
}
div.before{
font-size: 16px;
font-weight: bold;
margin-bottom: 30px;
p{
margin: 5px auto;
font-size: 18px;
text-align: center;
}
}
div.after{
text-align: left;
margin: 15px;
background: #f8f8f8;
padding: 20px;
border-radius: 15px;
font-weight: bold;
ul {
padding:0 0 0 15px;
li{
text-align: left;
color:#999;
list-style: decimal;
margin-bottom: 5px;
}
}
}
}
\ No newline at end of file
......@@ -52,8 +52,10 @@
</div>
<div class="footer" style="justify-content: center;">
<span class="iconfont icon-fanhui" (click)="prev()"></span>
<div (click)="jumpToDetail()">查看资料<span *ngIf="viewApprovalInfo == 0">并审批</span></div>
<span class="iconfont icon-fanhui" (click)="prev()" style="width: 20%;"></span>
<div (click)="jumpToDetail()" style="width: 80%;text-align: center;">
<span *ngIf="viewApprovalInfo != 0" style="margin-left: -25%;">查看资料</span>
<span *ngIf="viewApprovalInfo == 0" style="margin-left: -25%;">点击审批</span>
</div>
</div>
<ydlife-toast *ngIf="toastDialog" [toastInfo]="toastInfo"></ydlife-toast>
......@@ -104,9 +104,7 @@
font-size: 18px;
margin: 0 auto;
.icon-fanhui{
position: absolute;
left: 0;
width: 30px;
text-align: center;
position: relative;
left: 10px;
}
}
\ No newline at end of file
<div class="fileUploadLists">
<div class="nav" *ngIf="!fileUploadType">
<ul class="left">
<ul class="left" [ngStyle]="{'width':type == 'fileUpload'?'100%':'120%'}">
<li *ngFor="let categoryItem of categoryList" (click)="switchCategory(categoryItem.id)"
[ngClass]="{'actived':selectedCategoryId===categoryItem.id}">
{{categoryItem.dropOptionName}}
</li>
</ul>
</div>
<div class="contentList">
<div class="contentList" [ngStyle]="{'margin-top':type == 'fileUpload'?'10px':'auto'}">
<ul>
<li *ngFor="let fileUploadItem of fileUploadItemList">
<a href="{{fileUploadItem.filePath}}" download="{{fileUploadItem.itemName}}" target="_blank">
......
.fileUploadLists {
height: 100%;
background: #f5f5f5;
ul {
list-style: none;
}
......@@ -8,30 +9,26 @@
width: 100%;
overflow-x: auto;
.left{
padding: 10px 2px;
// background: #f0f0f0;
margin-bottom: 10px;
background: #fff;
float: left;
width: 120%;
overflow: hidden;
overflow-x: auto;
list-style: none;
display: flex;
justify-content: space-around;
li{
border: 1px #a9aabb solid;
text-align: center;
font-size: 14px;
height: 30px;
line-height: 30px;
border-radius: 20px;
margin: 0px 2px;
height: 50px;
line-height: 50px;
float: left;
width: 15.6%;
}
li.actived{
// background-color: #ff5a32;
// color: #fff;
// border: 1px #f0f0f0 solid;
border: 1px #e10d0d solid;
border-bottom: 3px #e10d0d solid;
color: #e10d0d;
}
}
}
......
......@@ -55,7 +55,7 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
this.deviceType = this.lifeCommonService.checkDeviceType();
this.lifeCustomerInfo = JSON.parse(localStorage.getItem('lifeCustomerInfo')) ? JSON.parse(localStorage.getItem('lifeCustomerInfo')) : null;
this.isShowSalay = this.lifeCustomerInfo.canSeeSalaryList==1?true:false;
this.announcementQuery();
// this.announcementQuery();
this.performanceList = [
{ name: `${this.lifeCommonService.dateFormat(new Date, ('M'))}月`, time: 1 },
{ name: `${this.getQuarter(this.lifeCommonService.dateFormat(new Date, ('M')))}`, time: 3 },
......
......@@ -2,7 +2,7 @@
<div class="detailContainer scrollContent">
<div class="orderdetailBox">
<div class="btnBox">
<span class="alignItemCenter"><i class="line"></i>保单明细</span>
<span class="alignItemCenter" style="font-size: 20px;"><i class="line"></i>保单明细</span>
</div>
<ul class="list-group" *ngIf="policyInfo?.policyNo">
<li class="list-group-item">
......@@ -22,7 +22,6 @@
<span>{{policyInfo?.status}}</span>
</li>
<div class="insuredsBox coverContent">
<h4 class="text-left alignItemCenter"><i class="line"></i>保障内容</h4>
<ul *ngFor="let productInfo of policyFactorInfos;index as i">
<li class="list-group-item" *ngIf="productInfo?.productName">
<span style="width: 30%;">产品</span>
......@@ -30,7 +29,7 @@
</li>
<li class="list-group-item" *ngIf="productInfo?.insuredAmount">
<span>保额</span>
<span>{{productInfo?.insuredAmount}} {{productInfo?.amountUnit}}</span>
<span>{{productInfo?.insuredAmount | number:'1.2-2'}} {{productInfo?.amountUnit}}</span>
</li>
<li class="list-group-item" *ngIf="productInfo?.period">
<span>缴费年限</span>
......@@ -50,13 +49,17 @@
</li>
</ul>
</div>
<div class="btnBox">
<div class="btnBox" style="margin-top: 10px;">
<span class="alignItemCenter"><i class="line"></i>投保人信息</span>
</div>
<li class="list-group-item">
<span>姓名</span>
<span>{{holderInfo?.name}}</span>
</li>
<li class="list-group-item" *ngIf="holderInfo?.mobileNo">
<span>手机号</span>
<span>{{holderInfo?.mobileNo}}</span>
</li>
<li class="list-group-item" *ngIf="holderInfo?.gender">
<span>性别</span>
<ng-container [ngSwitch]="holderInfo?.gender">
......@@ -83,16 +86,20 @@
</li>
<li class="list-group-item" *ngIf="holderInfo?.idInfo.idNo">
<span>证件号码</span>
<span>{{holderInfo?.idInfo.idNo}}</span>
<span>{{holderInfo?.idInfo.idNo.substr(0,2) + '******' + holderInfo?.idInfo.idNo.substr(holderInfo?.idInfo.idNo.length-2,2)}}</span>
</li>
</ul>
<div class="insuredsBox" *ngFor="let insured of insuredInfos;index as i">
<h4 class="text-left alignItemCenter"><i class="line"></i>被保人信息{{i+1}}</h4>
<h4 class="text-left alignItemCenter" style="margin-top: 10px;"><i class="line"></i>被保人信息{{i+1}}</h4>
<ul>
<li class="list-group-item" *ngIf="this.insured?.name">
<span>姓名</span>
<span>{{this.insured?.name}}</span>
</li>
<li class="list-group-item" *ngIf="this.insured?.mobileNo">
<span>手机号</span>
<span>{{this.insured?.mobileNo}}</span>
</li>
<li class="list-group-item" *ngIf="this.insured?.gender">
<span>性别</span>
<ng-container [ngSwitch]="insured?.gender">
......@@ -103,7 +110,7 @@
</li>
<li class="list-group-item" *ngIf="this.insured?.birthDay">
<span>出生日期</span>
<span>{{this.isReferral==='true' ? '****-'+this.insured?.birthDay.substr(5) : this.insured?.birthDay}}</span>
<span>{{ '****-'+this.insured?.birthDay.substr(5)}}</span>
</li>
<li class="list-group-item" *ngIf="insured?.idInfo?.idType">
<span>证件类型</span>
......@@ -118,7 +125,7 @@
</li>
<li class="list-group-item" *ngIf="this.insured?.idInfo?.idNo">
<span>证件号码</span>
<span>{{this.isReferral==='true' ? this.insured?.idInfo?.idNo.substr(0,2) + '******' + this.insured?.idInfo?.idNo.substr(this.insured?.idInfo?.idNo.length-2,2) : this.insured?.idInfo?.idNo}}</span>
<span>{{ this.insured?.idInfo?.idNo.substr(0,2) + '******' + this.insured?.idInfo?.idNo.substr(this.insured?.idInfo?.idNo.length-2,2)}}</span>
</li>
<li class="list-group-item" *ngIf="this.insured?.occupationName">
<span>职业类别</span>
......@@ -138,15 +145,22 @@
</li>
</ul>
</div>
<h4 class="text-left alignItemCenter" *ngIf="policyInfo?.price || policyInfo?.referralInfo?.referralAmount || policyInfo?.totalPrice"
style="margin-top: 10px;"><i class="line"></i>保费</h4>
<ul class="priceContainer">
<li class="list-group-item" *ngIf="policyInfo?.price">
<span>保费</span>
<span>年化保费</span>
<span>¥{{policyInfo?.price | number:'1.2-2'}}</span>
</li>
<li class="list-group-item" *ngIf="policyInfo?.totalPrice">
<span>总保费</span>
<span>¥ {{policyInfo?.totalPrice | number:'1.2-2'}}</span>
</li>
<li class="list-group-item" *ngIf="policyInfo?.referralInfo?.referralAmount">
<span style="color: #c9af71;">总销售佣金</span>
<span style="color: #c9af71;">佣金</span>
<span class="light-color">¥{{policyInfo?.referralInfo?.referralAmount | number:'1.2-2'}}</span>
</li>
</ul>
</div>
</div>
......
......@@ -3,7 +3,7 @@
}
.orderdetailBox {
margin: 20px 8px;
margin:0 8px 20px 8px;
background-color: #f9fdff;
padding-top: 14px;
padding-left: 11px;
......@@ -18,6 +18,10 @@
font-size: 14px;
font-weight: bold;
}
.orderdetailBox .btnBox span{
display: flex;
align-items: center;
}
.orderdetailBox .btnBox div .downloadBtn {
display: inline-block;
......@@ -72,6 +76,18 @@
transform: scaleY(0.3)
}
.list-group-item + .list-group-item:last-child::after{
position: absolute;
bottom: 0;
left: 0;
content: '';
width: 100%;
height: 1px;
border-top: 1px solid #dcdcdc;
-webkit-transform: scaleY(0.3);
transform: scaleY(0.3)
}
.list-group-item:nth-last-child(1) {
border: none;
}
......@@ -93,6 +109,9 @@
border-top: 1px solid #dcdcdc;
}
.priceContainer li:nth-child(1){
border: none;
}
h4 {
font-size: 14px;
font-weight: bold;
......
......@@ -11,16 +11,20 @@ export class OrderDetailComponent implements OnInit {
orderNo: string;
policyInfo: any;
holderInfo: any;
policyNo:string;
insuredInfos: Array<any>;
policyFactorInfos: Array<any>;
relation_id:string;
constructor(private myService: MyService, private activatedRoute: ActivatedRoute) { }
ngOnInit() {
this.orderNo = this.activatedRoute.snapshot.queryParams.orderNo;
this.policyNo = this.activatedRoute.snapshot.queryParams.policyNo;
this.relation_id = this.activatedRoute.snapshot.queryParams.relation_id;
this.policyInfoQuery();
}
policyInfoQuery() {
this.myService.policyInfoQuery({ orderNo: this.orderNo, platform: 2 }).subscribe((res) => {
this.myService.policyInfoQuery({ orderNo: this.orderNo, platform: 2,policyNo:this.policyNo,relation_id:this.relation_id }).subscribe((res) => {
if (res['success']) {
this.policyInfo = res['data'];
this.holderInfo = this.policyInfo['holderInfo'];
......
......@@ -8,7 +8,7 @@
</div>
</div>
</div>
<ul class="tab" *ngIf="this.pageType == 'recruiting'">
<ul class="tab" *ngIf="this.pageType == 'recruiting'" >
<li *ngFor="let titleItem of titleList" (click)="selectTab(titleItem.id)"
[ngClass]="{selected:selectedId===titleItem.id}">
<div style="position: relative;">
......@@ -17,7 +17,7 @@
</div>
</li>
</ul>
<div class="salesContent">
<div class="salesContent" [ngStyle]="{'padding-bottom':showRecruitingList?.length>0?'50px':'0px'}">
<div style="text-align: center;margin: 20px auto;font-size: 20px;" *ngIf="businessList?.length==0">暂无商机</div>
<div class="salesItem" *ngFor="let recruitingItem of showRecruitingList" (click)="isJumpToDetail(recruitingItem.potentialId,recruitingItem)">
<div class="icon_bolck" *ngIf="pageType=='recruiting'"><span class="iconfont icon-tuanduiguanlisvg"></span></div>
......@@ -43,8 +43,9 @@
<div class="footer" *ngIf="pageType=='linkrecruiting'" (click)="returnAddTask()">
确认
</div>
<div class="add" *ngIf="pageType=='recruiting' && selectedId !=4">
<i class="iconfont icon-jiahao" (click)="addMember()"></i>
<div class="footer" *ngIf="pageType=='recruiting' && selectedId !=4" (click)="addMember()">
新增人员
</div>
</div>
<ydlife-toast *ngIf="toastDialog" [toastInfo]="toastInfo"></ydlife-toast>
\ No newline at end of file
......@@ -3,29 +3,31 @@
height: 100%;
overflow: auto;
// background:#f7f7f2;
background: #fff;
background: #f5f5f5;
.tab {
display: flex;
list-style: none;
margin: 10px 0px;
justify-content: space-around;
background:#fff;
margin-bottom: 10px;
li {
line-height: 30px;
height: 30px;
width: 25%;
line-height: 50px;
height: 50px;
text-align: center;
border: 1px #a9aabb solid;
border-radius: 20px;
h3 {
font-weight: normal;
font-size: 16px;
}
}
li.selected {
border: 1px #e10d0d solid;
border-bottom: 3px #e10d0d solid;
h3{
color: #e10d0d;
}
}
}
.salesContent{
background: #fff;
.salesItem{
border-bottom: 1px #dcdcdc solid;
padding: 10px;
......@@ -33,7 +35,6 @@
position: relative;
.icon_bolck{
border: 1px #dcdcdc solid;
width: 35px;
height: 35px;
position: absolute;
......@@ -42,6 +43,7 @@
line-height: 30px;
text-align: center;
border-radius: 50%;
background: #fff5f5;
.iconfont{
color: #ff3500;
font-size: 26px;
......
......@@ -15,13 +15,13 @@
</li>
</ul>
<ul class="tab">
<li (click)="platform=1;practitionerPolicyListQuery(1)" [ngClass]="{selected:platform==1}">线上</li>
<li (click)="platform=2;practitionerPolicyListQuery(2)" [ngClass]="{selected:platform==2}">寿险</li>
<li (click)="platform=1;practitionerPolicyListQuery(1)" [ngClass]="{selected:platform==1}">线上</li>
</ul>
</div>
<div class="salesContent">
<div class="salesItem" *ngFor="let salesDetailItem of salesDetailList"
(click)="jumpToOrderdetail(salesDetailItem.orderNo,salesDetailItem.platform,salesDetailItem.fortuneId)">
(click)="jumpToOrderdetail(salesDetailItem.orderNo,salesDetailItem.platform,salesDetailItem.fortuneId,salesDetailItem.policyNo,salesDetailItem.relation_id)">
<div class="line">
<div>投保人:{{salesDetailItem.holderName}}</div>
<span class="iconfont icon-ar-r" style="font-size: 10px;position: relative; right: -2px;"></span>
......
......@@ -26,25 +26,16 @@ export class SalesDetailComponent implements OnInit {
ngOnInit() {
this.searchType = this.activatedRoute.snapshot.queryParams.searchType;
this.showType = this.activatedRoute.snapshot.queryParams.showType;
this.platform = 1;
this.platform = 2;
this.practitionerPolicyListQuery(this.platform);
}
//查询保单
practitionerPolicyListQuery(platform?: any) {
const practitionerId = JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId'];
this.myService.policyListQuery({ practitionerId: practitionerId, time: this.searchType }).subscribe((res) => {
this.myService.policyListQuery({ practitionerId: practitionerId, time: this.searchType,platform:this.platform }).subscribe((res) => {
if (res['success']) {
this.salesDetailList = res['data']['policyInfoList'];
if (platform == 1) {
this.salesDetailList = this.salesDetailList.filter(item => {
return item.platform == 1;
})
} else {
this.salesDetailList = this.salesDetailList.filter(item => {
return item.platform == 2;
})
}
} else {
this.salesDetailList = [];
}
......@@ -59,12 +50,12 @@ export class SalesDetailComponent implements OnInit {
this.practitionerPolicyListQuery(this.platform);
}
jumpToOrderdetail(orderNo, platform, fortuneId) {
jumpToOrderdetail(orderNo, platform, fortuneId,policyNo,relation_id) {
if (platform === 1) {
const customerId = JSON.parse(localStorage.getItem('lifeCustomerInfo')).customerId;
window.location.href = `https://${window.location.host}/mine/orderdetail/${orderNo}?customerId=${customerId}&isReferral=true&paid=true&fortuneId=${fortuneId}`;
} else {
this.router.navigate(['/orderDetail'], { queryParams: { orderNo: orderNo } });
this.router.navigate(['/orderDetail'], { queryParams: { orderNo: orderNo,policyNo:policyNo,relation_id:relation_id } });
}
}
}
......@@ -24,8 +24,9 @@ export class SalesRankComponent implements OnInit {
{ type: 2, name: '本年' }
]
this.typelist = [
{ type: 1, name: '线上' },
{ type: 2, name: '寿险' },
{ type: 1, name: '线上' },
]
this.searchList = [
{ type: 1, name: '首年保费' },
......@@ -37,8 +38,8 @@ export class SalesRankComponent implements OnInit {
ngOnInit() {
this.practitionerBasicInfo = JSON.parse(localStorage.getItem("lifeCustomerInfo"))['practitionerBasicInfo'];
this.time = this.activatedRoute.snapshot.queryParams.time ? Number(this.activatedRoute.snapshot.queryParams.time) : null;
//初始化查线上保费
this.rank(this.time, 1, 1)
//初始化查寿险保费
this.rank(this.time, 2, 1)
}
/**
......
......@@ -96,11 +96,14 @@
暂无战队成员,努力去增员吧
</div>
<ul *ngFor="let teamMemberItem of teamMemberList;index as i;" [routerLink]="['/member_detail',teamMemberItem.practitionerId]">
<li>{{i+1}} {{teamMemberItem.name}}</li>
<li>
<span style="color:#333;font-size: 14px;font-weight: normal;">{{i+1}} </span>
<i style="margin-left: 10px;font-style: normal;">{{teamMemberItem.name}}</i>
</li>
<li>{{teamMemberItem.practitionerLevel}}{{teamMemberItem.practitionerTitle}}</li>
<li class="sex">{{teamMemberItem.gender}}</li>
<li>{{teamMemberItem.mobileNo}}</li>
<li><i class="iconfont icon-ar-r" style="color: #A4A4A4FF;font-size: 12px;" ></i></li>
<li><i class="iconfont icon-ar-r" style="color: #a4a4a4;font-size: 12px;" ></i></li>
</ul>
</div>
</div>
......
<div class="wrapper">
<div #letter_src id="letter_src">
<div class="welcome_header" >
<img src="assets/images/welcome_header.jpg" >
</div>
<div class="chinese">
亲爱的 <span style="font-weight: bold;">{{brokerInfo?.name}}</span>
<br /><br />
......
......@@ -83,5 +83,15 @@
color: #fff;
}
.welcome_header{
width: 180px;
height: 180px;
overflow: hidden;
margin: 0 auto;
border-radius: 50%;
}
.welcome_header img{
max-width: 100%;
margin-top: -10px;
}
......@@ -96,7 +96,7 @@
if (document.readyState == "complete") {
setTimeout(() => {
loading.style.display = 'none';
}, 3000)
}, 1500)
}
}
......
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