Skip to content

Y
ydLife
Commit 69da4840 by sunchao
Options

教育培训分类

parent 6cccedfb
Showing with 215 additions and 68 deletions
package.json
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"version": "0.0.0", "version": "0.0.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve --host 192.168.68.106", "start": "ng serve --host 192.168.68.102",
"build": "ng build -c=dev --prod", "build": "ng build -c=dev --prod",
"test": "ng test", "test": "ng test",
"lint": "ng lint", "lint": "ng lint",
......
src/app/auth/login/login.component.html
<div class="page form_vcode js_show"> <div class="page form_vcode js_show">
<div class="weui-form"> <div class="weui-form">
<div class="weui-form__text-area"> <div class="weui-form__text-area">
<img src="https://www.ydinsurance.cn/wp-content/uploads/2018/08/ydinsurance_logo.jpg" alt=""> <img style="width: 100%;" src="assets/images/ydinsurance_logo.png" >
</div> </div>
<div class="weui-form__control-area"> <div class="weui-form__control-area">
<div class="weui-cells__group weui-cells__group_form"> <div class="weui-cells__group weui-cells__group_form">
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</div> </div>
<div class="weui-form__opr-area"> <div class="weui-form__opr-area">
<a class="weui-btn weui-btn_primary login" href="javascript:" id="showTooltips" style="width:100%" <a class="weui-btn weui-btn_primary login" href="javascript:" id="showTooltips" style="width:100%"
(click)="login()">登陆</a> (click)="login()">登录</a>
</div> </div>
</div> </div>
</div> </div>
......
src/app/my/file-upload/file-upload.component.html
<div class="fileUploadLists"> <div class="fileUploadLists">
<ul class="left">
<li *ngFor="let categoryItem of categoryList"
(click)="switchCategory(categoryItem.dropOptionOrder)"
[ngClass]="{'actived':selectedCategoryId===categoryItem.dropOptionOrder}">
{{categoryItem.dropOptionName}}
</li>
</ul>
<div class="contentList">
<ul> <ul>
<li *ngFor="let fileUploadItem of fileUploadItemList"> <li *ngFor="let fileUploadItem of fileUploadItemList">
<a href="{{fileUploadItem.filePath}}" download="{{fileUploadItem.itemName}}" target="_blank"> <a href="{{fileUploadItem.filePath}}" download="{{fileUploadItem.itemName}}" target="_blank">
<div><i class="iconfont icon-pdf"></i></div> <div><i class="iconfont icon-pdf"></i></div>
<div title="{{fileUploadItem.itemName}}">{{fileUploadItem.itemName}}</div> <div title="{{fileUploadItem.itemName}}">{{fileUploadItem.itemName}}</div>
</a> </a>
<div><i class="iconfont icon-xiazai"></i></div> <!-- <div><i class="iconfont icon-xiazai"></i></div> -->
</li> </li>
</ul> </ul>
</div>
</div> </div>
src/app/my/file-upload/file-upload.component.scss
.fileUploadLists { .fileUploadLists {
padding: 15px; display: -webkit-box;
display: -ms-flexbox;
display: flex;
height: 100%;
ul { ul {
list-style: none; list-style: none;
li {
margin-bottom: 15px; }
display: flex; .left{
justify-content: space-between; width: 100px;
align-items: center; height: 100%;
overflow-x: hidden;
overflow-y: scroll;
-webkit-overflow-scrolling: touch;
background: #f3f4f5;
li{
position: relative;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
height: 43px;
line-height: 43px;
text-align: center;
}
li.actived{
background-color: #fff;
}
li:before {
content: "";
display: block;
position: absolute;
left: 22px;
top: 42px;
width: 60%;
height: 1px;
background: hsla(0,0%,86%,.4);
}
li.actived:after {
content: "";
position: absolute;
left: 0;
top: 0;
width: 6px;
height: 100%;
font-size: 0;
background-color: #ec2d37;
}
}
.contentList{
background-color: #fff;
-webkit-box-flex: 1;
-ms-flex: 1;
flex: 1;
height: 100%;
overflow-x: hidden;
overflow-y: scroll;
-webkit-overflow-scrolling: touch;
ul li{
border-bottom: 1px solid #dcdcdc;
padding: 4px 20px;
.icon-xiazai { .icon-xiazai {
font-size: 22px; font-size: 22px;
color: #ec2d37; color: #ec2d37;
...@@ -23,5 +75,8 @@ ...@@ -23,5 +75,8 @@
} }
} }
} }
ul li:last-child {
border: none;
}
} }
} }
src/app/my/file-upload/file-upload.component.ts
...@@ -12,7 +12,8 @@ export class FileUploadComponent implements OnInit { ...@@ -12,7 +12,8 @@ export class FileUploadComponent implements OnInit {
fileUploadItemList: Array<any>; fileUploadItemList: Array<any>;
// 判断是文件下载还是教育培训 // 判断是文件下载还是教育培训
type: string; type: string;
categoryList:Array<any>;
selectedCategoryId:number;
constructor(private myService: MyService, private activatedRoute: ActivatedRoute) { constructor(private myService: MyService, private activatedRoute: ActivatedRoute) {
} }
...@@ -21,9 +22,11 @@ export class FileUploadComponent implements OnInit { ...@@ -21,9 +22,11 @@ export class FileUploadComponent implements OnInit {
if (this.type === 'fileUpload') { if (this.type === 'fileUpload') {
this.fileUpload(3, 0, 19); this.fileUpload(3, 0, 19);
} else if (this.type === 'training') { } else if (this.type === 'training') {
this.fileUpload(3, 0, 23); this.fileUpload(3, this.selectedCategoryId, 23);
} }
this.dropOptionsQuery();
//初始化选产品
this.switchCategory(1);
} }
// 文件下载 // 文件下载
...@@ -31,8 +34,28 @@ export class FileUploadComponent implements OnInit { ...@@ -31,8 +34,28 @@ export class FileUploadComponent implements OnInit {
this.myService.filePath(itemType, itemId, fileCategory).subscribe(res => { this.myService.filePath(itemType, itemId, fileCategory).subscribe(res => {
if (res['success']) { if (res['success']) {
this.fileUploadItemList = res['data']['fileUploadItemList']; this.fileUploadItemList = res['data']['fileUploadItemList'];
console.log(this.fileUploadItemList )
} }
}); });
} }
//培训资料分类
dropOptionsQuery() {
const code = this.type === 'fileUpload'?'':'yd_trainning_file_type'
this.myService.dropOptionsQuery({ code: code }).subscribe(res => {
if (res['success']) {
this.categoryList = res['data']['dropMasterInfoList'][0]['dropOptionsInfoList'];
if (this.categoryList.length > 0) {
this.selectedCategoryId = this.categoryList[0].dropOptionOrder;
}
}else{
this.categoryList = [];
}
})
}
switchCategory(e){
this.selectedCategoryId = e;
this.fileUpload(3, this.selectedCategoryId, 23)
}
} }
src/app/my/my-center-home/my-center-home.component.html
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
<div class="brokerInfo"> <div class="brokerInfo">
<div class="brokerName"> <div class="brokerName">
<div style="letter-spacing: 2px"><span>{{lifeCustomerInfo?.practitionerBasicInfo?.name}}</span></div> <div style="letter-spacing: 2px"><span>{{lifeCustomerInfo?.practitionerBasicInfo?.name}}</span></div>
<div style="color: #fff;font-weight: normal;" (click)="getOut()"> <div style="color: #fff;font-weight: normal;color: #fff;font-weight: normal;position: relative;top: -5px;" (click)="getOut()">
<i class="iconfont icon-tuichu"></i> <i class="iconfont icon-tuichu" style="font-size: 12px;"></i>
<span style="margin-left: 5px;">退出</span> <span style="margin-left: 5px;font-size: 12px;">退出</span>
</div> </div>
<!-- <div class="shareSelfInfoBtn" *ngIf="deviceType=='3'" (click)="shareIdCard()"><span>分享名片</span></div> --> <!-- <div class="shareSelfInfoBtn" *ngIf="deviceType=='3'" (click)="shareIdCard()"><span>分享名片</span></div> -->
</div> </div>
...@@ -28,6 +28,13 @@ ...@@ -28,6 +28,13 @@
</div> </div>
<div class="weui-panel__bd"> <div class="weui-panel__bd">
<div class="performance_wrapper">
<img class="bg" src="assets/images/measurebanner.jpg" >
<div class="content">
<span class="detail">明细<i class="iconfont icon-ar-r"
style="font-size:12px;"></i></span>
<ul class="tab"> <ul class="tab">
<li *ngFor="let item of performanceList" <li *ngFor="let item of performanceList"
(click)="selectRang(item.type)" (click)="selectRang(item.type)"
...@@ -44,33 +51,34 @@ ...@@ -44,33 +51,34 @@
</li> </li>
</ul> </ul>
<div class="performance_wrapper">
<ul class="performance_list title"> <ul class="performance_list title">
<li></li> <li></li>
<li><b>FYP</b></li> <li>FYP</li>
<li><b>FYC</b></li> <li>FYC</li>
<li><b>完成率</b></li> <li>完成率</li>
<li><b>排名</b></li> <li>排名</li>
</ul> </ul>
<ul class="performance_list"> <ul class="performance_list">
<li>线上</li> <li>线上</li>
<li class="mark"> <li class="mark" style="margin-left: 7px;">
￥{{performanceInfo?.onlineInfo['fyp']}} ￥{{performanceInfo?.onlineInfo['fyp'] | number: "1.2-2"}}
</li> </li>
<li class="mark"> <li class="mark">
￥{{performanceInfo?.onlineInfo['fyc']}} ￥{{performanceInfo?.onlineInfo['fyc'] | number: "1.2-2"}}
</li> </li>
</ul> </ul>
<ul class="performance_list"> <ul class="performance_list">
<li>线下</li> <li>线下</li>
</ul> </ul>
</div>
</div> </div>
<div class="performance_wrapper notice"> <div class="performance_wrapper notice">
<div> <div style="position: relative;">
<h3>重要公告</h3><i class="iconfont">&#xe645;</i> <h3 style="font-size: 16px;color: #ff002a;">公告</h3><i class="iconfont" style="color: #ff002a;">&#xe645;</i>
<div [innerHtml]="firstAnnouncement" routerLink="importantAnnouncement"></div> <div [innerHtml]="firstAnnouncement" ></div>
<span style="position:absolute;right:5px;font-size: 14px;color:#408dc9;" routerLink="importantAnnouncement">更多</span>
</div> </div>
</div> </div>
<div class="tool_wrapper"> <div class="tool_wrapper">
...@@ -81,7 +89,7 @@ ...@@ -81,7 +89,7 @@
href="javascript:;" (click)="menuNavigation(menuItemContent)" href="javascript:;" (click)="menuNavigation(menuItemContent)"
> >
<span class="iconfont" [ngClass]="menuItemContent.icon"></span> <span class="iconfont" [ngClass]="menuItemContent.icon"></span>
<div style="font-size: 14px;">{{menuItemContent.subtitle}}</div> <div style="font-size: 12px;">{{menuItemContent.subtitle}}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -129,7 +137,7 @@ ...@@ -129,7 +137,7 @@
</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"> <div class="health_wrapper">
<h3 style="margin: 10px auto;">医疗服务</h3> <h3>医疗服务</h3>
<img style="border-radius: 10px;width: 48%;margin-right: 10px;" src="assets/images/yindunvipmember.jpg" (click)="jumpUrl()"> <img style="border-radius: 10px;width: 48%;margin-right: 10px;" src="assets/images/yindunvipmember.jpg" (click)="jumpUrl()">
<img style="border-radius: 10px;width: 48%;" src="assets/images/yindunvipmember.jpg" (click)="jumpUrl()"> <img style="border-radius: 10px;width: 48%;" src="assets/images/yindunvipmember.jpg" (click)="jumpUrl()">
......
src/app/my/my-center-home/my-center-home.component.scss
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
display: flex; display: flex;
-webkit-box-align: center; -webkit-box-align: center;
align-items: center; align-items: center;
padding: 17px 0 30px 21px; padding: 15px 0 15px 21px;
width: 100%; width: 100%;
color: #fff; color: #fff;
background: linear-gradient(90deg, #494949, #393939); background: linear-gradient(90deg, #494949, #393939);
...@@ -79,21 +79,47 @@ ...@@ -79,21 +79,47 @@
.weui-panel__bd{ .weui-panel__bd{
background: #f6f7f2; background: #f6f7f2;
height: auto; height: auto;
padding: 5px 15px; padding: 0px 8px;
img{ img{
width: 100%; width: 100%;
}
.performance_wrapper{
// background: #fff;
border-radius: 6px;
margin: 5px auto 8px auto;
box-shadow: 0 1px 5px #969696;
position: relative;
.bg{
height: 100%; height: 100%;
position: absolute;
z-index: 1;
-webkit-filter: blur(1px);
filter: blur(3px);
opacity: 0.8;
}
.content{
z-index: 100;
position: relative;
padding: 0px 0px 5px 8px;
ul{
list-style: none;
} }
.tab{ .tab{
display: flex; display: flex;
list-style: none; list-style: none;
margin-bottom: 10px; margin-bottom: 5px;
li { li {
margin-right: 15px; margin-right: 15px;
line-height: 40px; line-height: 38px;
height: 40px; height: 38px;
color: #fff;
h3{ h3{
font-weight: normal; font-weight: normal;
font-size: 16px;
} }
} }
li.selected{ li.selected{
...@@ -101,55 +127,74 @@ ...@@ -101,55 +127,74 @@
font-weight: bold; font-weight: bold;
} }
.line{ .line{
width: 25px; width: 20px;
height: 5px; height: 3px;
display: inline-block; display: inline-block;
position: absolute; position: absolute;
bottom: 0px; bottom: 2px;
background: #ff002a; background: #ff002a;
} }
} }
} }
.performance_wrapper{ .detail{
background: #fff; display: inline-block;
border-radius: 10px; color: #fff;
margin: 15px auto; text-align: center;
box-shadow: 0 1px 5px #969696; cursor: pointer;
padding: 10px 0px; position: absolute;
ul{ right: 0px;
list-style: none; top: 5px;
width: 60px;
height: 25px;
line-height: 25px;
background: rgba(0, 0, 0, 0.7);
border-top-left-radius: 12px;
border-bottom-left-radius: 12px;
font-size:12px;
} }
.performance_list{ .performance_list{
display: flex; display: flex;
font-size: 14px; font-size: 14px;
li{ li{
width: 20%; width: 15%;
text-align: center; text-align: center;
line-height: 25px; line-height: 25px;
// .center{ font-size: 12px;
// height: 100%; color: #fff;
// display: flex;
// justify-content: center;
// align-items: center;
// }
} }
.mark{ .mark{
color: #ff1c2b; color: #fff;
font-weight: bold;
font-size: 14px;
} }
li:nth-child(1){ li:nth-child(1){
width: 15%; width: 12%;
text-align: left;
}
li:nth-child(2),li:nth-child(3){
width: 28%;
text-align: left;
margin-left: 10px;
}
li:nth-child(3){
margin-left: 0px;
} }
} }
} }
}
.notice{ .notice{
background: #fdf2ec; background: #FFF;
padding: 0px 0px 0px 10px; padding: 0px 0px 0px 10px;
margin-top: 10px;
div{ div{
display: flex; display: flex;
align-items: center; align-items: center;
color: #ff002a; color: #737272;
height: 40px;
.iconfont{ .iconfont{
font-size: 36px; font-size: 30px;
} }
} }
...@@ -162,6 +207,8 @@ ...@@ -162,6 +207,8 @@
margin-bottom: 10px; margin-bottom: 10px;
h3{ h3{
font-weight: normal; font-weight: normal;
font-size: 16px;
margin-bottom: 5px;
} }
.tool_content{ .tool_content{
display: flex; display: flex;
...@@ -173,7 +220,7 @@ ...@@ -173,7 +220,7 @@
width: 25%; width: 25%;
.iconfont{ .iconfont{
color: #ff002a; color: #ff002a;
font-size: 32px; font-size: 24px;
} }
} }
} }
...@@ -184,6 +231,7 @@ ...@@ -184,6 +231,7 @@
margin: 10px auto; margin: 10px auto;
h3{ h3{
font-weight: normal; font-weight: normal;
font-size: 16px;
} }
.media { .media {
position: relative; position: relative;
...@@ -260,6 +308,8 @@ ...@@ -260,6 +308,8 @@
.health_wrapper{ .health_wrapper{
h3{ h3{
font-weight: normal; font-weight: normal;
font-size: 16px;
margin: 10px auto;
} }
} }
} }
......
src/app/my/my-center-home/my-center-home.component.ts
...@@ -139,7 +139,7 @@ export class MyCenterHomeComponent implements OnInit { ...@@ -139,7 +139,7 @@ export class MyCenterHomeComponent implements OnInit {
this.myService.announcementQuery(null, null).subscribe(res => { this.myService.announcementQuery(null, null).subscribe(res => {
if (res['success']) { if (res['success']) {
this.announcementLists = res['data']['announcementInfoList']; this.announcementLists = res['data']['announcementInfoList'];
this.firstAnnouncement = this.getStr(this.announcementLists[0]['content'],'28'); this.firstAnnouncement = this.getStr(this.announcementLists[0]['title'],'28');
} }
}); });
} }
...@@ -173,7 +173,7 @@ export class MyCenterHomeComponent implements OnInit { ...@@ -173,7 +173,7 @@ export class MyCenterHomeComponent implements OnInit {
templen++; templen++;
} }
if (len == templen || len== templen+1) { if (len == templen || len== templen+1) {
return str.substring(0, i + 1) + "···"; return str.substring(0, i + 1) ;
} else if (templen > len + 1) { } else if (templen > len + 1) {
return str.substring(0, i); return str.substring(0, i);
} }
...@@ -218,23 +218,16 @@ export class MyCenterHomeComponent implements OnInit { ...@@ -218,23 +218,16 @@ export class MyCenterHomeComponent implements OnInit {
this.setInitDate(); this.setInitDate();
this.ls.setObject('inquiry', this.inquiry); this.ls.setObject('inquiry', this.inquiry);
if (this.productInfo.noPlanProduct === true) { if (this.productInfo.noPlanProduct === true) {
// this.router.navigate(['/life', this.productInfo.productId]);
window.location.href = `https://${window.location.host}/life/${this.productInfo.productId}` window.location.href = `https://${window.location.host}/life/${this.productInfo.productId}`
} else { } else {
if (this.productInfo.productCategoryId === 1 || this.productInfo.productCategoryId === 4) { if (this.productInfo.productCategoryId === 1 || this.productInfo.productCategoryId === 4) {
// this.router.navigate(['/pdetail', this.productInfo.planId]);
window.location.href = `https://${window.location.host}/pdetail/${this.productInfo.planId}` window.location.href = `https://${window.location.host}/pdetail/${this.productInfo.planId}`
} else if (this.productInfo.productCategoryId === 2) { } else if (this.productInfo.productCategoryId === 2) {
// this.router.navigate(['/hProductDetail', this.productInfo.planId], {queryParams: {type: 7}});
window.location.href = `https://${window.location.host}/hProductDetail/${this.productInfo.planId}?type=7` window.location.href = `https://${window.location.host}/hProductDetail/${this.productInfo.planId}?type=7`
} else if (this.productInfo.productCategoryId === 5) { } else if (this.productInfo.productCategoryId === 5) {
// this.router.navigate(['/hProductDetail', this.productInfo.planId], {queryParams: {type: 9}});
window.location.href = `https://${window.location.host}/hProductDetail/${this.productInfo.planId}?type=9` window.location.href = `https://${window.location.host}/hProductDetail/${this.productInfo.planId}?type=9`
} else { } else {
window.location.href = `https://${window.location.host}/life/${this.productInfo.productId}` window.location.href = `https://${window.location.host}/life/${this.productInfo.productId}`
this.router.navigate(['/pdetail', this.productInfo.planId]); this.router.navigate(['/pdetail', this.productInfo.planId]);
} }
} }
......
src/app/my/my.service.ts
...@@ -41,7 +41,7 @@ export class MyService { ...@@ -41,7 +41,7 @@ export class MyService {
//查业绩 //查业绩
brokerInfoQuery(practitionerId) { brokerInfoQuery(practitionerId) {
const url = this.API + '/brokerInfoQuery'; const url = this.API + '/practitioner/practitionerInfoQuery';
return this.http return this.http
.post(url, JSON.stringify(practitionerId)); .post(url, JSON.stringify(practitionerId));
} }
...@@ -52,4 +52,12 @@ export class MyService { ...@@ -52,4 +52,12 @@ export class MyService {
return this.http return this.http
.post(url, JSON.stringify(param)); .post(url, JSON.stringify(param));
} }
//培训资料分类
dropOptionsQuery(param) {
const url = this.API + "/metadata/dropOptionsQuery";
return this.http.post(url, JSON.stringify(param)).pipe(res => {
return res;
});
}
} }
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