Commit 51f6da10 by Chao Sun

样式修改及部分逻辑修改

parent c63e32bd
......@@ -48,4 +48,4 @@
"tslint": "~5.11.0",
"typescript": "~3.2.2"
}
}
\ No newline at end of file
}
......@@ -25,7 +25,7 @@ import { LocalStorage } from './domain/local.storage';
AuthModule,
LifeCommonModule,
HttpClientModule,
AppRoutingModule,
AppRoutingModule
],
providers: [DatePipe, httpInterceptorProviders, LocalStorage],
bootstrap: [AppComponent]
......
......@@ -9,7 +9,7 @@
overflow-x: auto;
.left{
padding: 10px 2px;
background: #f0f0f0;
// background: #f0f0f0;
margin-bottom: 10px;
float: left;
width: 120%;
......@@ -28,9 +28,10 @@
width: 15.6%;
}
li.actived{
background-color: #ff5a32;
color: #fff;
border: 1px #f0f0f0 solid;
// background-color: #ff5a32;
// color: #fff;
// border: 1px #f0f0f0 solid;
border: 1px #e10d0d solid;
}
}
}
......
......@@ -4,7 +4,7 @@
overflow-x: auto;
.left{
padding: 10px 2px;
background: #f0f0f0;
// background: #f0f0f0;
margin-bottom: 10px;
float: left;
width: 120%;
......@@ -23,9 +23,10 @@
width: 15.7%;
}
li.actived{
background-color: #ff5a32;
color: #fff;
border: 1px #f0f0f0 solid;
// background-color: #ff5a32;
// color: #fff;
// border: 1px #f0f0f0 solid;
border: 1px #e10d0d solid;
}
}
}
......
......@@ -4,7 +4,7 @@
overflow-x: auto;
.left{
padding: 10px 2px;
background: #f0f0f0;
// background: #f0f0f0;
margin-bottom: 10px;
float: left;
width: 120%;
......@@ -23,9 +23,10 @@
width: 15.6%;
}
li.actived{
background-color: #ff5a32;
color: #fff;
border: 1px #f0f0f0 solid;
// background-color: #ff5a32;
// color: #fff;
// border: 1px #f0f0f0 solid;
border: 1px #e10d0d solid;
}
}
}
......
......@@ -37,8 +37,9 @@
</div>
<div class="contentItem">
<span>手机</span>
<a style="text-decoration:none;color: #333;margin-right: 16px;"
href="tel:{{editBusiness.mobileNo}}">{{editBusiness.mobileNo}}</a>
<a style="text-decoration:none;color: #333;margin-right: 16px;" href="tel:{{editBusiness.mobileNo}}">
<i class="iconfont icon-dianhua" style="color: #e10d0d;"></i>
{{editBusiness.mobileNo}}</a>
<!-- <input class="form-control" type="text" [(ngModel)]="editBusiness.mobileNo" disabled /> -->
</div>
<div class="contentItem">
......@@ -123,13 +124,13 @@
<div class="salesNotice">{{(editBusiness.opportunityDate).substr(0,10)}}</div>
<div style="display: flex;justify-content: space-between;">
<div>商机状态</div>
<div>{{lifeCommonService.checkStr(editBusiness.mdDropOptionId)}}</div>
<div>待跟进</div>
</div>
</li>
</ul>
<div class="add" (click)="showToast()">
<!-- <i class="iconfont icon-jia" (click)="ownOpportunityRecordSave()"></i> -->
<i class="iconfont icon-jia"></i>
<i class="iconfont icon-jiahao"></i>
</div>
</div>
......
......@@ -21,9 +21,9 @@
}
}
li.selected {
background-color: #ff5a32;
color: #fff;
border: 1px #f0f0f0 solid;
// background-color: #ff5a32;
// color: #fff;
border: 1px #e10d0d solid;
}
}
.content {
......@@ -38,7 +38,7 @@
right: 10px;
font-size: 24px;
color: #fff;
background: #1890ff;
background: #0767bf;
text-align: center;
bottom: 30px;
}
......@@ -79,7 +79,7 @@
box-shadow: none;
}
.form-control.sex.sexBtn {
border: 1px #e10d0d solid;
border: 1px #0767bf solid;
}
.form-control[disabled] {
background-color: transparent;
......@@ -106,7 +106,7 @@
padding: 0 15px;
}
div.selected {
border: 1px #e10d0d solid;
border: 1px #0767bf solid;
}
}
.add {
......@@ -120,7 +120,7 @@
right: 10px;
font-size: 24px;
color: #fff;
background: #1890ff;
background: #0767bf;
text-align: center;
bottom: 30px;
font-size: 28px;
......@@ -166,8 +166,8 @@
height: 45%;
background-color: #fff;
z-index: 20;
-webkit-animation: 5.5s both slowUp;
animation: 5.5s both slowUp;
-webkit-animation: .5s both slowUp;
animation: .5s both slowUp;
min-width: 320px;
max-width: 640px;
margin: 0 auto;
......@@ -196,7 +196,7 @@
display: flex;
list-style: none;
justify-content: center;
margin-top: 10%;
margin-top: 15%;
li{
width: 30%;
height: 35px;
......
......@@ -235,6 +235,9 @@ export class MyBusinessDetailComponent implements OnInit {
ownOpportunityRecordSave() {
const nowDate = new Date().getTime();
const oppDate = new Date(this.opportunityRecordNoticeDate).getTime();
const createDate = new Date(this.editBusiness.opportunityDate).getTime();
console.log('创建', createDate)
console.log('跟进', oppDate)
if (nowDate < oppDate) {
this.toastDialog = true;
this.toastInfo = {
......@@ -245,6 +248,17 @@ export class MyBusinessDetailComponent implements OnInit {
};
return;
}
if (oppDate < createDate) {
this.toastDialog = true;
this.toastInfo = {
status: 1,
msg: '跟进时间不能在商机之前!',
timeout: 3000,
align: 'center'
};
return;
}
if (!this.opportunityRecordId) {
this.toastDialog = true;
this.toastInfo = {
......@@ -295,6 +309,7 @@ export class MyBusinessDetailComponent implements OnInit {
};
this.opportunityRecordId = this.salesNotice = this.opportunityRecordNoticeDate = null;
this.ownOpportunityDetailQuery();
this.isShow = false;
} else {
this.toastDialog = true;
this.toastInfo = {
......
......@@ -9,13 +9,15 @@
</div> -->
<div class="salesItem" *ngFor="let businessItem of businessList"
[routerLink]="['/business',businessItem.opportunityId]" [queryParams]="{orderId:businessItem.orderId}">
<div class="icon_bolck"><span class="iconfont icon-money-more"></span></div>
<div class="icon_bolck"><span class="iconfont icon-xiansuo1"></span></div>
<div class="line">
<div>姓名:{{businessItem.name}}</div>
<div>{{this.lifeCommonService.checkStr(businessItem.mdDropOptionId)}}</div>
<span class="iconfont icon-ar-r" style="font-size: 14px;position: relative; right: -2px;top: 2px;"></span>
</div>
<div class="line">
<div> 手机号:{{businessItem.mobileNo}}</div>
<div>{{this.lifeCommonService.checkStr(businessItem.mdDropOptionId)}}</div>
</div>
<div class="line">
<div>商机来源:{{businessItem.opportunityFrom}}</div>
......
......@@ -2,13 +2,14 @@
width: 100%;
height: 100%;
overflow: auto;
background:#f7f7f2;
// background:#f7f7f2;
.salesContent{
.salesItem{
border-bottom: 1px #dcdcdc solid;
padding: 10px;
padding-left: 45px;
position: relative;
.icon_bolck{
border: 1px #dcdcdc solid;
width: 35px;
......@@ -31,8 +32,8 @@
display: flex;
justify-content: space-between;
align-items: center;
height: 18px;
font-size: 13px;
flex: 1;
.price{
font-size: 16px;
color: #ff3500;
......
......@@ -34,7 +34,7 @@
<!-- <img class="bg" src="assets/images/sales__bg.png" > -->
<div class="content">
<span class="detail" (click)="jumpToDetail()">明细<i class="iconfont icon-ar-r"
<span class="detail" (click)="jumpToDetail('sales')">明细<i class="iconfont icon-ar-r"
style="font-size:12px;"></i></span>
<ul class="tab">
<li *ngFor="let item of performanceList" (click)="selectRang(item.type)"
......@@ -92,7 +92,7 @@
</div>
</div>
</div>
<hr style="border-top: 1px solid #ddd;border-left: none;border-right: none;border-bottom: none;" />
<!-- <hr style="border-top: 1px solid #ddd;border-left: none;border-right: none;border-bottom: none;" /> -->
<div class="hotProduct">
<div style="margin-bottom: 10px;">
<h3>热销产品</h3>
......@@ -134,7 +134,7 @@
</div>
</div>
</div>
<hr style="border-top: 1px solid #ddd;border-left: none;border-right: none;border-bottom: none;" />
<!-- <hr style="border-top: 1px solid #ddd;border-left: none;border-right: none;border-bottom: none;" /> -->
<div class="health_wrapper">
<h3>医疗服务</h3>
<img style="border-radius: 10px;width: 48%;margin-right: 10px;" src="assets/images/yindunvipmember.jpg"
......
......@@ -212,21 +212,27 @@
display: flex;
flex-direction: column;
flex-wrap: wrap;
background: #fff;
box-shadow: 0 1px 3px #969696;
border-radius: 6px;
margin-bottom: 10px;
padding: 7px 0px 0px 10px;
h3{
font-weight: normal;
font-size: 16px;
margin-bottom: 3px;
margin-bottom: 8px;
}
.tool_content{
display: flex;
justify-content: space-between;
margin-bottom: 5px;
margin-bottom: 10px;
flex-wrap: wrap;
.content_item{
display: flex;
flex-direction: column;
align-items: center;
width: 25%;
height: 60px;
.iconfont{
color: #ff002a;
font-size: 24px;
......@@ -238,6 +244,11 @@
.hotProduct{
margin: 10px auto;
background: #fff;
box-shadow: 0 1px 5px #969696;
border-radius: 6px;
margin-bottom: 10px;
padding: 7px 10px 0px 10px;
h3{
font-weight: normal;
font-size: 16px;
......@@ -310,15 +321,18 @@
height: 100%;
display: inline-block;
}
}
.health_wrapper{
background: #fff;
box-shadow: 0 1px 5px #969696;
border-radius: 6px;
margin-bottom: 10px;
padding: 7px 10px 10px 10px;
h3{
font-weight: normal;
font-size: 16px;
margin: 10px auto;
margin-bottom:8px;
}
}
}
......
......@@ -47,17 +47,17 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
{
title: '营销工具',
content: [
{ no: 2, subtitle: 'AI保险医生', icon: 'icon-ai', path: `https://${window.location.host}/questionnaire/#/index?campaign=AIRobot&task=AItask1&customerId=${this.lifeCustomerInfo.customerId}`, routerLink: '' },
{ no: 1, subtitle: '獴哥保险诊所', icon: 'icon-btnconsult', path: `https://${window.location.host}/consulting`, routerLink: '' },
{ no: 4, subtitle: '银盾在线', icon: 'icon-zaixian', path: `https://${window.location.host}/index`, routerLink: '' },
{ no: 13, subtitle: '我的商机', icon: 'icon-shangji', path: '', routerLink: 'business' },
{ no: 12, subtitle: '我的保单', icon: 'icon-dailishangshenqing', path: '', routerLink: '' },
{ no: 2, subtitle: 'AI保险医生', icon: 'icon-AI', path: `https://${window.location.host}/questionnaire/#/index?campaign=AIRobot&task=AItask1&customerId=${this.lifeCustomerInfo.customerId}`, routerLink: '' },
{ no: 1, subtitle: '獴哥保险诊所', icon: 'icon-zhensuozhongxin', path: `https://${window.location.host}/consulting`, routerLink: '' },
{ no: 4, subtitle: '银盾在线', icon: 'icon-yidonghulianwang2', path: `https://${window.location.host}/index`, routerLink: '' },
{ no: 13, subtitle: '我的商机', icon: 'icon-xiansuo1', path: '', routerLink: 'business' },
{ no: 12, subtitle: '我的保单', icon: 'icon-baodanyangben', path: '', routerLink: '' },
]
}, {
title: '教育培训',
content: [
{ no: 5, subtitle: '保险ABC', icon: 'icon-xueshimao', path: `https://${window.location.host}/issue`, routerLink: '' },
{ no: 6, subtitle: '培训课件', icon: 'icon-jiaoyu', path: '', routerLink: 'training' },
{ no: 5, subtitle: '保险ABC', icon: 'icon-zidian', path: `https://${window.location.host}/issue`, routerLink: '' },
{ no: 6, subtitle: '培训课件', icon: 'icon-ziliaoku', path: '', routerLink: 'training' },
{ no: 11, subtitle: '文件下载', icon: 'icon-xiazai1', path: 'https://www.ydinsurance.cn/?page_id=13957', routerLink: 'fileUpload' },
{ no: 8, subtitle: '', icon: '', path: '', routerLink: '' }
......@@ -65,10 +65,10 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
}, {
title: '展业工具',
content: [
{ no: 9, subtitle: '执业分享', icon: 'icon-shenfenzheng', path: `https://${window.location.host}/brokerQry/#/brokerDetail/${this.lifeCustomerInfo.practitionerId}`, routerLink: '' },
{ no: 10, subtitle: '职业类别', icon: 'icon-zhiyeleibie', path: 'https://www.ydinsurance.cn/occupationQry/', routerLink: '' },
{ no: 7, subtitle: '文章分享', icon: 'icon-zhuanfaxian', path: `https://${window.location.host}/discovery`, routerLink: '' },
{ no: 3, subtitle: '产品海报', icon: 'icon-wenjian', path: '/salesDetail', routerLink: 'material' },
{ no: 9, subtitle: '执业分享', icon: 'icon-zhiyezhenghao', path: `https://${window.location.host}/brokerQry/#/brokerDetail/${this.lifeCustomerInfo.practitionerId}`, routerLink: '' },
{ no: 10, subtitle: '职业类别', icon: 'icon-zhiye', path: 'https://www.ydinsurance.cn/occupationQry/', routerLink: '' },
{ no: 7, subtitle: '文章分享', icon: 'icon-fenxiangwenzhang', path: `https://${window.location.host}/discovery`, routerLink: '' },
{ no: 3, subtitle: '产品海报', icon: 'icon-haibao-1', path: '/salesDetail', routerLink: 'material' },
]
}
......@@ -83,8 +83,8 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
ngAfterViewInit() {
setTimeout(() => {
this.firstAnnouncementTitle = this.getStr(this.hide.nativeElement.innerText, '28')
}, 500);
this.firstAnnouncementTitle = this.getStr(this.hide.nativeElement.innerText, '32')
}, 300);
}
// 菜单导航
......@@ -98,7 +98,7 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
// this.shareIdCard();
// }
else if (item.no === 12) {
this.router.navigate(['/salesDetail'], { queryParams: { type: this.performanceSelectedFlag } });
this.router.navigate(['/salesDetail'], { queryParams: { searchType: this.performanceSelectedFlag, showType: 'orderform' } });
} else if (item.no === 8) {
return;
} else {
......@@ -232,7 +232,7 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
window.location.href = `https://${window.location.host}/mk/ydviphexincoupon`
}
jumpToDetail() {
this.router.navigate(['/salesDetail'], { queryParams: { type: this.performanceSelectedFlag } });
jumpToDetail(showType) {
this.router.navigate(['/salesDetail'], { queryParams: { searchType: this.performanceSelectedFlag, showType: showType } });
}
}
<div class="salesWrapper">
<ul class="tab">
<li *ngFor="let item of performanceList" (click)="selectRang(item.type)"
[ngClass]="{selected:salesDetailType==item.type}">
[ngClass]="{selected:searchType==item.type}">
<div style="position: relative;">
<h3>{{item.name}}
<!-- <i class="line" *ngIf="performanceSelectedFlag==item.type"
......@@ -14,13 +14,16 @@
<div class="salesContent">
<div class="salesItem" *ngFor="let salesDetailItem of salesDetailList"
(click)="jumpToOrderdetail(salesDetailItem.orderNo)">
<div class="icon_bolck"><span class="iconfont icon-money-more"></span></div>
<div class="icon_bolck" *ngIf="showType==='sales'"><span class="iconfont icon-money-more"></span></div>
<div class="icon_bolck" *ngIf="showType==='orderform'"><span class="iconfont icon-baodanyangben"
style="font-size: 20px;"></span></div>
<div class="line">
<div>投保人:{{salesDetailItem.holderName}}</div>
<div class="price">¥{{salesDetailItem.referralAmount | number: "1.2-2"}}</div>
<span class="iconfont icon-ar-r" style="font-size: 14px;position: relative; right: -2px;top: 2px;"></span>
</div>
<div class="line long_line">{{salesDetailItem.productName}}
<span class="iconfont icon-ar-r" style="font-size: 14px;position: relative; right: -2px;top: 2px;"></span>
<div class="price" *ngIf="showType==='sales'">¥{{salesDetailItem.referralAmount | number: "1.2-2"}}</div>
<div class="price" *ngIf="showType==='orderform'">¥{{salesDetailItem.orderPrice | number: "1.2-2"}}</div>
</div>
<div class="line long_line">
<div>保单号:{{salesDetailItem.policyNo}}</div>
......
......@@ -22,9 +22,10 @@
}
}
li.selected{
background-color: #ff5a32;
color: #fff;
border: 1px #f0f0f0 solid;
// background-color: #ff5a32;
// color: #fff;
// border: 1px #f0f0f0 solid;
border: 1px #e10d0d solid;
}
}
.salesContent{
......
......@@ -10,8 +10,9 @@ import { LifeCommonService } from '../../common/life-common.service';
export class SalesDetailComponent implements OnInit {
allPerformanceInfo: Array<any>;
salesDetailList: Array<any>;
salesDetailType: any;
searchType: any;
performanceList: Array<any>;
showType: any;
constructor(private myService: MyService, private activatedRoute: ActivatedRoute, public lifeCommonService: LifeCommonService) {
this.performanceList = [
{ type: 'month', name: '本月' },
......@@ -20,7 +21,9 @@ export class SalesDetailComponent implements OnInit {
}
ngOnInit() {
this.salesDetailType = this.activatedRoute.snapshot.queryParams.type;
this.searchType = this.activatedRoute.snapshot.queryParams.searchType;
this.showType = this.activatedRoute.snapshot.queryParams.showType;
console.log(this.showType)
this.brokerInfoQuery();
}
......@@ -30,10 +33,10 @@ export class SalesDetailComponent implements OnInit {
this.myService.brokerInfoQuery({ practitionerId: practitionerId }).subscribe((res) => {
if (res['success']) {
this.allPerformanceInfo = res['data']['commissionInfo'];
if (this.salesDetailType === 'month') {
if (this.searchType === 'month') {
this.salesDetailList = this.allPerformanceInfo['thisMonthInfo']['fortuneItemList'];
}
if (this.salesDetailType === 'year') {
if (this.searchType === 'year') {
this.salesDetailList = this.allPerformanceInfo['thisYearInfo']['fortuneItemList'];
}
}
......@@ -42,7 +45,7 @@ export class SalesDetailComponent implements OnInit {
selectRang(e) {
this.salesDetailType = e;
this.searchType = e;
this.brokerInfoQuery()
}
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -6,6 +6,146 @@
"description": "",
"glyphs": [
{
"icon_id": "12239969",
"name": "线索",
"font_class": "xiansuo1",
"unicode": "e66b",
"unicode_decimal": 58987
},
{
"icon_id": "7927930",
"name": "移动互联网",
"font_class": "yidonghulianwang2",
"unicode": "e700",
"unicode_decimal": 59136
},
{
"icon_id": "3584630",
"name": "字典",
"font_class": "zidian",
"unicode": "e669",
"unicode_decimal": 58985
},
{
"icon_id": "12084324",
"name": "字典",
"font_class": "zidian1",
"unicode": "e66a",
"unicode_decimal": 58986
},
{
"icon_id": "10795268",
"name": "资料库",
"font_class": "ziliaoku",
"unicode": "e667",
"unicode_decimal": 58983
},
{
"icon_id": "10796984",
"name": "资料库",
"font_class": "ziliaoku1",
"unicode": "e668",
"unicode_decimal": 58984
},
{
"icon_id": "9345059",
"name": "海报",
"font_class": "haibao-1",
"unicode": "e665",
"unicode_decimal": 58981
},
{
"icon_id": "12513277",
"name": "海报",
"font_class": "haibao",
"unicode": "e666",
"unicode_decimal": 58982
},
{
"icon_id": "11864398",
"name": "诊所中心",
"font_class": "zhensuozhongxin",
"unicode": "e663",
"unicode_decimal": 58979
},
{
"icon_id": "508266",
"name": "小诊所",
"font_class": "xiaozhensuo",
"unicode": "e64c",
"unicode_decimal": 58956
},
{
"icon_id": "1288111",
"name": "移动互联网",
"font_class": "yidonghulianwang",
"unicode": "e6c6",
"unicode_decimal": 59078
},
{
"icon_id": "3563994",
"name": "执业证号",
"font_class": "zhiyezhenghao",
"unicode": "e73a",
"unicode_decimal": 59194
},
{
"icon_id": "4293900",
"name": "线索",
"font_class": "xiansuo",
"unicode": "e64e",
"unicode_decimal": 58958
},
{
"icon_id": "6134151",
"name": "职业",
"font_class": "zhiye",
"unicode": "e64f",
"unicode_decimal": 58959
},
{
"icon_id": "9855968",
"name": "AI",
"font_class": "AI",
"unicode": "e677",
"unicode_decimal": 58999
},
{
"icon_id": "11170142",
"name": "保单样本",
"font_class": "baodanyangben",
"unicode": "e650",
"unicode_decimal": 58960
},
{
"icon_id": "11772167",
"name": "分享文章",
"font_class": "fenxiangwenzhang",
"unicode": "e651",
"unicode_decimal": 58961
},
{
"icon_id": "11776596",
"name": "找资料",
"font_class": "zhaoziliao",
"unicode": "e652",
"unicode_decimal": 58962
},
{
"icon_id": "13547739",
"name": "海报组件",
"font_class": "haibaozujian",
"unicode": "e661",
"unicode_decimal": 58977
},
{
"icon_id": "6691793",
"name": "加号",
"font_class": "jiahao",
"unicode": "e64b",
"unicode_decimal": 58955
},
{
"icon_id": "2560648",
"name": "商机",
"font_class": "shangji",
......
......@@ -22,6 +22,28 @@
<body>
<app-root></app-root>
<!-- <div class="loading-box" id="loading">
<div class="mark"></div>
<img width="20" height="20" src="assets/images/loading.gif">
</div> -->
<div class="loadingBox" id="loading"
style="display: flex;justify-content: center;align-items: center;position: fixed;left:38%;top:40%;width:100%;height: 100%;">
<img src="assets/images/loading.gif" alt="loading" class="img-responsive" style="width: 68px;height: 68px;">
</div>
<script type="text/javascript">
const initialize = function () {
let loading = document.getElementById("loading");
loading.style.display = 'block';
document.onreadystatechange = function () {
if (document.readyState == "complete") {
loading.style.display = 'none';
}
}
}
initialize();
</script>
<script src="./assets/js/jquery.min.js"></script>
<script src="./assets/js/qrcode.js"></script>
<!--<script src="https://res.wx.qq.com/open/js/jweixin-1.4.0.js"></script>-->
......
......@@ -75,3 +75,27 @@ input::placeholder {
font-weight: normal;
}
.borderBottom:after, .borderTop:after {
position: absolute;
left: 0;
bottom: 0;
content: "";
width: 100%;
height: 1px;
-webkit-transform: scaleY(.5);
transform: scaleY(.5);
background-color: #dcdcdc;
}
@keyframes slowUp {
0% {
-webkit-transform: translateY(100%);
transform: translateY(100%)
}
100% {
-webkit-transform: translateY(0);
transform: translateY(0)
}
}
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