新增经济合同查询接口

src/app/my/application-process/personal-statement/personal-statement.component.html

@@ -52,7 +52,9 @@
 <div class="toastWrapper toast" *ngIf="isShow">
 
 </div>
-<div id="toastContent" *ngIf="isShow" #contract (scroll)="onScroll($event)">
+<!-- <div id="toastContent" *ngIf="isShow" #contract (scroll)="onScroll($event)"> -->
+<div id="toastContent" *ngIf="isShow" #contract >
+
   <div class="title">
     {{curTitle}}
   </div>

src/app/my/application-process/personal-statement/personal-statement.component.scss

@@ -95,7 +95,7 @@
     position: fixed;
     bottom: 0;
     width: 100%;
-    height: 70%;
+    height: 75%;
     left: 0;
     right: 0;
     margin: 0 auto;

src/app/my/application-process/personal-statement/personal-statement.component.ts

@@ -33,6 +33,7 @@ export class PersonalStatementComponent implements OnInit {
   approvalIdentity:any;
   approveStatus:any;
   agreeBtnShow:boolean = false;
+  timeCount:number = 5;
   constructor(private myService: MyService, 
     private activatedRoute: ActivatedRoute,
     public lifeCommonService: LifeCommonService,
@@ -175,6 +176,14 @@ export class PersonalStatementComponent implements OnInit {
         contractItem.confirmStatus = 0;
       }else{
         this.isShow = true;
+        setTimeout(() => {
+          let scrollTop = this.toastContent.nativeElement.scrollTop;
+          if(scrollTop==0){
+            setTimeout(() => {
+              this.agreeBtnShow = true;
+            }, 5000);
+          }
+        }, 500);
         this.curContract = contractItem.termNote;
         this.curTitle = contractItem.termName;
         this.curContractId = contractItem.id;
@@ -260,16 +269,16 @@ export class PersonalStatementComponent implements OnInit {
     })
   }
 
-  onScroll(event){
-    let scrollTop = this.toastContent.nativeElement.scrollTop;
-    let clientHeight = this.toastContent.nativeElement.clientHeight;
-    let scrollHeight = this.toastContent.nativeElement.scrollHeight ;
-    if(scrollHeight > clientHeight && scrollTop + clientHeight === scrollHeight) {
-     setTimeout(() => {
-      this.agreeBtnShow = true;
-     }, 10000);
-    }
-  }
+  // onScroll(event){
+  //   let scrollTop = this.toastContent.nativeElement.scrollTop;
+  //   let clientHeight = this.toastContent.nativeElement.clientHeight;
+  //   let scrollHeight = this.toastContent.nativeElement.scrollHeight ;
+  //   if(scrollHeight > clientHeight && scrollTop + clientHeight === scrollHeight) {
+  //    setTimeout(() => {
+  //     this.agreeBtnShow = true;
+  //    }, 5000);
+  //   }
+  // }
 
   viewNext(){
     if(this.type == 'personal_statement'){
@@ -283,4 +292,19 @@ export class PersonalStatementComponent implements OnInit {
   goBack(){
     history.go(-1)
   }
+
+  startCount(){
+    // if(!this.timer){
+    //     this.count = TIME_COUNT;
+    //     this.timer = setInterval(()=>{
+    //         if(this.count > 0 && this.count <= TIME_COUNT){
+    //             this.count--;
+    //         }else{
+    //             clearInterval(this.timer);
+    //             this.timer = null;
+    //         }
+    //     },1000)
+    // }
+  }
+
 }

src/app/my/my-application/my-application.component.html

@@ -8,6 +8,17 @@
     </li>
   </ul>
   <div style="padding: 10px 0px 0px 0px;">
+    <div class="contentList" *ngIf="selectedId==0">
+      <ul>
+        <li>
+          <a href="{{practitionerInfo?.contractOssPath}}" download="{{practitionerInfo?.contractOssPath}}" target="_blank">
+            <div><i class="iconfont icon-pdf"></i></div>
+            <div title="{{practitionerInfo?.name}}">{{practitionerInfo?.name}}的经纪合同</div>
+            <div style="position: absolute;right: 5px;top: 6px;"><i class="iconfont icon-xiazai"></i></div>
+          </a>
+        </li>
+      </ul>
+    </div>
     <ydlife-thanks *ngIf="selectedId==1" [isShowClose]="isShowClose"></ydlife-thanks> 
     <div class="contentList" *ngIf="selectedId==2">
       <ul>

src/app/my/my-application/my-application.component.ts

@@ -8,21 +8,28 @@ import { MyService } from "../my.service";
 })
 export class MyApplicationComponent implements OnInit {
   titleList:Array<any>;
-  selectedId:number = 1;
+  selectedId:number = 0;
   isShowClose:boolean = false;
   fileUploadItemList: Array<any>;
+  practitionerId:number;
+  practitionerInfo:any;
   constructor(private myService: MyService) { }
 
   ngOnInit() {
+    this.practitionerId =JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId'];
     this.titleList = [
       { id: 0, name: '经纪合同' },
       { id: 1, name: '欢迎信' },
       { id: 2, name: '公司制度' }
     ]
+    this.queryPractitionerInfo();
   }
 
   selectTab(id) {
     this.selectedId = id;
+    if(this.selectedId == 0){
+      this.queryPractitionerInfo();
+    }
     if(this.selectedId==2){
       this.fileUpload(3, 0, 19, 'yd_download_file_type', 81);
 
@@ -37,4 +44,13 @@ export class MyApplicationComponent implements OnInit {
       }
     });
   }
+
+  //获取经纪合同
+  queryPractitionerInfo(){
+    this.myService.queryPractitionerInfo({practitionerId:this.practitionerId}).subscribe((res)=>{
+      if(res['success']){
+        this.practitionerInfo = res['data']['practitioner'];
+      }
+    })
+  }
 }

src/app/my/my.service.ts

@@ -545,8 +545,15 @@ export class MyService {
    */
 
   customerComment(comment) {
-      const url = this.API + '/customerComment';
+    const url = this.API + '/customerComment';
     return this.http
       .post(url, JSON.stringify(comment));
   }
+
+  queryPractitionerInfo(param){
+    const url = this.ydapi + '/practitionerHiring/queryPractitionerInfo';
+    return this.http
+      .post(url, JSON.stringify(param));
+  }
+
 }

src/app/my/recruiting/recruiting.component.scss

@@ -5,12 +5,11 @@
     // background:#f7f7f2;
     background: #fff;
     .tab {
-        display: flex;
-        list-style: none;
-        margin: 10px 0px;
-        padding-left: 1%;
+      display: flex;
+      list-style: none;
+      margin: 10px 0px;
+      justify-content: space-around;
         li {
-          margin-right: 10px;
           line-height: 30px;
           height: 30px;
           width: 25%;

src/index.html

@@ -96,7 +96,7 @@
         if (document.readyState == "complete") {
           setTimeout(() => {
             loading.style.display = 'none';
-          }, 4000)
+          }, 3000)
 
         }
       }