Merge branch 'e-notice' into dev

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

 <div class="register_wrapper">
   <img class="logo" src="assets/images/register_logo.png" alt="logo" />
   <div *ngIf="type=='identify'" style="font-size:14px;color:#666;margin-top:32px;letter-spacing:1px;">
-    <p>感谢您选择银盾保险经纪</p>
-    <p>耽搁您一分钟完成客户告知书和委托协议的阅读和签署</p>
+    <p>感谢您的信任和支持</p>
+    <p>耽搁您一分钟</p>
+    <p>完成客户告知书和保险经纪服务委托协议的签署</p>
   </div>
   <div class="weui-form__control-area">
     <div class="weui-cells__group weui-cells__group_form">

src/app/my/e-notice/e-notice.component.html

@@ -71,7 +71,7 @@
       <h4>七、 如果您发现本公司从业人员存在误导行为及其他损害您合法利益的行为，可向本公司投诉，投诉电话400-921-9290。</h4>
       <h4>上海银盾保险经纪有限公司</h4>
       <p>※本人已详细阅读并充分了解上述告知所说明之权利义务，同意委托上海银盾保险经纪公司代为办理保险业务。</p>
-      <p><p>投保人亲签：</p>
-      <p>日 期：</p>
+      <p>投保人亲签：_________________</p>
+      <p>日 期：_________________</p>
       <p>上海银盾保险经纪有限公司</p>
     </div>

src/app/my/e-notice/e-notice.component.scss

+.csNoticeContent{
+  color: #666;
+  letter-spacing: 1px;
+  padding: 0 10px 50px 10px;
+  h3{
+    text-align: center;
+    font-size: 18px;
+    font-weight: bold;
+    margin: 8px 0 15px 0;
+  }
+  p{
+    font-size: 14px;
+    text-indent: 30px;
+  }
+  h4{
+    font-size: 16px;
+    font-weight: bold;
+    margin: 15px 0;
+    line-height: 1.5;
+  }
+}

src/app/my/my-business-detail/my-business-detail.component.html

@@ -265,24 +265,26 @@
       <Modal [(ngModel)]="this.eNoticeState" [transparent]="true"  [closable]="true" (onClose)="onClose()">
         <div [ngStyle]="{ height: 300, overflow: 'scroll' }">
           <div class="am-list" style="margin:0;">
-            <div class="am-list-body">
+            <div class="am-list-item">
               <InputItem [clear]="true"
-                         [value]="editBusiness.name"
-                         [placeholder]="'用于客户登录验证'" (onChange)="editBusiness.name = $event"
-              >姓名</InputItem>
+              [value]="editBusiness.name"
+              (onChange)="editBusiness.name = $event">姓名:</InputItem>
+            </div>
+            <div class="am-list-item">
               <InputItem [type]="'phone'"
-                     [placeholder]="'用于客户登录验证'"
-                     [value]="editBusiness.mobileNo"
-                     (onChange)="editBusiness.mobileNo = $event"
-          >手机号码</InputItem>
-              <div class="am-list-line">该手机号用于客户登录验证</div>
-              <div class="am-list-item am-list-item-middle">
-                <div class="am-list-line">
-                  <div class="am-list-content"
-                       style="width:100%;color:#fff;text-align:center;background-color: #2179AD;border-radius: 20px;margin:18px auto"
-                       (click)="sendENotice()"
-                  >发送</div>
-                </div>
+              [value]="editBusiness.mobileNo"
+              (onChange)="editBusiness.mobileNo = $event">手机号码：</InputItem>
+            </div>
+            <div class="am-list-line" style="color: #999;font-size:12px">
+              <p style="margin-bottom: 5px;">（请确保客户姓名和手机号填写正确</p>
+              <p>将会用于客户签署告知书时的身份验证）</p>
+            </div>
+            <div class="am-list-item am-list-item-middle">
+              <div class="am-list-line">
+                <div class="am-list-content"
+                     style="width:100%;color:#fff;text-align:center;background-color: #2179AD;border-radius: 20px;margin:18px auto"
+                     (click)="sendENotice()"
+                >发送</div>
               </div>
             </div>
           </div>

src/app/my/my-business-detail/my-business-detail.component.scss

@@ -186,8 +186,11 @@
       line-height: 44px;
     }
     .send{
+      position: fixed;
+      bottom: 30px;
+      width: 100%;
       div{
-        margin: 30px 40px 0;
+        margin: 0 40px;
         height: 40px;
         line-height: 40px;
         text-align: center;
@@ -306,4 +309,7 @@
     background-color: rgba(0, 0, 0, .5);
     top: 0;
   }
+  .am-list-item.am-input-item{
+    padding-left: 0;
+  }
 }

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

@@ -613,7 +613,6 @@ export class MyBusinessDetailComponent implements OnInit {
 
   // 发送电子客户告知书,opportunityIdID =  CustomerId
   sendENotice(){
-    event.stopPropagation();
     const param = {
        practitionerId:this.lifeCustomerInfo['practitionerId'],
        leadsAssignedId:this.leadsAssignedId,
@@ -630,7 +629,7 @@ export class MyBusinessDetailComponent implements OnInit {
           this.lifeCommonService.shareStatusPublish(1);
           this.lifeCommonService.wxShare(
             '保险服务委托协议和客户告知书签署',
-            `您的保险服务委托协议和客户告知书已经准备好，请查收并签署，感谢您的信任和支持。`,
+            `您的保险服务委托协议和客户告知书已准备好，请查收并签署，感谢信任和支持。`,
             `https://${window.location.host}/ydLife/identify?eNoticeId=${res['data']['id']}`,
             imgUrl);
           }else{

src/app/my/my-routing.module.ts

@@ -103,8 +103,8 @@ const myRoutes: Routes = [
   { path: 'inviter' ,component:InvitationComponent,canActivate:[AuthGuard],data:[{type:'inviter',title: '邀请函'}]},
   { path: 'invitees' ,component:InvitationComponent,data:[{type:'invitees',title: '邀请函'}]},
   { path: 'register' ,component:RegisterComponent,data: [{ title: '注册信息' }]},
-  { path: 'identify' ,component:RegisterComponent,data: [{ title: '保险经纪服务委托书协议和客户告知书' }]},
-  { path: 'eNoticeSign' ,component:ENoticeSignComponent,data: [{ title: '保险经纪服务委托书协议和客户告知书' }]},
+  { path: 'identify' ,component:RegisterComponent,data: [{ title: '保险经纪服务委托协议和客户告知书' }]},
+  { path: 'eNoticeSign' ,component:ENoticeSignComponent,data: [{ title: '保险经纪服务委托协议和客户告知书' }]},
   { path: 'employee_info',component:EmployeeInfoComponent,data: [{ title: '银盾经纪人报聘' }]},
   { path: 'employee_basic_info',component:EmployeeBasicInfoComponent,data: [{ title: '银盾经纪人报聘' }] },
   { path: 'work_experience',component:WorkExperienceComponent,data: [{ title: '银盾经纪人报聘' }] },
@@ -116,7 +116,7 @@ const myRoutes: Routes = [
   { path: 'personal_statement',component:PersonalStatementComponent,data: [{ type:'personal_statement',title: '银盾经纪人报聘' }] },
   { path: 'contract',component:PersonalStatementComponent,data: [{ type:'contract',title: '银盾经纪人报聘' }] },
   { path: 'signature',component:SignatureComponent,data: [{ title: '银盾经纪人报聘' }]},
-  { path: 'eNoticeSignature',component:SignatureComponent,data: [{ title: '保险经纪服务委托书协议和客户告知书' }]},
+  { path: 'eNoticeSignature',component:SignatureComponent,data: [{ title: '保险经纪服务委托协议和客户告知书' }]},
   { path: 'employee_submit',component:EmployeeSubmitComponent,data: [{ title: '已提交' }]},
   { path: 'eNotice_submit',component:EmployeeSubmitComponent,data: [{ title: '已提交' }]},
   { path: 'member_detail/:practitionerId',component:MemberDetailComponent, canActivate: [AuthGuard]},