Commit f55b32c3 by Chao Sun

静态页面

parent 10bbd770
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
"src/assets" "src/assets"
], ],
"styles": [ "styles": [
"./node_modules/bootstrap/dist/css/bootstrap.min.css",
"src/styles.css" "src/styles.css"
], ],
"scripts": [], "scripts": [],
......
...@@ -15,16 +15,16 @@ ...@@ -15,16 +15,16 @@
} }
}, },
"@angular-devkit/build-angular": { "@angular-devkit/build-angular": {
"version": "0.13.8", "version": "0.13.9",
"resolved": "https://registry.npm.taobao.org/@angular-devkit/build-angular/download/@angular-devkit/build-angular-0.13.8.tgz", "resolved": "https://registry.npm.taobao.org/@angular-devkit/build-angular/download/@angular-devkit/build-angular-0.13.9.tgz",
"integrity": "sha1-f/lJ20bHgRXgvEWzovnK1kRZwBY=", "integrity": "sha1-ku97VaGqBVsvXI/+1L2wTfhttng=",
"dev": true, "dev": true,
"requires": { "requires": {
"@angular-devkit/architect": "0.13.8", "@angular-devkit/architect": "0.13.9",
"@angular-devkit/build-optimizer": "0.13.8", "@angular-devkit/build-optimizer": "0.13.9",
"@angular-devkit/build-webpack": "0.13.8", "@angular-devkit/build-webpack": "0.13.9",
"@angular-devkit/core": "7.3.8", "@angular-devkit/core": "7.3.9",
"@ngtools/webpack": "7.3.8", "@ngtools/webpack": "7.3.9",
"ajv": "6.9.1", "ajv": "6.9.1",
"autoprefixer": "9.4.6", "autoprefixer": "9.4.6",
"circular-dependency-plugin": "5.0.2", "circular-dependency-plugin": "5.0.2",
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
"loader-utils": "1.2.3", "loader-utils": "1.2.3",
"mini-css-extract-plugin": "0.5.0", "mini-css-extract-plugin": "0.5.0",
"minimatch": "3.0.4", "minimatch": "3.0.4",
"node-sass": "4.11.0", "node-sass": "4.12.0",
"open": "6.0.0", "open": "6.0.0",
"parse5": "4.0.0", "parse5": "4.0.0",
"postcss": "7.0.14", "postcss": "7.0.14",
...@@ -65,12 +65,37 @@ ...@@ -65,12 +65,37 @@
"webpack-merge": "4.2.1", "webpack-merge": "4.2.1",
"webpack-sources": "1.3.0", "webpack-sources": "1.3.0",
"webpack-subresource-integrity": "1.1.0-rc.6" "webpack-subresource-integrity": "1.1.0-rc.6"
},
"dependencies": {
"@angular-devkit/architect": {
"version": "0.13.9",
"resolved": "https://registry.npm.taobao.org/@angular-devkit/architect/download/@angular-devkit/architect-0.13.9.tgz",
"integrity": "sha1-i7ykuWj8y/iPwvhlQsvuCeElbh8=",
"dev": true,
"requires": {
"@angular-devkit/core": "7.3.9",
"rxjs": "6.3.3"
}
},
"@angular-devkit/core": {
"version": "7.3.9",
"resolved": "https://registry.npm.taobao.org/@angular-devkit/core/download/@angular-devkit/core-7.3.9.tgz",
"integrity": "sha1-vvKqoL5yGcVG+5nqC6ndOm3NKIo=",
"dev": true,
"requires": {
"ajv": "6.9.1",
"chokidar": "2.0.4",
"fast-json-stable-stringify": "2.0.0",
"rxjs": "6.3.3",
"source-map": "0.7.3"
}
}
} }
}, },
"@angular-devkit/build-optimizer": { "@angular-devkit/build-optimizer": {
"version": "0.13.8", "version": "0.13.9",
"resolved": "https://registry.npm.taobao.org/@angular-devkit/build-optimizer/download/@angular-devkit/build-optimizer-0.13.8.tgz", "resolved": "https://registry.npm.taobao.org/@angular-devkit/build-optimizer/download/@angular-devkit/build-optimizer-0.13.9.tgz",
"integrity": "sha1-C8uhpO9ZjBoByqYN02A7rFKlexY=", "integrity": "sha1-BaJcp3Q4dphxWIgVhcVd/EeLlb0=",
"dev": true, "dev": true,
"requires": { "requires": {
"loader-utils": "1.2.3", "loader-utils": "1.2.3",
...@@ -88,14 +113,39 @@ ...@@ -88,14 +113,39 @@
} }
}, },
"@angular-devkit/build-webpack": { "@angular-devkit/build-webpack": {
"version": "0.13.8", "version": "0.13.9",
"resolved": "https://registry.npm.taobao.org/@angular-devkit/build-webpack/download/@angular-devkit/build-webpack-0.13.8.tgz", "resolved": "https://registry.npm.taobao.org/@angular-devkit/build-webpack/download/@angular-devkit/build-webpack-0.13.9.tgz",
"integrity": "sha1-gedURCKF3U7OfRak0U7YDX6qnic=", "integrity": "sha1-n6CR13jbdSxTnhxYXiG6R9cFRnI=",
"dev": true, "dev": true,
"requires": { "requires": {
"@angular-devkit/architect": "0.13.8", "@angular-devkit/architect": "0.13.9",
"@angular-devkit/core": "7.3.8", "@angular-devkit/core": "7.3.9",
"rxjs": "6.3.3" "rxjs": "6.3.3"
},
"dependencies": {
"@angular-devkit/architect": {
"version": "0.13.9",
"resolved": "https://registry.npm.taobao.org/@angular-devkit/architect/download/@angular-devkit/architect-0.13.9.tgz",
"integrity": "sha1-i7ykuWj8y/iPwvhlQsvuCeElbh8=",
"dev": true,
"requires": {
"@angular-devkit/core": "7.3.9",
"rxjs": "6.3.3"
}
},
"@angular-devkit/core": {
"version": "7.3.9",
"resolved": "https://registry.npm.taobao.org/@angular-devkit/core/download/@angular-devkit/core-7.3.9.tgz",
"integrity": "sha1-vvKqoL5yGcVG+5nqC6ndOm3NKIo=",
"dev": true,
"requires": {
"ajv": "6.9.1",
"chokidar": "2.0.4",
"fast-json-stable-stringify": "2.0.0",
"rxjs": "6.3.3",
"source-map": "0.7.3"
}
}
} }
}, },
"@angular-devkit/core": { "@angular-devkit/core": {
...@@ -611,16 +661,31 @@ ...@@ -611,16 +661,31 @@
} }
}, },
"@ngtools/webpack": { "@ngtools/webpack": {
"version": "7.3.8", "version": "7.3.9",
"resolved": "https://registry.npm.taobao.org/@ngtools/webpack/download/@ngtools/webpack-7.3.8.tgz", "resolved": "https://registry.npm.taobao.org/@ngtools/webpack/download/@ngtools/webpack-7.3.9.tgz",
"integrity": "sha1-yHYdD2lZaC4DAy+NPecY0fgRQQ4=", "integrity": "sha1-2xFduozAiG2NgicjvkEZ04SftOM=",
"dev": true, "dev": true,
"requires": { "requires": {
"@angular-devkit/core": "7.3.8", "@angular-devkit/core": "7.3.9",
"enhanced-resolve": "4.1.0", "enhanced-resolve": "4.1.0",
"rxjs": "6.3.3", "rxjs": "6.3.3",
"tree-kill": "1.2.1", "tree-kill": "1.2.1",
"webpack-sources": "1.3.0" "webpack-sources": "1.3.0"
},
"dependencies": {
"@angular-devkit/core": {
"version": "7.3.9",
"resolved": "https://registry.npm.taobao.org/@angular-devkit/core/download/@angular-devkit/core-7.3.9.tgz",
"integrity": "sha1-vvKqoL5yGcVG+5nqC6ndOm3NKIo=",
"dev": true,
"requires": {
"ajv": "6.9.1",
"chokidar": "2.0.4",
"fast-json-stable-stringify": "2.0.0",
"rxjs": "6.3.3",
"source-map": "0.7.3"
}
}
} }
}, },
"@schematics/angular": { "@schematics/angular": {
...@@ -2816,9 +2881,9 @@ ...@@ -2816,9 +2881,9 @@
"dev": true "dev": true
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.3.131", "version": "1.3.133",
"resolved": "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.131.tgz", "resolved": "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.133.tgz",
"integrity": "sha1-IFoLeidrP1a8BW8ZF4kJJDBUJSo=", "integrity": "sha1-xHY5wZuR/u4+IvrWn1VWFCAHAIw=",
"dev": true "dev": true
}, },
"elliptic": { "elliptic": {
...@@ -5751,13 +5816,6 @@ ...@@ -5751,13 +5816,6 @@
"integrity": "sha1-s56mIp72B+zYniyN8SU2iRysm40=", "integrity": "sha1-s56mIp72B+zYniyN8SU2iRysm40=",
"dev": true "dev": true
}, },
"lodash.assign": {
"version": "4.2.0",
"resolved": "http://registry.npm.taobao.org/lodash.assign/download/lodash.assign-4.2.0.tgz",
"integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
"dev": true,
"optional": true
},
"lodash.clonedeep": { "lodash.clonedeep": {
"version": "4.5.0", "version": "4.5.0",
"resolved": "http://registry.npm.taobao.org/lodash.clonedeep/download/lodash.clonedeep-4.5.0.tgz", "resolved": "http://registry.npm.taobao.org/lodash.clonedeep/download/lodash.clonedeep-4.5.0.tgz",
...@@ -5770,13 +5828,6 @@ ...@@ -5770,13 +5828,6 @@
"integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
"dev": true "dev": true
}, },
"lodash.mergewith": {
"version": "4.6.1",
"resolved": "http://registry.npm.taobao.org/lodash.mergewith/download/lodash.mergewith-4.6.1.tgz",
"integrity": "sha1-Y5BX5ybDr72z59QnQcqo1uQzWSc=",
"dev": true,
"optional": true
},
"lodash.tail": { "lodash.tail": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "http://registry.npm.taobao.org/lodash.tail/download/lodash.tail-4.1.1.tgz", "resolved": "http://registry.npm.taobao.org/lodash.tail/download/lodash.tail-4.1.1.tgz",
...@@ -6347,6 +6398,11 @@ ...@@ -6347,6 +6398,11 @@
"integrity": "sha1-udFeTXHGdikIZUtRg+04t1M0CDU=", "integrity": "sha1-udFeTXHGdikIZUtRg+04t1M0CDU=",
"dev": true "dev": true
}, },
"ngx-bootstrap": {
"version": "4.1.1",
"resolved": "https://registry.npm.taobao.org/ngx-bootstrap/download/ngx-bootstrap-4.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fngx-bootstrap%2Fdownload%2Fngx-bootstrap-4.1.1.tgz",
"integrity": "sha1-KBFRhEuSX/m22RUPs2lbrizRL8M="
},
"nice-try": { "nice-try": {
"version": "1.0.5", "version": "1.0.5",
"resolved": "http://registry.npm.taobao.org/nice-try/download/nice-try-1.0.5.tgz", "resolved": "http://registry.npm.taobao.org/nice-try/download/nice-try-1.0.5.tgz",
...@@ -6440,18 +6496,18 @@ ...@@ -6440,18 +6496,18 @@
} }
}, },
"node-releases": { "node-releases": {
"version": "1.1.17", "version": "1.1.18",
"resolved": "https://registry.npm.taobao.org/node-releases/download/node-releases-1.1.17.tgz", "resolved": "https://registry.npm.taobao.org/node-releases/download/node-releases-1.1.18.tgz",
"integrity": "sha1-cepGMfCpfVzU9l99BOz5By6scRo=", "integrity": "sha1-zJj9dVmKMkp3GI6932ZQ6cvYsdU=",
"dev": true, "dev": true,
"requires": { "requires": {
"semver": "^5.3.0" "semver": "^5.3.0"
} }
}, },
"node-sass": { "node-sass": {
"version": "4.11.0", "version": "4.12.0",
"resolved": "https://registry.npm.taobao.org/node-sass/download/node-sass-4.11.0.tgz", "resolved": "https://registry.npm.taobao.org/node-sass/download/node-sass-4.12.0.tgz",
"integrity": "sha1-GD+uw5jpy+k7pDNi4naMqYimNpo=", "integrity": "sha1-CRT1MZMjgBFKMMxfpPpjIzol8Bc=",
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -6462,12 +6518,10 @@ ...@@ -6462,12 +6518,10 @@
"get-stdin": "^4.0.1", "get-stdin": "^4.0.1",
"glob": "^7.0.3", "glob": "^7.0.3",
"in-publish": "^2.0.0", "in-publish": "^2.0.0",
"lodash.assign": "^4.2.0", "lodash": "^4.17.11",
"lodash.clonedeep": "^4.3.2",
"lodash.mergewith": "^4.6.0",
"meow": "^3.7.0", "meow": "^3.7.0",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"nan": "^2.10.0", "nan": "^2.13.2",
"node-gyp": "^3.8.0", "node-gyp": "^3.8.0",
"npmlog": "^4.0.0", "npmlog": "^4.0.0",
"request": "^2.88.0", "request": "^2.88.0",
...@@ -8178,7 +8232,7 @@ ...@@ -8178,7 +8232,7 @@
}, },
"serve-static": { "serve-static": {
"version": "1.13.2", "version": "1.13.2",
"resolved": "http://registry.npm.taobao.org/serve-static/download/serve-static-1.13.2.tgz", "resolved": "https://registry.npm.taobao.org/serve-static/download/serve-static-1.13.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fserve-static%2Fdownload%2Fserve-static-1.13.2.tgz",
"integrity": "sha1-CV6Ecv1bRiN9tQzkhqQ/S4bGzsE=", "integrity": "sha1-CV6Ecv1bRiN9tQzkhqQ/S4bGzsE=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9009,7 +9063,7 @@ ...@@ -9009,7 +9063,7 @@
"dependencies": { "dependencies": {
"glob": { "glob": {
"version": "7.0.6", "version": "7.0.6",
"resolved": "http://registry.npm.taobao.org/glob/download/glob-7.0.6.tgz", "resolved": "https://registry.npm.taobao.org/glob/download/glob-7.0.6.tgz",
"integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
"dev": true, "dev": true,
"requires": { "requires": {
......
...@@ -22,18 +22,19 @@ ...@@ -22,18 +22,19 @@
"angular-in-memory-web-api": "^0.8.0", "angular-in-memory-web-api": "^0.8.0",
"bootstrap": "^3.4.1", "bootstrap": "^3.4.1",
"core-js": "^2.5.4", "core-js": "^2.5.4",
"ngx-bootstrap": "^4.1.1",
"rxjs": "~6.3.3", "rxjs": "~6.3.3",
"tslib": "^1.9.0", "tslib": "^1.9.0",
"zone.js": "~0.8.26" "zone.js": "~0.8.26"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.13.0", "@angular-devkit/build-angular": "^0.13.9",
"@angular/cli": "~7.3.8", "@angular/cli": "~7.3.8",
"@angular/compiler-cli": "~7.2.0", "@angular/compiler-cli": "~7.2.0",
"@angular/language-service": "~7.2.0", "@angular/language-service": "~7.2.0",
"@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",
"@types/node": "~8.9.4",
"codelyzer": "~4.5.0", "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",
......
...@@ -6,6 +6,19 @@ import {AskdetailComponent} from './askdetail/askdetail.component'; ...@@ -6,6 +6,19 @@ import {AskdetailComponent} from './askdetail/askdetail.component';
import {PageTwoComponent} from './page-two/page-two.component'; import {PageTwoComponent} from './page-two/page-two.component';
import {PageThreeComponent} from './page-three/page-three.component'; import {PageThreeComponent} from './page-three/page-three.component';
import {PageFourComponent} from './page-four/page-four.component'; import {PageFourComponent} from './page-four/page-four.component';
import {PageFiveComponent} from './page-five/page-five.component';
import {PageSixComponent} from './page-six/page-six.component';
import {PageSevenComponent} from './page-seven/page-seven.component';
import {PageEightComponent} from './page-eight/page-eight.component';
import {PageNineComponent} from './page-nine/page-nine.component';
import {PageTenComponent} from './page-ten/page-ten.component';
import {Page11Component} from './page11/page11.component';
import {Page12Component} from './page12/page12.component';
import {Page13Component} from './page13/page13.component';
import {Page14Component} from './page14/page14.component';
import {Page15Component} from './page15/page15.component';
import {Page16Component} from './page16/page16.component';
import {Page17Component} from './page17/page17.component';
const routes: Routes = [ const routes: Routes = [
{ {
path: '', redirectTo: '/index', pathMatch: 'full' path: '', redirectTo: '/index', pathMatch: 'full'
...@@ -19,6 +32,19 @@ const routes: Routes = [ ...@@ -19,6 +32,19 @@ const routes: Routes = [
{path:'question2',component:PageTwoComponent}, {path:'question2',component:PageTwoComponent},
{path:'question3',component:PageThreeComponent}, {path:'question3',component:PageThreeComponent},
{path:'question4',component:PageFourComponent}, {path:'question4',component:PageFourComponent},
{path:'question5',component:PageFiveComponent},
{path:'question6',component:PageSixComponent},
{path:'question7',component:PageSevenComponent},
{path:'question8',component:PageEightComponent},
{path:'question9',component:PageNineComponent},
{path:'question10',component:PageTenComponent},
{path:'question11',component:Page11Component},
{path:'question12',component:Page12Component},
{path:'question13',component:Page13Component},
{path:'question14',component:Page14Component},
{path:'question15',component:Page15Component},
{path:'question16',component:Page16Component},
{path:'question17',component:Page17Component},
{path:'index', component: AskComponent, {path:'index', component: AskComponent,
data: { data: {
limbo: '2', limbo: '2',
......
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { ModalModule } from 'ngx-bootstrap/modal';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
import { AskComponent } from './ask/ask.component'; import { AskComponent } from './ask/ask.component';
import { AppRoutingModule } from './app-routing.module'; import { AppRoutingModule } from './app-routing.module';
...@@ -11,6 +11,19 @@ import {HttpClientModule} from '@angular/common/http'; ...@@ -11,6 +11,19 @@ import {HttpClientModule} from '@angular/common/http';
import {CommonService} from './common.service'; import {CommonService} from './common.service';
import { PageFourComponent } from './page-four/page-four.component'; import { PageFourComponent } from './page-four/page-four.component';
import {LocalStorage} from './local.storage'; import {LocalStorage} from './local.storage';
import { PageFiveComponent } from './page-five/page-five.component';
import { PageSixComponent } from './page-six/page-six.component';
import { PageSevenComponent } from './page-seven/page-seven.component';
import { PageEightComponent } from './page-eight/page-eight.component';
import { PageNineComponent } from './page-nine/page-nine.component';
import { PageTenComponent } from './page-ten/page-ten.component';
import { Page11Component } from './page11/page11.component';
import { Page12Component } from './page12/page12.component';
import { Page13Component } from './page13/page13.component';
import { Page14Component } from './page14/page14.component';
import { Page15Component } from './page15/page15.component';
import { Page16Component } from './page16/page16.component';
import { Page17Component } from './page17/page17.component';
@NgModule({ @NgModule({
declarations: [ declarations: [
AppComponent, AppComponent,
...@@ -18,12 +31,25 @@ import {LocalStorage} from './local.storage'; ...@@ -18,12 +31,25 @@ import {LocalStorage} from './local.storage';
AskdetailComponent, AskdetailComponent,
PageTwoComponent, PageTwoComponent,
PageThreeComponent, PageThreeComponent,
PageFourComponent PageFourComponent,
PageFiveComponent,
PageSixComponent,
PageSevenComponent,
PageEightComponent,
PageNineComponent,
PageTenComponent,
Page11Component,
Page12Component,
Page13Component,
Page14Component,
Page15Component,
Page16Component,
Page17Component
], ],
imports: [ imports: [
BrowserModule, BrowserModule,
AppRoutingModule, AppRoutingModule,
HttpClientModule HttpClientModule,ModalModule.forRoot()
], ],
providers: [CommonService,LocalStorage], providers: [CommonService,LocalStorage],
bootstrap: [AppComponent] bootstrap: [AppComponent]
......
<div class="container"> <div class="container">
<div class="wrapper layout"> <div class="wrapper layout">
<div class="title"> <div class="limbo">
<img src="assets/images/bg_1.png"> <div class="title">
{{this.picNum}} <img src="assets/images/bg_1.png">
</div> </div>
<div class="tips"> <div class="tips">
<span style="color:red;">*</span> <span style="color:red;">*</span>
<span>本测试仅需三分钟</span> <span>本测试仅需三分钟</span>
</div> </div>
<div class="footer" routerLink="/question1"> <div class="footer" routerLink="/question1">
<div>获取家庭分析报告</div> <div>获取家庭分析报告</div>
</div>
</div> </div>
<!-- <app-askdetail></app-askdetail>
<app-page-two></app-page-two>
<app-page-three></app-page-three>
<app-page-four></app-page-four>
<app-page-five></app-page-five>
<app-page-six></app-page-six>
<app-page-seven></app-page-seven>
<app-page-eight></app-page-eight>
<app-page-nine></app-page-nine>
<app-page-ten></app-page-ten> -->
</div> </div>
</div> </div>
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import {CommonService} from '../common.service'; import {CommonService} from '../common.service';
import {LocalStorage} from '../local.storage';
@Component({ @Component({
selector: 'app-ask', selector: 'app-ask',
templateUrl: './ask.component.html', templateUrl: './ask.component.html',
...@@ -11,18 +11,23 @@ export class AskComponent implements OnInit { ...@@ -11,18 +11,23 @@ export class AskComponent implements OnInit {
questionList:Array<any>; questionList:Array<any>;
picNum:number; picNum:number;
constructor(private router: Router, constructor(private router: Router,
private ls: LocalStorage,
private commonService:CommonService private commonService:CommonService
) { ) {
} }
ngOnInit() { ngOnInit() {
this.commonService.getAllInfo(); this.surveyInfo()
setTimeout(()=>{ }
this.commonService.questionList.forEach(item=>{
surveyInfo(){
this.commonService.surveyInfo().then(res=>{
if(res['success']){
this.questionList = res['data']['survey'].pages
}
console.log(this.questionList)
}) })
},100)
} }
} }
...@@ -18,6 +18,6 @@ export class AskdetailComponent implements OnInit { ...@@ -18,6 +18,6 @@ export class AskdetailComponent implements OnInit {
// this.list =this.commservice.questionList.filter(item=> // this.list =this.commservice.questionList.filter(item=>
// item.pageId=='1' // item.pageId=='1'
// ).pop().questions // ).pop().questions
console.log(this.commonService.questionList) // console.log(this.commonService.questionList)
} }
} }
...@@ -26,15 +26,17 @@ export class CommonService { ...@@ -26,15 +26,17 @@ export class CommonService {
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() .post(url, JSON.stringify({}),this.httpOptions).toPromise().then(response => {
return response;
});
} }
async getAllInfo(){ // async getAllInfo(){
const res = await this.surveyInfo() // const res = await this.surveyInfo()
if(res['success']){ // if(res['success']){
this.questionList = res['data']['survey'].pages // this.questionList = res['data']['survey'].pages
} // }
} // }
/** /**
* 获取TOKEN * 获取TOKEN
......
<div class="container">
<div class="layout">
<div class="content">
<div class="questionTitle">您的健康状况</div>
<ul class="jobContent">
<li class="selected">
无疾病
</li>
<li>
三高(高血糖,高血压,高血脂)
</li>
<li>
糖尿病
</li>
<li>
心脏问题(先天性心脏病,冠心病,心梗等)
</li>
<li>
肝脏类疾病(甲乙丙型肝病,脂肪肝)
</li>
<li>
三高(高血糖,高血压,高血脂)
</li>
<li>
肠胃疾病
</li>
<li>
良性肿瘤
</li>
<li>
恶性肿瘤
</li>
<li>
脂肪瘤
</li>
<li>
结石性疾病(胆,胆囊,肾等)
</li>
<li>
结节类疾病(甲状腺结节,乳腺结节,肺结节等)
</li>
<li>
息肉(肠,鼻,胆囊等)
</li>
<li>
精神病(抑郁症,自闭症等)
</li>
<li>
骨关节疾病
</li>
<li>
生殖疾病
</li>
<li>
其他
</li>
</ul>
</div>
<div class="content_footer">
<div routerLink="/question7">&lt;</div>
<div routerLink="/question9" class="next">下一步</div>
</div>
</div>
</div>
\ No newline at end of file
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { PageEightComponent } from './page-eight.component';
describe('PageEightComponent', () => {
let component: PageEightComponent;
let fixture: ComponentFixture<PageEightComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ PageEightComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(PageEightComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-page-eight',
templateUrl: './page-eight.component.html',
styleUrls: ['./page-eight.component.css']
})
export class PageEightComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
<div class="container">
<div class="layout">
<div class="content">
<div class="questionTitle">您的年收入(税前)?</div>
<ul class="income">
<li class="selected">
10万以下
</li>
<li>
10-25万
</li>
<li>
25-40万
</li>
<li>
40-60万
</li>
<li>
60万以上
</li>
</ul>
<div class="questionTitle">您配偶的年收入(税前)?</div>
<ul class="income">
<li class="selected">
10万以下
</li>
<li>
10-25万
</li>
<li>
25-40万
</li>
<li>
40-60万
</li>
<li>
60万以上
</li>
</ul>
</div>
<div class="content_footer">
<div routerLink="/question4">&lt;</div>
<div routerLink="/question6" class="next">下一步</div>
</div>
</div>
</div>
\ No newline at end of file
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { PageFiveComponent } from './page-five.component';
describe('PageFiveComponent', () => {
let component: PageFiveComponent;
let fixture: ComponentFixture<PageFiveComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ PageFiveComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(PageFiveComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-page-five',
templateUrl: './page-five.component.html',
styleUrls: ['./page-five.component.css']
})
export class PageFiveComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</div> </div>
<div class="content_footer"> <div class="content_footer">
<div routerLink="/question3">&lt;</div> <div routerLink="/question3">&lt;</div>
<div routerLink="/index" class="next">下一步</div> <div routerLink="/question5" class="next">下一步</div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
<div class="container">
<div class="layout">
<div class="content">
<div class="questionTitle"><span>配偶</span>的健康状况</div>
<ul class="jobContent">
<li class="selected">
无疾病
</li>
<li>
三高(高血糖,高血压,高血脂)
</li>
<li>
糖尿病
</li>
<li>
心脏问题(先天性心脏病,冠心病,心梗等)
</li>
<li>
肝脏类疾病(甲乙丙型肝病,脂肪肝)
</li>
<li>
三高(高血糖,高血压,高血脂)
</li>
<li>
肠胃疾病
</li>
<li>
良性肿瘤
</li>
<li>
恶性肿瘤
</li>
<li>
脂肪瘤
</li>
<li>
结石性疾病(胆,胆囊,肾等)
</li>
<li>
结节类疾病(甲状腺结节,乳腺结节,肺结节等)
</li>
<li>
息肉(肠,鼻,胆囊等)
</li>
<li>
精神病(抑郁症,自闭症等)
</li>
<li>
骨关节疾病
</li>
<li>
生殖疾病
</li>
<li>
其他
</li>
</ul>
</div>
<div class="content_footer">
<div routerLink="/question8">&lt;</div>
<div routerLink="/question10" class="next">下一步</div>
</div>
</div>
</div>
\ No newline at end of file
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { PageNineComponent } from './page-nine.component';
describe('PageNineComponent', () => {
let component: PageNineComponent;
let fixture: ComponentFixture<PageNineComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ PageNineComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(PageNineComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-page-nine',
templateUrl: './page-nine.component.html',
styleUrls: ['./page-nine.component.css']
})
export class PageNineComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
<div class="container">
<div class="layout">
<div class="content">
<div class="questionTitle">您有社保吗?</div>
<ul class="jobContent">
<li class="selected">
</li>
<li>
</li>
</ul>
<div class="questionTitle">您配偶有社保吗?</div>
<ul class="jobContent">
<li class="selected">
</li>
<li>
</li>
</ul>
</div>
<div class="content_footer">
<div routerLink="/question6">&lt;</div>
<div routerLink="/question8" class="next">下一步</div>
</div>
</div>
</div>
\ No newline at end of file
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { PageSevenComponent } from './page-seven.component';
describe('PageSevenComponent', () => {
let component: PageSevenComponent;
let fixture: ComponentFixture<PageSevenComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ PageSevenComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(PageSevenComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-page-seven',
templateUrl: './page-seven.component.html',
styleUrls: ['./page-seven.component.css']
})
export class PageSevenComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
<div class="container">
<div class="layout">
<div class="content">
<div class="questionTitle">您有房贷吗? </div>
<ul class="income">
<li class="selected">
</li>
<li>
小于5000
</li>
<li>
5000-10000
</li>
<li>
1万-2万
</li>
<li>
2万-3万
</li>
<li>
大于3万
</li>
</ul>
<div class="questionTitle">您有车贷吗?</div>
<ul class="income">
<li class="selected">
</li>
<li>
小于5000
</li>
<li>
5000-10000
</li>
<li>
1万-2万
</li>
<li>
2万-3万
</li>
<li>
大于3万
</li>
</ul>
</div>
<div class="content_footer">
<div routerLink="/question5">&lt;</div>
<div routerLink="/question7" class="next">下一步</div>
</div>
</div>
</div>
\ No newline at end of file
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { PageSixComponent } from './page-six.component';
describe('PageSixComponent', () => {
let component: PageSixComponent;
let fixture: ComponentFixture<PageSixComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ PageSixComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(PageSixComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-page-six',
templateUrl: './page-six.component.html',
styleUrls: ['./page-six.component.css']
})
export class PageSixComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
<div class="container">
<div class="layout">
<div class="content">
<div class="questionTitle">您孩子的健康状况</div>
<ul class="jobContent">
<li class="selected">
无疾病
</li>
<li>
先天性心脏病
</li>
<li>
黄疸
</li>
<li>
肺炎
</li>
<li>
早产
</li>
<li>
腮腺炎
</li>
<li>
其他
</li>
</ul>
</div>
<div class="content_footer">
<div routerLink="/question9">&lt;</div>
<div routerLink="/question11" class="next">下一步</div>
</div>
</div>
</div>
\ No newline at end of file
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { PageTenComponent } from './page-ten.component';
describe('PageTenComponent', () => {
let component: PageTenComponent;
let fixture: ComponentFixture<PageTenComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ PageTenComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(PageTenComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-page-ten',
templateUrl: './page-ten.component.html',
styleUrls: ['./page-ten.component.css']
})
export class PageTenComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<li> <li>
<div>配偶的年龄</div> <div>配偶的年龄</div>
<span>35<b>&gt;</b></span> <span>35<b>&gt;</b></span>
</li> </li>
</ul> </ul>
<ul class="ageContent"> <ul class="ageContent">
...@@ -24,7 +23,7 @@ ...@@ -24,7 +23,7 @@
</div> </div>
<div class="addChild"> <div class="addChild">
<div class="icon">+</div> <div class="icon">+</div>
<div>增加孩子年龄</div> <div data-toggle="modal">增加孩子年龄</div>
</div> </div>
<div class="content_footer"> <div class="content_footer">
<div routerLink="/question1">&lt;</div> <div routerLink="/question1">&lt;</div>
......
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
@Component({ @Component({
selector: 'app-page-two', selector: 'app-page-two',
templateUrl: './page-two.component.html', templateUrl: './page-two.component.html',
...@@ -10,6 +9,7 @@ export class PageTwoComponent implements OnInit { ...@@ -10,6 +9,7 @@ export class PageTwoComponent implements OnInit {
constructor() { } constructor() { }
ngOnInit() { ngOnInit() {
} }
} }
<div class="container">
<div class="layout">
<div class="content">
<div class="questionTitle hospitalTitle">过去两年内因为疾病或意外有过住院或手术吗?</div>
<ul class="jobContent">
<li class="selected">
</li>
<li>
</li>
</ul>
</div>
<div class="content_footer">
<div routerLink="/question10">&lt;</div>
<div routerLink="/question12" class="next">下一步</div>
</div>
</div>
</div>
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Page11Component } from './page11.component';
describe('Page11Component', () => {
let component: Page11Component;
let fixture: ComponentFixture<Page11Component>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ Page11Component ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(Page11Component);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-page11',
templateUrl: './page11.component.html',
styleUrls: ['./page11.component.css']
})
export class Page11Component implements OnInit {
constructor() { }
ngOnInit() {
}
}
<div class="container">
<div class="layout">
<div class="content">
<div class="questionTitle hospitalTitle">过去两年内因为疾病或意外有过住院或手术吗?</div>
<ul class="jobContent">
<li class="selected">
本人
</li>
<li>
配偶
</li>
<li>
小孩
</li>
<li>
</li>
</ul>
</div>
<div class="content_footer">
<div routerLink="/question11">&lt;</div>
<div routerLink="/question13" class="next">下一步</div>
</div>
</div>
</div>
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Page12Component } from './page12.component';
describe('Page12Component', () => {
let component: Page12Component;
let fixture: ComponentFixture<Page12Component>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ Page12Component ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(Page12Component);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-page12',
templateUrl: './page12.component.html',
styleUrls: ['./page12.component.css']
})
export class Page12Component implements OnInit {
constructor() { }
ngOnInit() {
}
}
<div class="container">
<div class="layout">
<div class="content">
<div class="questionTitle hospitalTitle">是否抽烟?(抽烟大于400支年,支年= 每日抽烟支数 * 烟龄)</div>
<ul class="jobContent">
<li class="selected">
</li>
<li>
</li>
</ul>
</div>
<div class="content_footer">
<div routerLink="/question12">&lt;</div>
<div routerLink="/question14" class="next">下一步</div>
</div>
</div>
</div>
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Page13Component } from './page13.component';
describe('Page13Component', () => {
let component: Page13Component;
let fixture: ComponentFixture<Page13Component>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ Page13Component ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(Page13Component);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-page13',
templateUrl: './page13.component.html',
styleUrls: ['./page13.component.css']
})
export class Page13Component implements OnInit {
constructor() { }
ngOnInit() {
}
}
<div class="container">
<div class="layout">
<div class="content">
<div class="questionTitle hospitalTitle">是否抽烟?(抽烟大于400支年,支年= 每日抽烟支数 * 烟龄)</div>
<ul class="jobContent">
<li class="selected">
本人
</li>
<li>
配偶
</li>
<li>
</li>
</ul>
</div>
<div class="content_footer">
<div routerLink="/question13">&lt;</div>
<div routerLink="/question15" class="next">下一步</div>
</div>
</div>
</div>
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Page14Component } from './page14.component';
describe('Page14Component', () => {
let component: Page14Component;
let fixture: ComponentFixture<Page14Component>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ Page14Component ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(Page14Component);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-page14',
templateUrl: './page14.component.html',
styleUrls: ['./page14.component.css']
})
export class Page14Component implements OnInit {
constructor() { }
ngOnInit() {
}
}
<div class="container">
<div class="layout ">
<div class="content">
<div class="questionTitle">您在哪个城市经常居住?</div>
<ul class="cityContent">
<li class="selected"></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
<li></li>
</ul>
</div>
<div class="content_footer">
<div routerLink="/question13">&lt;</div>
<div routerLink="/question15" class="next">下一步</div>
</div>
</div>
</div>
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Page15Component } from './page15.component';
describe('Page15Component', () => {
let component: Page15Component;
let fixture: ComponentFixture<Page15Component>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ Page15Component ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(Page15Component);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-page15',
templateUrl: './page15.component.html',
styleUrls: ['./page15.component.css']
})
export class Page15Component implements OnInit {
constructor() { }
ngOnInit() {
}
}
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Page16Component } from './page16.component';
describe('Page16Component', () => {
let component: Page16Component;
let fixture: ComponentFixture<Page16Component>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ Page16Component ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(Page16Component);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-page16',
templateUrl: './page16.component.html',
styleUrls: ['./page16.component.css']
})
export class Page16Component implements OnInit {
constructor() { }
ngOnInit() {
}
}
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { Page17Component } from './page17.component';
describe('Page17Component', () => {
let component: Page17Component;
let fixture: ComponentFixture<Page17Component>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ Page17Component ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(Page17Component);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-page17',
templateUrl: './page17.component.html',
styleUrls: ['./page17.component.css']
})
export class Page17Component implements OnInit {
constructor() { }
ngOnInit() {
}
}

566 KB | W: | H:

389 KB | W: | H:

questionnair/src/assets/images/bg_1.png
questionnair/src/assets/images/bg_1.png
questionnair/src/assets/images/bg_1.png
questionnair/src/assets/images/bg_1.png
  • 2-up
  • Swipe
  • Onion skin

566 KB | W: | H:

390 KB | W: | H:

questionnair/src/assets/images/bg_10.png
questionnair/src/assets/images/bg_10.png
questionnair/src/assets/images/bg_10.png
questionnair/src/assets/images/bg_10.png
  • 2-up
  • Swipe
  • Onion skin

566 KB | W: | H:

429 KB | W: | H:

questionnair/src/assets/images/bg_17.png
questionnair/src/assets/images/bg_17.png
questionnair/src/assets/images/bg_17.png
questionnair/src/assets/images/bg_17.png
  • 2-up
  • Swipe
  • Onion skin

566 KB | W: | H:

387 KB | W: | H:

questionnair/src/assets/images/bg_6.png
questionnair/src/assets/images/bg_6.png
questionnair/src/assets/images/bg_6.png
questionnair/src/assets/images/bg_6.png
  • 2-up
  • Swipe
  • Onion skin

7.55 KB | W: | H:

8.11 KB | W: | H:

questionnair/src/assets/images/icon1.png
questionnair/src/assets/images/icon1.png
questionnair/src/assets/images/icon1.png
questionnair/src/assets/images/icon1.png
  • 2-up
  • Swipe
  • Onion skin

14 KB | W: | H:

12 KB | W: | H:

questionnair/src/assets/images/icon2.png
questionnair/src/assets/images/icon2.png
questionnair/src/assets/images/icon2.png
questionnair/src/assets/images/icon2.png
  • 2-up
  • Swipe
  • Onion skin

10.3 KB | W: | H:

10.9 KB | W: | H:

questionnair/src/assets/images/icon3.png
questionnair/src/assets/images/icon3.png
questionnair/src/assets/images/icon3.png
questionnair/src/assets/images/icon3.png
  • 2-up
  • Swipe
  • Onion skin

15.9 KB | W: | H:

16.5 KB | W: | H:

questionnair/src/assets/images/icon4.png
questionnair/src/assets/images/icon4.png
questionnair/src/assets/images/icon4.png
questionnair/src/assets/images/icon4.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -15,22 +15,43 @@ img{ ...@@ -15,22 +15,43 @@ img{
ul li,ol li{ ul li,ol li{
list-style: none; list-style: none;
} }
.container{
padding:0;
}
.layout{ .layout{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden; overflow: hidden;
padding:10px; padding:0 10px;
height:100%;
} }
.layout.wrapper{ .layout.wrapper{
padding:0; padding:0;
} }
/* .layout.cityLayout{
padding:10px 0;
} */
.content{ .content{
height: 100%; max-height: 580px;
overflow: auto;
} }
/* .layout.cityLayout .questionTitle{
margin:0 10px;
} */
.questionTitle{ .questionTitle{
color:#ec2d37; color:#ec2d37;
font-size: 26px; font-size: 26px;
margin-bottom: 15%; height: 70px;
line-height: 70px;
width: 100%;
display: flex;
}
.questionTitle span{
color: rgba(3,177, 153)
}
.questionTitle.hospitalTitle{
line-height: unset;
margin: 25px auto 15px auto;
} }
.content_footer{ .content_footer{
display: flex; display: flex;
...@@ -55,19 +76,57 @@ ul li,ol li{ ...@@ -55,19 +76,57 @@ ul li,ol li{
flex: 0 0 60%; flex: 0 0 60%;
font-weight: 500; font-weight: 500;
} }
.jobContent{ .jobContent,.income,.cityContent{
width: 100%; width: 100%;
} }
.jobContent li{ .jobContent li,.income li,.cityContent li{
width: 100%; width: 100%;
height: 60px; height: 55px;
line-height: 60px; line-height: 55px;
border: 1px #8a8a8a solid; border: 1px #8a8a8a solid;
margin-bottom: 10px; margin-bottom: 15px;
border-radius: 4px; border-radius: 4px;
box-sizing: border-box; box-sizing: border-box;
padding-left: 5%; padding-left: 5%;
} }
.jobContent li.selected{ .jobContent li.selected,.income li.selected{
border: 1px #ff0000 solid; border: 1px #ff0000 solid;
}
.cityContent{
display: flex;
flex-wrap: wrap;
}
.income{
display: flex;
flex-wrap: wrap;
}
.income li{
width: 49%;
float: left;
margin-right: 2%;
text-align: center;
padding-left: 0;
}
.income li:nth-child(2),.income li:nth-child(4),.income li:nth-child(6){
margin-right: 0;
}
.cityContent li{
width:12%;
height: 46px;
line-height: 46px;
text-align: center;
padding-left: 0;
margin-left: 1%;
margin-right: 1%;
border:none;
-moz-box-shadow:0px 3px 7px rgb(206, 208, 210);
-webkit-box-shadow:0px 3px 7px rgb(206, 208, 210);
box-shadow:0px 3px 7px rgb(206, 208, 210);
}
.cityContent li:nth-child(7),.cityContent li:nth-child(14),.cityContent li:nth-child(21),.cityContent li:nth-child(28){
margin-right: 0;
}
.cityContent li.selected{
background: rgba(148,209, 204)
} }
\ No newline at end of file
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