Skip to content

Y
ydLife
Commit 0ba21937 by Chao Sun
Options

合并冲突

parents 4a6712d7 87331dda
Showing with 214 additions and 2 deletions
src/app/my/business-card/business-card.component.html 0 → 100644
<div class="businessCardContainer">
<div class="brokerCardPositive">
<div class="qrcodeBox">
<div>
<div style="margin-bottom: 20%;"><img src="assets/images/ydShield.png" alt="银盾保险经纪" class="img-responsive">
</div>
<div><img src="assets/images/ydCompanyName.png" alt="银盾保险经纪" class="img-responsive"></div>
</div>
<div><img src="assets/images/online_chat.jpg" alt="" class="img-responsive"></div>
</div>
<div class="dividingContainer">
<div class="dividingBox"></div>
<div class="dividingLine"></div>
</div>
<div class="brokerInfo">
<div class="brokerBasicInfo">
<div class="brokerName">
<div>{{lifeCustomerInfo.practitionerBasicInfo.name}}</div>
<div>Neo Zheng</div>
</div>
<div class="brokerTitle">
<div>{{lifeCustomerInfo.practitionerBasicInfo.levelName}}</div>
<div>Sales Director</div>
</div>
</div>
<div class="brokerCompanyInfo">
<div style="font-size: 14px">上海银盾保险经纪有限公司</div>
<div style="font-size:10px;font-weight: lighter;">上海市浦东新区张杨路560号中融恒瑞国际西楼1502室</div>
<div style="font-size: 11px">客服专线：400-921-9290</div>
</div>
<div class="brokerContactInfo">
<div>
<i class="iconfont icon-dianhua"></i>
<span>M: {{lifeCustomerInfo.mobileNo}}</span>
</div>
<div>
<i class="iconfont icon-youxiang"></i>
<span>50262253@qq.com</span>
</div>
</div>
</div>
</div>
<div class="brokerCardOpposite">
<img src="assets/images/card_opposite.jpg" alt="" class="img-responsive">
</div>
</div>
src/app/my/business-card/business-card.component.scss 0 → 100644
.businessCardContainer {
display: flex;
flex-direction: column;
.brokerCardPositive {
display: flex;
padding-top: 7%;
padding-left: 5%;
margin-bottom: 10%;
.qrcodeBox {
width: 15%;
display: flex;
flex-direction: column;
justify-content: space-between;
}
.dividingContainer {
padding-top: 45px;
margin-right: 11px;
margin-left: 5%;
.dividingBox {
width: 10px;
height: 10px;
background-color: #ee262e;
}
.dividingLine {
width: 1px;
background-color: #b9b9ba;
height: 100%;
}
}
.brokerInfo {
flex: 1;
.brokerBasicInfo {
display: flex;
align-items: flex-end;
justify-content: space-between;
padding-right: 5%;
margin-bottom: 10%;
color: #231f20;
.brokerName {
div:first-child {
font-size: 24px;
letter-spacing: 5px;
font-weight: bold;
line-height: 1.1;
}
div:last-child {
font-size: 12px;
}
}
.brokerTitle {
div:first-child {
font-size: 13px;
}
div:last-child {
font-size: 12px;
}
}
}
.brokerCompanyInfo {
margin-bottom: 3%;
}
.brokerContactInfo {
line-height: 1.1;
.iconfont {
margin-right: 5px;
color: #ee262e;
}
}
}
}
}
src/app/my/business-card/business-card.component.spec.ts 0 → 100644
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { BusinessCardComponent } from './business-card.component';
describe('BusinessCardComponent', () => {
let component: BusinessCardComponent;
let fixture: ComponentFixture<BusinessCardComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ BusinessCardComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(BusinessCardComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/my/business-card/business-card.component.ts 0 → 100644
import {Component, OnInit} from '@angular/core';
@Component({
selector: 'ydlife-business-card',
templateUrl: './business-card.component.html',
styleUrls: ['./business-card.component.scss']
})
export class BusinessCardComponent implements OnInit {
lifeCustomerInfo: any;
constructor() {
}
ngOnInit() {
this.lifeCustomerInfo = JSON.parse(localStorage.getItem('lifeCustomerInfo'));
}
}
src/app/my/my-routing.module.ts
......@@ -22,6 +22,7 @@ import { MyTargetComponent } from "./my-target/my-target.component";
import { TeamPanelComponent } from './team-panel/team-panel.component';
import { TeamSalesScoreComponent } from './team-sales-score/team-sales-score.component';
import { ScoreDetailsComponent } from './score-details/score-details.component';
import { BusinessCardComponent } from "./business-card/business-card.component";
const myRoutes: Routes = [
{ path: '', component: MyCenterHomeComponent, canActivate: [AuthGuard], data: [{ title: '银盾保险经纪 - 工作台' }] },
......@@ -45,7 +46,8 @@ const myRoutes: Routes = [
{ path: 'target', component: MyTargetComponent, canActivate: [AuthGuard] },
{ path: 'teamPanel', component: TeamPanelComponent, canActivate: [AuthGuard] },
{ path: 'teamPanel/:type', component: TeamSalesScoreComponent, canActivate: [AuthGuard] },
{ path: 'scoreDeatil', component: ScoreDetailsComponent, canActivate: [AuthGuard] }
{ path: 'scoreDeatil', component: ScoreDetailsComponent, canActivate: [AuthGuard] },
{ path: 'businessCard', component: BusinessCardComponent, canActivate: [AuthGuard] },
];
@NgModule({
......
src/app/my/my.module.ts
......@@ -27,9 +27,10 @@ import { TeamPanelComponent } from './team-panel/team-panel.component';
import { SwitchNumberPipe } from '../common/pipe/switch-number.pipe';
import { TeamSalesScoreComponent } from './team-sales-score/team-sales-score.component';
import { ScoreDetailsComponent } from './score-details/score-details.component';
import { BusinessCardComponent } from './business-card/business-card.component';
@NgModule({
declarations: [MyCenterHomeComponent, MkMaterialComponent, MkMaterialDetailComponent, FileUploadComponent, ImportantAnnouncementComponent, SalesDetailComponent, AnnouncementDetailComponent, MyBusinessComponent, MyBusinessDetailComponent, PickerComponent, ToastComponent, SalesRankComponent, TeamRankComponent, RecruitingComponent, RecruitingDetailComponent, ThanksComponent, MySettingComponent, MySettingDetailComponent, MyNewsComponent, MyTargetComponent, TeamPanelComponent, SwitchNumberPipe, TeamSalesScoreComponent, ScoreDetailsComponent],
declarations: [MyCenterHomeComponent, MkMaterialComponent, MkMaterialDetailComponent, FileUploadComponent, ImportantAnnouncementComponent, SalesDetailComponent, AnnouncementDetailComponent, MyBusinessComponent, MyBusinessDetailComponent, PickerComponent, ToastComponent, SalesRankComponent, TeamRankComponent, RecruitingComponent, RecruitingDetailComponent, ThanksComponent, MySettingComponent, MySettingDetailComponent, MyNewsComponent, MyTargetComponent, TeamPanelComponent, SwitchNumberPipe, TeamSalesScoreComponent, ScoreDetailsComponent, BusinessCardComponent],
imports: [
CommonModule,
LifeCommonModule,
......
src/assets/font/demo_index.html
......@@ -31,6 +31,15 @@
<ul class="icon_lists dib-box">
<li class="dib">
<<<<<<< HEAD
<span class="icon iconfont">&#xe679;</span>
<div class="name">邮箱</div>
<div class="code-name">&amp;#xe679;</div>
</li>
<li class="dib">
=======
>>>>>>> 0a037f4689e09d04a3708f6c9a4e437b7a837d03
<span class="icon iconfont">&#xe678;</span>
<div class="name">上引号</div>
<div class="code-name">&amp;#xe678;</div>
......@@ -1053,6 +1062,18 @@
<ul class="icon_lists dib-box">
<li class="dib">
<<<<<<< HEAD
<span class="icon iconfont icon-youxiang"></span>
<div class="name">
邮箱
</div>
<div class="code-name">.icon-youxiang
</div>
</li>
<li class="dib">
=======
>>>>>>> 0a037f4689e09d04a3708f6c9a4e437b7a837d03
<span class="icon iconfont icon-shangyinhao"></span>
<div class="name">
上引号
......@@ -2541,6 +2562,17 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<<<<<<< HEAD
<use xlink:href="#icon-youxiang"></use>
</svg>
<div class="name">邮箱</div>
<div class="code-name">#icon-youxiang</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
=======
>>>>>>> 0a037f4689e09d04a3708f6c9a4e437b7a837d03
<use xlink:href="#icon-shangyinhao"></use>
</svg>
<div class="name">上引号</div>
......
src/assets/font/iconfont.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/font/iconfont.json
......@@ -6,6 +6,16 @@
"description": "",
"glyphs": [
{
<<<<<<< HEAD
"icon_id": "9592761",
"name": "邮箱",
"font_class": "youxiang",
"unicode": "e679",
"unicode_decimal": 59001
},
{
=======
>>>>>>> 0a037f4689e09d04a3708f6c9a4e437b7a837d03
"icon_id": "816614",
"name": "上引号",
"font_class": "shangyinhao",
......
src/assets/font/iconfont.svg
......@@ -20,6 +20,12 @@ Created by iconfont
/>
<missing-glyph />
<<<<<<< HEAD
<glyph glyph-name="youxiang" unicode="&#59001;" d="M983.899806 110.614218V671.113777h0.180631l-0.180631 4.696419c-0.180632 5.238314-0.722526 10.476627-1.806315 15.714941-2.890104 25.469042-21.675781 44.977245-45.519139 47.686717H122.287529c-11.741048 0-23.482096-1.625684-34.861881-5.238314-30.346093-10.295996-50.757453-40.100194-50.576821-74.058917v-534.849885c-0.361263-21.314518 5.780208-42.087141 17.701887-59.789028l0.361263-0.722526 5.418946-3.973893c18.243782-21.856412 44.977245-34.319986 73.517022-34.500618H904.421944c37.751984 0 70.265655 27.094726 79.477862 66.291763l0.180631 0.541894c0.361263 5.96084 0.361263 11.741048-0.180631 17.701888zM390.16405 348.505909l55.453872-49.854295 43.893456-40.100194c5.418945-5.96084 13.005468-9.57347 21.133886-9.57347 7.947786 0 15.534309 3.431999 21.133886 9.57347l101.153642 91.941436 272.753572-263.721997H126.622685L390.16405 348.505909z m120.119951-30.346092L111.449638 679.96472H115.604163c214.409596 0.903158 703.559711 2.890104 793.875463 0.361263l-399.195625-362.166166z m165.458458 69.72376l251.619686 227.956959v-474.518963L675.742459 387.883577z m-328.568707-0.180631L93.205856 135.721997V617.104957l253.967896-229.402011z" horiz-adv-x="1024" />
=======
>>>>>>> 0a037f4689e09d04a3708f6c9a4e437b7a837d03
<glyph glyph-name="shangyinhao" unicode="&#59000;" d="M505.6 691.2c0-12.8-12.8-25.6-44.8-44.8C307.2 531.2 236.8 441.6 236.8 371.2c0-38.4 25.6-70.4 70.4-83.2 70.4-25.6 96-70.4 96-115.2 0-38.4-19.2-134.4-134.4-134.4-89.6 0-204.8 64-204.8 217.6C64 409.6 211.2 576 416 723.2 428.8 736 441.6 736 448 736c12.8 0 25.6-6.4 38.4-19.2C499.2 704 505.6 697.6 505.6 691.2zM960 691.2c0-12.8-12.8-25.6-44.8-44.8-153.6-108.8-224-204.8-224-275.2 0-38.4 25.6-70.4 70.4-83.2 70.4-25.6 96-70.4 96-115.2 0-38.4-19.2-134.4-134.4-134.4-89.6 0-204.8 64-204.8 217.6 0 160 147.2 326.4 352 473.6 12.8 12.8 25.6 12.8 38.4 12.8C928 736 960 704 960 691.2z" horiz-adv-x="1024" />
......
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