Merge branch 'master' into dev

src/app/common/life-common.service.ts

@@ -133,14 +133,19 @@ export class LifeCommonService {
       link: link, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
       link: link, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
       imgUrl: imgUrl, // 分享图标
       imgUrl: imgUrl, // 分享图标
       success: () => {
       success: () => {
-        console.log('试试');
 
 
+      },
+      fail:(res) =>{
+       //alert(res.errMsg); 
       }
       }
     };
     };
     wx.ready(() => {   // 需在用户可能点击分享按钮前就先调用
     wx.ready(() => {   // 需在用户可能点击分享按钮前就先调用
       wx.updateAppMessageShareData(shareData);
       wx.updateAppMessageShareData(shareData);
       wx.updateTimelineShareData(shareData);
       wx.updateTimelineShareData(shareData);
     });
     });
+    wx.error(function(res) {
+      //alert(res.errMsg);
+    });
   }
   }
 
 
   // 根据开始时间设置结束时间,天数应减1，当日~当日是一天
   // 根据开始时间设置结束时间,天数应减1，当日~当日是一天

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

@@ -6,7 +6,7 @@
       <p>您将邀请{{inviteeName}}</p>
       <p>您将邀请{{inviteeName}}</p>
       <p>加入银盾保险经纪</p>
       <p>加入银盾保险经纪</p>
     </div>
     </div>
-    <footer (click)="sandInvitation()">
+    <footer (click)="sandInvitation(1)">
       发出邀请
       发出邀请
     </footer>
     </footer>
   </div>
   </div>

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

@@ -32,18 +32,21 @@ export class InvitationComponent implements OnInit {
     this.invitatorName = this.activatedRoute.snapshot.queryParams.invitatorName?this.activatedRoute.snapshot.queryParams.invitatorName:null;
     this.invitatorName = this.activatedRoute.snapshot.queryParams.invitatorName?this.activatedRoute.snapshot.queryParams.invitatorName:null;
     this.inviteeName = this.activatedRoute.snapshot.queryParams.inviteeName?this.activatedRoute.snapshot.queryParams.inviteeName:null;
     this.inviteeName = this.activatedRoute.snapshot.queryParams.inviteeName?this.activatedRoute.snapshot.queryParams.inviteeName:null;
     this.deviceType = this.lifeCommonService.checkDeviceType();
     this.deviceType = this.lifeCommonService.checkDeviceType();
+    this.sandInvitation(2);
   }
   }
 
 
   //分享邀请
   //分享邀请
-  sandInvitation() {
+  sandInvitation(type) {
     if(this.deviceType == 3){
     if(this.deviceType == 3){
-      const imgUrl = this.lifeCustomerInfo.practitionerBasicInfo.headImagePath ? this.lifeCustomerInfo.practitionerBasicInfo.headImagePath : `${environment.DOMAINNAME}/ydLife/assets/images/icons/meng.png`;
-      this.lifeCommonService.shareStatusPublish(1);
+      const imgUrl = this.lifeCustomerInfo.practitionerBasicInfo.headImagePath ? this.lifeCustomerInfo.practitionerBasicInfo.headImagePath : `${environment.DOMAINNAME}ydLife/assets/images/icons/meng.png`;
       this.lifeCommonService.wxShare(
       this.lifeCommonService.wxShare(
         '银盾保险经纪电子报聘邀请函',
         '银盾保险经纪电子报聘邀请函',
         `${this.lifeCustomerInfo.practitionerBasicInfo.name}邀请您报聘银盾保险经纪。加入靠谱的团队、一起做靠谱的事。`,
         `${this.lifeCustomerInfo.practitionerBasicInfo.name}邀请您报聘银盾保险经纪。加入靠谱的团队、一起做靠谱的事。`,
         `https://${window.location.host}/ydLife/invitees?hiringBasicInfoId=${this.hiringBasicInfoId}&invitatorName=${this.invitatorName}`,
         `https://${window.location.host}/ydLife/invitees?hiringBasicInfoId=${this.hiringBasicInfoId}&invitatorName=${this.invitatorName}`,
         imgUrl);
         imgUrl);
+        if(type==1){
+          this.lifeCommonService.shareStatusPublish(1);
+        }
       }else{
       }else{
         alert('请在微信公众号中发送邀请');
         alert('请在微信公众号中发送邀请');
       }
       }