问卷分享bug修复

questionnaire/src/app/live/live.component.css

@@ -16,7 +16,7 @@
 
 .loginInBox .closeBtn {
   position: relative;
-  top: 25%;
+  top: 33%;
   width: 40px;
   font-size: 32px;
   color: #fff;
@@ -33,7 +33,7 @@
   width: 90%;
   margin: 0 auto;
   position: relative;
-  top: 18%;
+  top: 30%;
   background: #fff;
   padding: 20px 10px;
 }

questionnaire/src/app/live/live.component.html

@@ -43,7 +43,8 @@
   <div class='inputBox'>
     <!--获取手机号 -->
     <div class="mobileNoSection inputControl">
-      <input type='tel' maxlength="11" name="mobileNo" placeholder="您的手机号" [(ngModel)]="loginData.mobileNo" (blur)="scrollTo()" />
+      <input type='tel' maxlength="11" name="mobileNo" placeholder="您的手机号" [(ngModel)]="loginData.mobileNo"
+        (blur)="scrollTo()" />
       <div class='autoGet'>
         <button class='getPhoneNumber' (click)="sendCode()" [disabled]="sendBtnFlag">
           {{timeHtml}}
@@ -52,7 +53,8 @@
     </div>
     <!--获取验证码 -->
     <div class="codeSection inputControl">
-      <input type='tel' maxlength="4" name="code" placeholder="短信验证码" [(ngModel)]="loginData.code" (blur)="scrollTo()" />
+      <input type='tel' maxlength="4" name="code" placeholder="短信验证码" [(ngModel)]="loginData.code"
+        (blur)="scrollTo()" />
     </div>
     <!--姓名-->
     <div class="inputControl">
@@ -70,8 +72,10 @@
 <!--无法自动评测提示窗口START-->
 <div class="autoEvaluationContainer" *ngIf="autoEvaluationModal">
   <div class="autoEvaluationContent">
-    <p>抱歉，您的情况无法进行自动评测和方案制定，我们的客服会联系您进行人工评测和制定方案。</p>
+    <!-- <p>抱歉，您的情况无法进行自动评测和方案制定，我们的客服会联系您进行人工评测和制定方案。</p> -->
+    <p>抱歉，您提交的健康状况有部分异常，系统无法帮您自动生成保险方案。</p>
+    <p> 我们的保险顾问会主动联系您定制方案，谢谢！</p>
     <div><button (click)="confirm()">确认</button></div>
   </div>
 </div>
-<!--无法自动评测提示窗口END-->
+<!--无法自动评测提示窗口END-->
\ No newline at end of file

questionnaire/src/app/live/live.component.ts

-import {Component, OnInit} from '@angular/core';
-import {CommonService} from '../common.service'
-import {ActivatedRoute, Router} from "@angular/router";
-import {environment} from "../../environments/environment";
+import { Component, OnInit } from '@angular/core';
+import { CommonService } from '../common.service'
+import { ActivatedRoute, Router } from "@angular/router";
+import { environment } from "../../environments/environment";
 
-declare let returnCitySN: any;
+// declare let returnCitySN: any;
+let returnCitySN: any = {
+  cip: '',
+  cname: ''
+};
 
 @Component({
   selector: 'app-live',
@@ -44,15 +48,15 @@ export class LiveComponent implements OnInit {
   childrenDisease: boolean = false;
 
   constructor(private commonService: CommonService,
-              private router: Router,
-              private route: ActivatedRoute) {
+    private router: Router,
+    private route: ActivatedRoute) {
     this.type = this.route.snapshot.queryParams['type'];
     this.pageAnswers = {
       pageId: '',
       questions: [{
         questionId: '',
         questionName: '',
-        options: [{optionId: '', optionName: '', optionOrder: '', selected: ''}]
+        options: [{ optionId: '', optionName: '', optionOrder: '', selected: '' }]
       }],
     };
     this.loginData = {
@@ -68,7 +72,7 @@ export class LiveComponent implements OnInit {
     this.tipsFlag = false;
     this.lastQuestions = this.commonService.todosCopy.filter(item => item.pageId == 16).pop();
     // 获取省份
-    this.commonService.provinceqry({insurerId: 11}).then(res => {
+    this.commonService.provinceqry({ insurerId: 11 }).then(res => {
       if (res['success']) {
         this.provinceList = res['data'].provinceList;
       }
@@ -221,6 +225,7 @@ export class LiveComponent implements OnInit {
           return;
         }
       }
+
       this.commonService.saveCustomerAnwers(param).then(res => {
         if (res['success']) {
           if (!sessionStorage.getItem('campaignInfo')) {
@@ -245,7 +250,6 @@ export class LiveComponent implements OnInit {
                   // 跳转到方案详情页面
                   window.location.href = `${environment.hostName}/customizedPlanList/3?orderId=${sessionStorage.getItem('orderId')}&customerId=${sessionStorage.getItem('customerId')}&leftTimes=1`;
                 }
-
               }
             }
           }
@@ -278,7 +282,7 @@ export class LiveComponent implements OnInit {
       this.errorModal('手机号码输入有误');
       return;
     } else if (this.loginData.mobileNo) {
-      this.commonService.verificationCode({mobileNo: this.loginData.mobileNo, type: '1'}).then(res => {
+      this.commonService.verificationCode({ mobileNo: this.loginData.mobileNo, type: '1' }).then(res => {
         if (res['success']) {
           this.sendBtnFlag = true;
           this.errorModal('发送成功');
@@ -332,7 +336,7 @@ export class LiveComponent implements OnInit {
     }).then(res => {
       if (res['success']) {
         // 登录
-        this.commonService.login({'mobileNo': this.loginData.mobileNo}).then(response => {
+        this.commonService.login({ 'mobileNo': this.loginData.mobileNo }).then(response => {
           if (response['success']) {
             const double12_customerInfo = {
               customerId: response['data']['customerId'],
@@ -450,7 +454,7 @@ export class LiveComponent implements OnInit {
     }, 1000)
   }
 
-//  解决IOSinput框被顶上去的bug
+  //  解决IOSinput框被顶上去的bug
   scrollTo() {
     window.scrollTo(0, 0);
   }

questionnaire/src/app/transit/transit.component.html

 <div class="limbo">
   <img *ngIf="advFlag" src="assets/images/first.jpg">
+
   <div *ngIf="!advFlag">
     <div class="title" *ngIf="!picFlag">
       <img src="assets/images/bg_1.png" />

questionnaire/src/app/transit/transit.component.ts

 import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
 import { CommonService } from "../common.service";
-import { ActivatedRoute } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
 import { environment } from "../../environments/environment";
-import set = Reflect.set;
+import { Location } from '@angular/common';
+
 declare const wx: any;
 @Component({
   selector: 'app-transit',
@@ -17,11 +18,14 @@ export class TransitComponent implements OnInit {
   deviceType: number;
   dialogTips: string;
   advFlag: boolean = true;
-  constructor(private commonService: CommonService, private activatedRoute: ActivatedRoute, private changeDetectorRef: ChangeDetectorRef) {
+  constructor(private location: Location, private router: Router, private commonService: CommonService, private activatedRoute: ActivatedRoute, private changeDetectorRef: ChangeDetectorRef) {
   }
 
   ngOnInit() {
     this.customerId = this.activatedRoute.snapshot.queryParams['customerId'];
+    if (this.customerId) {
+      this.router.navigateByUrl(`/index?campaign=AIRobot&task=AItask1`)
+    }
     this.commonService.surveyInfo().then();
     const activityCode = this.commonService.getQueryString('activityCode');
     if (activityCode == 'mmh') {
@@ -36,9 +40,10 @@ export class TransitComponent implements OnInit {
     }
     setTimeout(() => {
       this.advFlag = false;
-    }, 1000)
+    }, 3000)
+    console.log(this.activatedRoute);
+    console.log(this.location)
   }
-
   //  分享给朋友
   wxShare() {
     this.wxShareFlag = true;
@@ -96,7 +101,6 @@ export class TransitComponent implements OnInit {
           wx.onMenuShareQZone(shareData);    // 分享到QQ空间
         });
       });
-
     } else {
       this.defaultWxShare();
     }