Skip to content

A
allCampaign
Commit 1db3a535 by Chao Sun
Options

问卷样式修改

parent e8461930
Showing with 251 additions and 102 deletions
questionnaire/angular.json
...@@ -20,14 +20,20 @@ ...@@ -20,14 +20,20 @@
"tsConfig": "src/tsconfig.app.json", "tsConfig": "src/tsconfig.app.json",
"assets": [ "assets": [
"src/favicon.ico", "src/favicon.ico",
"src/assets" "src/assets",
{
"glob": "**/*",
"input": "./node_modules/@ant-design/icons-angular/src/inline-svg/",
"output": "/assets/"
}
], ],
"styles": [ "styles": [
"src/theme.less",
"./node_modules/bootstrap/dist/css/bootstrap.min.css", "./node_modules/bootstrap/dist/css/bootstrap.min.css",
"./node_modules/ng-zorro-antd/ng-zorro-antd.min.css",
"src/styles.css" "src/styles.css"
], ],
"scripts": [], "scripts": [],
"es5BrowserSupport": true,
"baseHref": "/questionnaire/", "baseHref": "/questionnaire/",
"deployUrl": "/questionnaire/" "deployUrl": "/questionnaire/"
}, },
...@@ -126,6 +132,7 @@ ...@@ -126,6 +132,7 @@
"karmaConfig": "src/karma.conf.js", "karmaConfig": "src/karma.conf.js",
"styles": [ "styles": [
"./node_modules/bootstrap/dist/css/bootstrap.min.css", "./node_modules/bootstrap/dist/css/bootstrap.min.css",
"./node_modules/ng-zorro-antd/ng-zorro-antd.min.css",
"src/styles.css" "src/styles.css"
], ],
"scripts": [], "scripts": [],
......
questionnaire/package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
questionnaire/package.json
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"version": "0.0.0", "version": "0.0.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve --port 4204",
"build": "ng build -c=dev --prod", "build": "ng build -c=dev --prod",
"test": "ng test", "test": "ng test",
"lint": "ng lint", "lint": "ng lint",
...@@ -11,29 +11,30 @@ ...@@ -11,29 +11,30 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "~7.2.0", "@angular/animations": "~10.0.5",
"@angular/common": "~7.2.0", "@angular/common": "~10.0.5",
"@angular/compiler": "~7.2.0", "@angular/compiler": "~10.0.5",
"@angular/core": "~7.2.0", "@angular/core": "~10.0.5",
"@angular/forms": "~7.2.0", "@angular/forms": "~10.0.5",
"@angular/platform-browser": "~7.2.0", "@angular/platform-browser": "~10.0.5",
"@angular/platform-browser-dynamic": "~7.2.0", "@angular/platform-browser-dynamic": "~10.0.5",
"@angular/router": "~7.2.0", "@angular/router": "~10.0.5",
"bootstrap": "^3.4.1", "bootstrap": "^3.4.1",
"codelyzer": "^6.0.0",
"core-js": "^2.5.4", "core-js": "^2.5.4",
"rxjs": "~6.3.3", "ng-zorro-antd": "^9.3.0",
"rxjs": "~6.6.0",
"tslib": "^1.9.0", "tslib": "^1.9.0",
"zone.js": "~0.8.26" "zone.js": "~0.10.3"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.13.0", "@angular-devkit/build-angular": "~0.1000.4",
"@angular/cli": "~7.3.5", "@angular/cli": "~10.0.4",
"@angular/compiler-cli": "~7.2.0", "@angular/compiler-cli": "~10.0.5",
"@angular/language-service": "~7.2.0", "@angular/language-service": "~10.0.5",
"@types/node": "~8.9.4", "@types/node": "~8.9.4",
"@types/jasmine": "~2.8.8", "@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3", "@types/jasminewd2": "~2.0.3",
"codelyzer": "~4.5.0",
"jasmine-core": "~2.99.1", "jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1", "jasmine-spec-reporter": "~4.2.1",
"karma": "~4.0.0", "karma": "~4.0.0",
...@@ -44,6 +45,6 @@ ...@@ -44,6 +45,6 @@
"protractor": "~5.4.0", "protractor": "~5.4.0",
"ts-node": "~7.0.0", "ts-node": "~7.0.0",
"tslint": "~5.11.0", "tslint": "~5.11.0",
"typescript": "~3.2.2" "typescript": "~3.9.7"
} }
} }
questionnaire/src/app/age/age.component.css
...@@ -45,3 +45,44 @@ ...@@ -45,3 +45,44 @@
.disabled{ .disabled{
opacity: 0.5; opacity: 0.5;
} }
.ageWrapper{
position: relative;
}
.ageWrapper #dot{
position: absolute;
height: 45px;
width: 1px;
background: #5566e9;
z-index: 1;
}
#dot span{
width: 8px;
height: 8px;
border-radius: 50%;
background: #5566e9;
display: inline-block;
top: -4px;
position: absolute;
left: -4px;
}
.age{
width: 100%;
height: 10px;
display: flex;
justify-content: space-between;
border-top: 1px #d5d5d5 solid;
margin-left: -2px;
}
.age li:nth-child(10n+1){
height: 10px;
position: relative;
width: 1px;
background: #d5d5d5;
}
.age li span{
position: absolute;
top: 15px;
left: -8px;
}
questionnaire/src/app/age/age.component.html
...@@ -16,7 +16,79 @@ ...@@ -16,7 +16,79 @@
<div data-toggle="modal">增加孩子年龄</div> <div data-toggle="modal">增加孩子年龄</div>
</div> </div>
</div> </div>
<div class="ageWrapper">
<!-- <div id="dot" [ngStyle]="{'left': value2 + 'px'}">
<span></span>
</div> -->
<!-- <input style="position: absolute; opacity: 0; left: 0;width: '100%' " type="range" [(ngModel)]="value2"
(ngModelChange)="selectAge($event)" min="20" max="80" step="1" /> -->
<div style="text-align: center;font-size: 36px;color:#5566e9;">{{value2}}</div>
<nz-slider [(ngModel)]="value2" [nzDisabled]="disabled" [nzMin]='20' [nzMax]="80" [nzTipFormatter]="null"
(ngModelChange)="selectAge($event)">
</nz-slider>
<ul class="age">
<li><span>20</span></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li><span>30</span></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li><span>40</span></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li><span>50</span></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li><span>60</span></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li><span>70</span></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li><span>80</span></li>
</ul>
</div>
</div> </div>
<div class="content_footer"> <div class="content_footer">
<div style="color: #8a8a8a;" (click)="before()">&lt;</div> <div style="color: #8a8a8a;" (click)="before()">&lt;</div>
......
questionnaire/src/app/age/age.component.ts
...@@ -23,7 +23,9 @@ export class AgeComponent implements OnInit { ...@@ -23,7 +23,9 @@ export class AgeComponent implements OnInit {
lastQuestions: Array<any>; lastQuestions: Array<any>;
nextBtn: boolean = false; nextBtn: boolean = false;
targetObj: any = {}; targetObj: any = {};
disabled: boolean;
value2: number = 25;
marks: any;
constructor(private commonService: CommonService, private router: Router, private route: ActivatedRoute) { constructor(private commonService: CommonService, private router: Router, private route: ActivatedRoute) {
/** /**
* 1:单身贵族 * 1:单身贵族
...@@ -39,9 +41,20 @@ export class AgeComponent implements OnInit { ...@@ -39,9 +41,20 @@ export class AgeComponent implements OnInit {
pageId: '', pageId: '',
questions: [], questions: [],
}; };
this.marks = {
20: '20',
30: '30',
40: '40',
50: '50',
60: '60',
70: '70',
80: '80'
};
} }
ngOnInit() { ngOnInit() {
this.disabled = false;
this.value2 = 25;
this.lastQuestions = this.commonService.todosCopy.filter(item => item.pageId == 3).pop(); this.lastQuestions = this.commonService.todosCopy.filter(item => item.pageId == 3).pop();
this.commonService.surveyInfo().then(res => { this.commonService.surveyInfo().then(res => {
this.curPageData = res['data']['survey']['pages'].filter(item => item.pageId === 3).pop(); this.curPageData = res['data']['survey']['pages'].filter(item => item.pageId === 3).pop();
...@@ -83,6 +96,10 @@ export class AgeComponent implements OnInit { ...@@ -83,6 +96,10 @@ export class AgeComponent implements OnInit {
} }
}); });
} }
selectAge(e) {
console.log(e)
this.value2 = e;
}
// 选择年龄 // 选择年龄
selectedAge(options) { selectedAge(options) {
......
questionnaire/src/app/app.component.html
<div class="container"> <div class="container">
<router-outlet> <router-outlet>
</router-outlet> </router-outlet>
</div> </div>
\ No newline at end of file
questionnaire/src/app/app.module.ts
import {BrowserModule} from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import {NgModule} from '@angular/core'; import { NgModule } from '@angular/core';
import {HashLocationStrategy, LocationStrategy} from '@angular/common'; import { HashLocationStrategy, LocationStrategy, registerLocaleData } from '@angular/common';
import { FormsModule } from '@angular/forms'; import { FormsModule } from '@angular/forms';
import {AppRoutingModule} from './app-routing.module'; import { AppRoutingModule } from './app-routing.module';
import {AppComponent} from './app.component'; import { AppComponent } from './app.component';
import {FamilyComponent} from './family/family.component'; import { FamilyComponent } from './family/family.component';
import {AgeComponent} from './age/age.component'; import { AgeComponent } from './age/age.component';
import {JobComponent} from './job/job.component'; import { JobComponent } from './job/job.component';
import {IncomeComponent} from './income/income.component'; import { IncomeComponent } from './income/income.component';
import {LoanComponent} from './loan/loan.component'; import { LoanComponent } from './loan/loan.component';
import {SocialSecurityComponent} from './social-security/social-security.component'; import { SocialSecurityComponent } from './social-security/social-security.component';
import {HealthComponent} from './health/health.component'; import { HealthComponent } from './health/health.component';
import {ChildrenHealthComponent} from './children-health/children-health.component'; import { ChildrenHealthComponent } from './children-health/children-health.component';
import {DiseaseComponent} from './disease/disease.component'; import { DiseaseComponent } from './disease/disease.component';
import {SmokingComponent} from './smoking/smoking.component'; import { SmokingComponent } from './smoking/smoking.component';
import {LiveComponent} from './live/live.component'; import { LiveComponent } from './live/live.component';
import {TransitComponent} from './transit/transit.component'; import { TransitComponent } from './transit/transit.component';
import {Transit1Component} from './transit1/transit1.component'; import { Transit1Component } from './transit1/transit1.component';
import {Transit2Component} from './transit2/transit2.component'; import { Transit2Component } from './transit2/transit2.component';
import {Transit3Component} from './transit3/transit3.component'; import { Transit3Component } from './transit3/transit3.component';
import {HttpClientModule} from '@angular/common/http' import { HttpClientModule } from '@angular/common/http'
import {CommonService} from './common.service' import { CommonService } from './common.service'
import {LocalStorage} from './local.storage'; import { LocalStorage } from './local.storage';
import { SpecialMmhComponent } from './special-mmh/special-mmh.component' import { SpecialMmhComponent } from './special-mmh/special-mmh.component';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { NZ_I18N } from 'ng-zorro-antd/i18n';
import { zh_CN } from 'ng-zorro-antd/i18n';
import zh from '@angular/common/locales/zh'
import { NzSliderModule } from 'ng-zorro-antd/slider';
registerLocaleData(zh);
@NgModule({ @NgModule({
declarations: [ declarations: [
AppComponent, AppComponent,
...@@ -48,10 +56,12 @@ import { SpecialMmhComponent } from './special-mmh/special-mmh.component' ...@@ -48,10 +56,12 @@ import { SpecialMmhComponent } from './special-mmh/special-mmh.component'
imports: [ imports: [
BrowserModule, BrowserModule,
FormsModule, FormsModule,
AppRoutingModule AppRoutingModule,
, HttpClientModule HttpClientModule,
BrowserAnimationsModule,
NzSliderModule
], ],
providers: [CommonService, LocalStorage, {provide: LocationStrategy, useClass: HashLocationStrategy}], providers: [CommonService, LocalStorage, { provide: LocationStrategy, useClass: HashLocationStrategy }, { provide: NZ_I18N, useValue: zh_CN }],
bootstrap: [AppComponent] bootstrap: [AppComponent]
}) })
export class AppModule { export class AppModule {
......
questionnaire/src/app/family/family.component.css
...@@ -24,6 +24,6 @@ ...@@ -24,6 +24,6 @@
} }
.option_item li .imgBox img.selected { .option_item li .imgBox img.selected {
border: 2px solid #ff0000; border: 2px solid #5566e9;
border-radius: 50%; border-radius: 50%;
} }
questionnaire/src/app/local.storage.ts
import { Injectable } from "@angular/core";
/** /**
* Created by Jerold Chen on 2018/4/13. * Created by Jerold Chen on 2018/4/13.
*/ */
@Injectable()
export class LocalStorage { export class LocalStorage {
public localStorage: any; public localStorage: any;
......
questionnaire/src/app/transit/transit.component.css
...@@ -122,3 +122,13 @@ ...@@ -122,3 +122,13 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.picBtn{
position: absolute;
left: 0;
bottom: 12%;
width: 73%;
margin: 0 auto;
right: 0;
}
questionnaire/src/app/transit/transit.component.html
<div class="limbo"> <div class="limbo">
<img *ngIf="advFlag" src="assets/images/first.jpg"> <div class="title" *ngIf="!picFlag" style="position: relative;">
<img src="assets/images/bg.png" />
<div *ngIf="!advFlag"> <!--分享-->
<div class="title" *ngIf="!picFlag"> <img class="picBtn" style="bottom: 21.5%" src="assets/images/btn_share.png" *ngIf="deviceType === 3"
<img src="assets/images/bg_1.png" /> (click)="wxShare()">
</div> <!--进入测试-->
<div class="specialWrapper" *ngIf="picFlag"> <img class="picBtn" src="assets/images/btn_in.png" routerLink="/family">
<div class="specialContent part1"> </div>
<div class="gifts"> <div class="specialWrapper" *ngIf="picFlag">
福利1 <div class="specialContent part1">
</div> <div class="gifts">
<div> 福利1
<!-- <span class="iconfont">&#xe625;</span> -->
<span style="color: #ec2d37;">平安意外险领取成功</span>
</div>
</div> </div>
<div class="specialContent part2"> <div>
<div class="gifts">福利2</div> <!-- <span class="iconfont">&#xe625;</span> -->
<div>家庭风险咨询服务</div> <span style="color: #ec2d37;">平安意外险领取成功</span>
<div>（￥199）</div>
<ul class="part3">
<li><span class="iconfont">&#xe62e;</span>所有家庭成员风险分析</li>
<li><span class="iconfont">&#xe62e;</span>定制保险方案</li>
<li><span class="iconfont">&#xe62e;</span>投保理赔协助</li>
</ul>
</div> </div>
</div> </div>
<div class="tips" *ngIf="picFlag"> <div class="specialContent part2">
<span style="color:red;">*</span> <div class="gifts">福利2</div>
<span>了解一下您的家庭情况</span> <div>家庭风险咨询服务</div>
</div> <div>（￥199）</div>
<div *ngIf="deviceType === 3" style="display: flex;justify-content: flex-end;margin: 10px 0;"> <ul class="part3">
<div class="share" (click)="wxShare()"> <li><span class="iconfont">&#xe62e;</span>所有家庭成员风险分析</li>
<div style="width: 20px"><img src="assets/images/shareBtn.png" alt=""></div> <li><span class="iconfont">&#xe62e;</span>定制保险方案</li>
<span>分享给朋友</span> <li><span class="iconfont">&#xe62e;</span>投保理赔协助</li>
</div> </ul>
</div>
<div class="tips" *ngIf="!picFlag">
<span style="color:red;">*</span>
<span>本问卷大约需要1分钟</span>
</div>
<div class="footer" routerLink="/family">
<div>开始评测</div>
</div> </div>
</div> </div>
<div class="tips" *ngIf="picFlag">
<span style="color:red;">*</span>
<span>了解一下您的家庭情况</span>
</div>
</div> </div>
<!--分享引导页--> <!--分享引导页-->
......
questionnaire/src/app/transit/transit.component.ts
...@@ -17,7 +17,6 @@ export class TransitComponent implements OnInit { ...@@ -17,7 +17,6 @@ export class TransitComponent implements OnInit {
customerId: string; customerId: string;
deviceType: number; deviceType: number;
dialogTips: string; dialogTips: string;
advFlag: boolean = true;
constructor(private location: Location, private router: Router, 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) {
} }
...@@ -38,11 +37,6 @@ export class TransitComponent implements OnInit { ...@@ -38,11 +37,6 @@ export class TransitComponent implements OnInit {
if (this.deviceType === 3) { if (this.deviceType === 3) {
this.configWX(); this.configWX();
} }
setTimeout(() => {
this.advFlag = false;
}, 3000)
console.log(this.activatedRoute);
console.log(this.location)
} }
// 分享给朋友 // 分享给朋友
wxShare() { wxShare() {
......
questionnaire/src/styles.css
/* You can add global styles to this file, and also import other style files */ /* You can add global styles to this file, and also import other style files */
@import "~ng-zorro-antd/ng-zorro-antd.min.css";
* { * {
margin: 0; margin: 0;
padding: 0; padding: 0;
...@@ -120,8 +122,8 @@ ol li { ...@@ -120,8 +122,8 @@ ol li {
margin:0 10px; margin:0 10px;
} */ } */
.questionTitle { .questionTitle {
color: #ec2d37; color: #4446e2;
font-size: 22px; font-size: 24px;
height: 60px; height: 60px;
line-height: 60px; line-height: 60px;
width: 100%; width: 100%;
...@@ -419,3 +421,8 @@ ol li { ...@@ -419,3 +421,8 @@ ol li {
transform: translateY(0) transform: translateY(0)
} }
} }
.ageWrapper .ant-slider{
margin: 0!important;
padding: 0!important;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment