暂时提交

fc6ff67b · Sweet Zhang · a48001b9 · fc6ff67b · fc6ff67b · fc6ff67b
Commit fc6ff67b authored May 20, 2019 by Sweet Zhang
8 changed files
--- a/questionnaire/src/app/age/age.component.html
+++ b/questionnaire/src/app/age/age.component.html
@@ -12,14 +12,14 @@
      </li>
    </ul>
  </div>
-  <div class="addChild" 
+  <div class="addChild"
-   (click)="addChild()">
+       (click)="addChild()">
    <div class="icon">+</div>
    <div data-toggle="modal">增加孩子年龄</div>
  </div>
  <div class="content_footer">
    <div style="color: #8a8a8a;">&lt;</div>
-   <div [ngStyle]="{ color: nextBtn == false ? '#8a8a8a' : '#ec2d37' }"> 下一步 </div>
+    <div [ngStyle]="{ color: nextBtn == false ? '#8a8a8a' : '#ec2d37' }" (click)="next()"> 下一步</div>
  </div>
  <div class="toastWrapper toast" *ngIf="isShow" (click)="closeToast()">
@@ -30,10 +30,7 @@
    <li
      [ngClass]="{ selected: this.curQuestionSelecte ===  options.optionName}"
      *ngFor="let options of curQues.options"
-      (click)="
+      (click)="selectedAge(curQues,options);">
-        closeToast();
-      "
-    >
      {{ options.optionName }}
    </li>
  </ul>

--- a/questionnaire/src/app/age/age.component.ts
+++ b/questionnaire/src/app/age/age.component.ts
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {CommonService} from '../common.service';
+import {ActivatedRoute, Router} from "@angular/router";
 @Component({
  selector: 'app-age',
@@ -7,34 +8,71 @@ import {CommonService} from '../common.service';
  styleUrls: ['./age.component.css']
 })
 export class AgeComponent implements OnInit {
-  curPageData:Array<any>;
+  // 家庭结构
+  type: any;
+  curPageData: Array<any>;
  isShow: boolean;
-  curQues: Object;
+  curQues: any;
  curQuesIndex: number;
  curQuestionSelecte: string;
-  constructor(private commonService: CommonService) { }
+  pageAnswers: any;
-  ngOnInit() {
+  constructor(private commonService: CommonService, private router: Router, private route: ActivatedRoute) {
-    this.surveyInfo()
+    /**
+     * 1:单身贵族
+     * 2：二人世界
+     * 3：独立带娃
+     * 4：多口之家
+     * @type {any}
+     */
+    this.type = this.route.snapshot.queryParams['type'];
+    console.log(this.type);
+    this.pageAnswers = {
+      pageId: '',
+      questions: [],
+    };
  }
-  surveyInfo() {
+  ngOnInit() {
    this.commonService.surveyInfo().then(res => {
-      if (res['success']) {
+      this.curPageData = res['data']['survey']['pages'].filter(item => item.pageId === 3).pop();
-        this.curPageData = res['data']['survey'].pages['2']
+      this.pageAnswers.pageId = this.curPageData['pageId'];
-        console.log(this.curPageData)
+    });
+  }
+  // 选择年龄
+  selectedAge(curQues, options) {
+    const question = {
+      questionId: curQues.questionId,
+      questionName: curQues.questionName,
+      options: [options]
+    };
+    for (let i = 0; i < this.pageAnswers.questions.length; i++) {
+      if (this.pageAnswers.questions[i].questionId == curQues.questionId) {
+        const index = this.pageAnswers.questions.indexOf(this.pageAnswers.questions[i]);
+        this.pageAnswers.questions.splice(index, 1);
      }
-    })
+    }
+    this.pageAnswers.questions.push(question);
+    this.commonService.addAnswer(this.pageAnswers);
+    console.log(this.commonService.todos)
+    this.closeToast();
  }
  showToast(question, idx) {
-    this.isShow = true
+    this.isShow = true;
-    this.curQues = question
+    this.curQues = question;
-    this.curQuesIndex = idx
+    this.curQuesIndex = idx;
-    this.curQuestionSelecte = question.name
+    this.curQuestionSelecte = question.name;
  }
  closeToast() {
-    this.isShow = false
+    this.isShow = false;
+  }
+//   下一步
+  next() {
+    this.router.navigate(['/job']);
  }
 }
--- a/questionnaire/src/app/app-routing.module.ts
+++ b/questionnaire/src/app/app-routing.module.ts
@@ -16,7 +16,7 @@ import {Transit1Component} from './transit1/transit1.component';
 import {Transit2Component} from './transit2/transit2.component';
 import {Transit3Component} from './transit3/transit3.component';
-import { CommonModule } from '@angular/common'
+import { CommonModule } from '@angular/common';
 const routes: Routes = [
  {

--- a/questionnaire/src/app/common.service.ts
+++ b/questionnaire/src/app/common.service.ts
-import { Injectable } from '@angular/core';
+import {Injectable} from '@angular/core';
 import {environment} from './../environments/environment';
 import {HttpClient, HttpHeaders} from '@angular/common/http';
-// import {LocalStorage} from './local.storage';
+import {Subject} from "rxjs/index";
 @Injectable({
  providedIn: 'root'
 })
 export class CommonService {
+  // Observable string sources
+  private todosSource = new Subject<any>();
+  // Observable string streams
+  todos$ = this.todosSource.asObservable();
+  todos: Array<any> = []; // 任务列表
  private USER_API_URL = '';
  private httpOptions;
-  constructor(private http: HttpClient,
-    // private ls: LocalStorage
+  constructor(private http: HttpClient) {
-    ) { 
+    this.USER_API_URL = environment.apiUrl;
-  this.USER_API_URL = environment.apiUrl;
+    this.httpOptions = {
-  this.httpOptions = {
+      headers: new HttpHeaders({
-    headers: new HttpHeaders({
+        'Content-Type': 'application/json',
-      'Content-Type': 'application/json',
+        'X-Authorization': ''
-      'X-Authorization': ''
+      })
-    })
+    };
-  };
+  }
- }
+  /**
+   * 获取问卷所有问题
+   * @returns {Promise<TResult2|TResult1>}
+   */
  async surveyInfo() {
-  const url = this.USER_API_URL + '/survey/surveyInfo';
+    const url = this.USER_API_URL + '/survey/surveyInfo';
-  const res = await this.obtainToken();
+    const res = await this.obtainToken();
-  this.httpOptions.headers = this.httpOptions.headers.set('X-Authorization', res['data']['token']);
+    this.httpOptions.headers = this.httpOptions.headers.set('X-Authorization', res['data']['token']);
-  return this.http
+    return this.http
-    .post(url, JSON.stringify({}),this.httpOptions).toPromise().then(response => {
+      .post(url, JSON.stringify({}), this.httpOptions).toPromise().then(response => {
-      return response;
+        return response;
-    });
+      });
  }
-  async saveCustomerAnwers(objParam){
+  /**
+   * 保存答案
+   * @param objParam
+   * @returns {Promise<TResult2|TResult1>}
+   */
+  async saveCustomerAnwers(objParam) {
    const url = this.USER_API_URL + '/survey/saveCustomerAnwers';
    const res = await this.obtainToken();
    this.httpOptions.headers = this.httpOptions.headers.set('X-Authorization', res['data']['token']);
    return this.http
-      .post(url, JSON.stringify(objParam),this.httpOptions).toPromise().then(response => {
+      .post(url, JSON.stringify(objParam), this.httpOptions).toPromise().then(response => {
        return response;
      });
  }
@@ -51,26 +65,41 @@ export class CommonService {
    return this.http.post(url, JSON.stringify(ticketObj), this.httpOptions).toPromise();
  }
-  async provinceqry(objParam){
+  /**
+   * 获取省份
+   * @param objParam
+   * @returns {Promise<TResult2|TResult1>}
+   */
+  async provinceqry(objParam) {
    const url = this.USER_API_URL + '/partner/provinceqry';
    const res = await this.obtainToken();
    this.httpOptions.headers = this.httpOptions.headers.set('X-Authorization', res['data']['token']);
-    return this.http.post(url,JSON.stringify(objParam),this.httpOptions).toPromise().then(res => {
+    return this.http.post(url, JSON.stringify(objParam), this.httpOptions).toPromise().then(res => {
-     return res;
+      return res;
-   })
+    })
  }
-  async getCityqry(objParam){
+  /**
+   * 获取城市
+   * @param objParam
+   * @returns {Promise<TResult2|TResult1>}
+   */
+  async getCityqry(objParam) {
    const url = this.USER_API_URL + '/partner/cityqry';
    const res = await this.obtainToken();
    this.httpOptions.headers = this.httpOptions.headers.set('X-Authorization', res['data']['token']);
    return this.http
-    .post(url,JSON.stringify(objParam),this.httpOptions)
+      .post(url, JSON.stringify(objParam), this.httpOptions)
-    .toPromise().then(res => {
+      .toPromise().then(res => {
-      return res;
+        return res;
-    })
+      })
  }
+  /**
+   * 获取URL参数
+   * @param name
+   * @returns {any}
+   */
  getQueryString(name) {
    const after = window.location.hash.split('?')[1];
    if (after) {
@@ -83,4 +112,37 @@ export class CommonService {
      }
    }
  }
+  /**
+   * 添加一个答案
+   */
+  addAnswer(todo) {
+    for (let i = 0; i < this.todos.length; i++) {
+      if (this.todos[i].pageId == todo.pageId) {
+        const index = this.todos.indexOf(this.todos[i]);
+        this.todos.splice(index, 1);
+        break;
+      }
+    }
+    this.todos.push(todo);
+    this.todosSource.next(this.todos);
+    return this;
+  }
+  // 更新一个答案
+  updateTodoById(pageId: number, values: Object = {}) {
+    const todo = this.todos.filter(todo => todo.pageId == pageId).pop();
+    if (!todo) {
+      return null;
+    }
+    Object.assign(todo, values); // 将更新的values对象的属性值赋给todo对象
+    this.todosSource.next(this.todos);
+    return todo;
+  }
+  // 获取所有答案
+  getTodos() {
+    return this.todos;
+  }
 }
--- a/questionnaire/src/app/family/family.component.html
+++ b/questionnaire/src/app/family/family.component.html
 <div class="layout">
  <div class="content">
-    <div class="questionTitle">{{ this.curPageData?.pageName }}</div>
+    <div class="questionTitle">{{ curPageData?.pageName }}</div>
    <ul class="option_item" style="margin-top: 20%;">
-      <li
+      <li *ngFor="let options of curPageData?.questions[0]['options']" (click)="selectedFamily(options)">
-        *ngFor="let options of curPageData?.questions[0]['options']"
+        <img [ngClass]="{ selected: selectedOptionId == options.optionId }"
-      > 
+             src="assets/images/icon{{ options.optionId }}.png"
-        <img
+             alt="{{ options.optionName }}"/>
-          [ngClass]="{ selected: options['selected'] == true }"
-          src="assets/images/icon{{ options.optionId }}.png"
-          alt="{{ options.optionName }}"
-        />
        <span>{{ options.optionName }}</span>
      </li>
    </ul>
@@ -17,5 +13,5 @@
 </div>
 <div class="content_footer">
  <div style="color: #8a8a8a;">&lt;</div>
- <div [ngStyle]="{ color: nextBtn == false ? '#8a8a8a' : '#ec2d37' }"> 下一步 </div>
+  <div [ngStyle]="{ color: nextBtn == false ? '#8a8a8a' : '#ec2d37' }" (click)="next()"> 下一步</div>
 </div>
--- a/questionnaire/src/app/family/family.component.ts
+++ b/questionnaire/src/app/family/family.component.ts
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {CommonService} from '../common.service';
+import {Router} from "@angular/router";
 @Component({
  selector: 'app-family',
  templateUrl: './family.component.html',
  styleUrls: ['./family.component.css']
 })
 export class FamilyComponent implements OnInit {
-  curPageData:Array<any>;
+  curPageData: Array<any>;
-  constructor(private commonService: CommonService) { }
+  pageAnswers: any;
+  selectedOptionId: any;
-  ngOnInit() {
+  constructor(private commonService: CommonService, private router: Router) {
-    this.surveyInfo()
+    this.pageAnswers = {
+      pageId: '',
+      questions: [{
+        questionId: '',
+        questionName: '',
+        options: [{optionId: '', optionName: '', optionOrder: '', selected: ''}]
+      }],
+    };
  }
-  surveyInfo() {
+  ngOnInit() {
    this.commonService.surveyInfo().then(res => {
-      if (res['success']) {
+      this.curPageData = res['data']['survey']['pages'].filter(item => item.pageId === 2).pop();
-        this.curPageData = res['data']['survey'].pages['1']
+      console.log(this.curPageData)
-        console.log(this.curPageData)
+    });
-      }
+  }
-    })
+//  选择家庭结构
+  selectedFamily(option) {
+    this.selectedOptionId = option.optionId;
+    option.selected = true;
+    this.pageAnswers = {
+      pageId: this.curPageData['pageId'],
+      questions: [{
+        questionId: this.curPageData['questions']['0']['questionId'],
+        questionName: this.curPageData['questions']['0']['questionName'],
+        options: [option]
+      }],
+    };
+    this.commonService.addAnswer(this.pageAnswers);
+  }
+//   下一步
+  next() {
+    this.router.navigate(['/age'], {queryParams: {type: this.selectedOptionId}});
  }
 }
--- a/questionnaire/src/app/job/job.component.ts
+++ b/questionnaire/src/app/job/job.component.ts
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {CommonService} from '../common.service';
 @Component({
  selector: 'app-job',
@@ -6,21 +6,21 @@ import {CommonService} from '../common.service';
  styleUrls: ['./job.component.css']
 })
 export class JobComponent implements OnInit {
-  curPageData:Array<any>;
+  curPageData: Array<any>;
-  constructor(
-    private commonService: CommonService
+  constructor(private commonService: CommonService) {
-  ) { }
+  }
  ngOnInit() {
-    this.surveyInfo()
+    // this.surveyInfo();
  }
  surveyInfo() {
    this.commonService.surveyInfo().then(res => {
      if (res['success']) {
-        this.curPageData = res['data']['survey'].pages['3']
+        this.curPageData = res['data'].survey.pages['3'];
-        console.log(this.curPageData)
+        console.log(this.curPageData);
      }
-    })
+    });
  }
 }
--- a/questionnaire/src/app/transit/transit.component.ts
+++ b/questionnaire/src/app/transit/transit.component.ts
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
+import {CommonService} from "../common.service";
 @Component({
  selector: 'app-transit',
@@ -7,9 +8,11 @@ import { Component, OnInit } from '@angular/core';
 })
 export class TransitComponent implements OnInit {
-  constructor() { }
+  constructor(private commonService: CommonService) {
+  }
  ngOnInit() {
+    this.commonService.surveyInfo().then();
  }
 }