Merge branch 'master' of http://139.224.139.2:9091/Sweet/ydLife into master

src/app/my/approval-comments/approval-comments.component.ts

@@ -53,7 +53,7 @@ export class ApprovalCommentsComponent implements OnInit {
     }
     }
     this.myService.hiringApprove(param).subscribe((res)=>{
     this.myService.hiringApprove(param).subscribe((res)=>{
       if(res['success']){
       if(res['success']){
-        this.openPopInfo('保存成功！');
+        this.openPopInfo('你的审批成功！');
         sessionStorage.setItem('viewApprovalInfo','1')
         sessionStorage.setItem('viewApprovalInfo','1')
       }else{
       }else{
         this.openPopInfo(res['message']);
         this.openPopInfo(res['message']);
@@ -78,6 +78,6 @@ export class ApprovalCommentsComponent implements OnInit {
     }else{
     }else{
       this.router.navigate(['/approval_list']);
       this.router.navigate(['/approval_list']);
     }
     }
-   
+
   }
   }
 }
 }

src/app/my/article-detail/article-detail.component.ts

@@ -35,18 +35,18 @@ export class ArticleDetailComponent implements OnInit, OnDestroy {
 
 
   ngOnInit() {
   ngOnInit() {
     this.articleId = this.activatedRoute.snapshot.params['id'];
     this.articleId = this.activatedRoute.snapshot.params['id'];
-    this.shareCode = this.activatedRoute.snapshot.queryParams['shareCode'];
-    this.state = this.lifeCommonService.getQueryString('state')
-    // if (this.activatedRoute.snapshot.queryParams['shareCode'] && this.state) {
-    //   this.practitionerFileSharingList(null, this.shareCode);
-    // } else if(this.activatedRoute.snapshot.queryParams['shareCode']){
-    //     this.articleTrackSave();
-    // }else{this.practitionerFileSharingList(this.articleId, null);
-    // }
-
-    if (this.activatedRoute.snapshot.queryParams['shareCode']) {
+    this.shareCode = this.lifeCommonService.getQueryString('shareCode');
+    this.state = this.lifeCommonService.getQueryString('state');
+    //检测浏览器刷新
+    window.onbeforeunload = () =>{
+      //清除sessionStorage值
+      sessionStorage.removeItem('articleTrackId')
+    }
+    if (this.shareCode) {
       this.practitionerFileSharingList(null, this.shareCode);
       this.practitionerFileSharingList(null, this.shareCode);
-      this.articleTrackSave();
+      if(!this.state){
+        this.articleTrackSave();
+      }
     } else {
     } else {
       this.practitionerFileSharingList(this.articleId, null);
       this.practitionerFileSharingList(this.articleId, null);
     }
     }
@@ -67,8 +67,10 @@ export class ArticleDetailComponent implements OnInit, OnDestroy {
   }
   }
 
 
   ngOnDestroy() {
   ngOnDestroy() {
-    this.articleTrackSave();
-    sessionStorage.removeItem('articleTrackId');
+    if(this.shareCode && this.state == '1'){
+      this.articleTrackSave();
+      sessionStorage.removeItem('articleTrackId');
+    }
   }
   }
 
 
   // 从后台获取到获取微信code的URL
   // 从后台获取到获取微信code的URL

src/app/my/my.service.ts

@@ -611,9 +611,8 @@ export class MyService {
    * 获取微信用户的详细信息
    * 获取微信用户的详细信息
    */
    */
     getWxUserInfo(trackId) {
     getWxUserInfo(trackId) {
-      const url = this.API + '/getWxUserInfo';
-      const cs = {trackId:trackId};
-      return this.http.post(url, cs).pipe((res)=>{
+      const url = this.API + '/getSnsApiUserInfo?trackId=' + trackId;
+      return this.http.get(url).pipe((res)=>{
         return res;
         return res;
       });
       });
     }
     }