Skip to content

A
allCampaign
Commit 58f5d096 by Chao Sun
Options

样式修改

parent fe2dbc64
Showing with 118 additions and 39 deletions
questionnaire/angular.json
...@@ -23,10 +23,13 @@ ...@@ -23,10 +23,13 @@
"src/assets" "src/assets"
], ],
"styles": [ "styles": [
"./node_modules/bootstrap/dist/css/bootstrap.min.css",
"src/styles.css" "src/styles.css"
], ],
"scripts": [], "scripts": [],
"es5BrowserSupport": true "es5BrowserSupport": true,
"baseHref": "/questionnaire/",
"deployUrl": "/questionnaire/"
}, },
"configurations": { "configurations": {
"production": { "production": {
...@@ -52,6 +55,48 @@ ...@@ -52,6 +55,48 @@
"maximumError": "5mb" "maximumError": "5mb"
} }
] ]
},
"dev": {
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
}
]
},
"stage": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.stage.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
}
]
} }
} }
}, },
...@@ -80,6 +125,7 @@ ...@@ -80,6 +125,7 @@
"tsConfig": "src/tsconfig.spec.json", "tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js", "karmaConfig": "src/karma.conf.js",
"styles": [ "styles": [
"./node_modules/bootstrap/dist/css/bootstrap.min.css",
"src/styles.css" "src/styles.css"
], ],
"scripts": [], "scripts": [],
......
questionnaire/package-lock.json
...@@ -535,9 +535,9 @@ ...@@ -535,9 +535,9 @@
} }
}, },
"@babel/parser": { "@babel/parser": {
"version": "7.4.4", "version": "7.4.5",
"resolved": "https://registry.npm.taobao.org/@babel/parser/download/@babel/parser-7.4.4.tgz", "resolved": "https://registry.npm.taobao.org/@babel/parser/download/@babel/parser-7.4.5.tgz",
"integrity": "sha1-WXcSlDG4/jNHFzDSVc6GVK4SULY=", "integrity": "sha1-BK+NXVorBEoqG/+sweXmZzVE6HI=",
"dev": true "dev": true
}, },
"@babel/template": { "@babel/template": {
...@@ -552,16 +552,16 @@ ...@@ -552,16 +552,16 @@
} }
}, },
"@babel/traverse": { "@babel/traverse": {
"version": "7.4.4", "version": "7.4.5",
"resolved": "https://registry.npm.taobao.org/@babel/traverse/download/@babel/traverse-7.4.4.tgz", "resolved": "https://registry.npm.taobao.org/@babel/traverse/download/@babel/traverse-7.4.5.tgz",
"integrity": "sha1-B3bwOPbXg2GGC2gjiH1POTcTP+g=", "integrity": "sha1-TpLRco/S8Yl9r90yHvv/khVsMhY=",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/code-frame": "^7.0.0", "@babel/code-frame": "^7.0.0",
"@babel/generator": "^7.4.4", "@babel/generator": "^7.4.4",
"@babel/helper-function-name": "^7.1.0", "@babel/helper-function-name": "^7.1.0",
"@babel/helper-split-export-declaration": "^7.4.4", "@babel/helper-split-export-declaration": "^7.4.4",
"@babel/parser": "^7.4.4", "@babel/parser": "^7.4.5",
"@babel/types": "^7.4.4", "@babel/types": "^7.4.4",
"debug": "^4.1.0", "debug": "^4.1.0",
"globals": "^11.1.0", "globals": "^11.1.0",
...@@ -1609,6 +1609,11 @@ ...@@ -1609,6 +1609,11 @@
"multicast-dns-service-types": "^1.1.0" "multicast-dns-service-types": "^1.1.0"
} }
}, },
"bootstrap": {
"version": "3.4.1",
"resolved": "http://registry.npm.taobao.org/bootstrap/download/bootstrap-3.4.1.tgz",
"integrity": "sha1-w6NH1Bniia0R9AM+PEEyuHwIHXI="
},
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"resolved": "http://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz", "resolved": "http://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz",
...@@ -1883,9 +1888,9 @@ ...@@ -1883,9 +1888,9 @@
} }
}, },
"caniuse-lite": { "caniuse-lite": {
"version": "1.0.30000969", "version": "1.0.30000971",
"resolved": "https://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30000969.tgz", "resolved": "https://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30000971.tgz",
"integrity": "sha1-dmT1cfIHJle95wsAofwbpB8ZQqk=", "integrity": "sha1-0QAORUZIaml3dWVHNSvJakz9KxM=",
"dev": true "dev": true
}, },
"canonical-path": { "canonical-path": {
...@@ -2334,9 +2339,9 @@ ...@@ -2334,9 +2339,9 @@
} }
}, },
"core-js": { "core-js": {
"version": "2.6.6", "version": "2.6.8",
"resolved": "https://registry.npm.taobao.org/core-js/download/core-js-2.6.6.tgz", "resolved": "https://registry.npm.taobao.org/core-js/download/core-js-2.6.8.tgz",
"integrity": "sha1-AOtta/gVRxzBbYVj7dfTh4bexQs=" "integrity": "sha1-3DoeYzoEJnlE4MuFDTiA80AkgTk="
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -2801,9 +2806,9 @@ ...@@ -2801,9 +2806,9 @@
"dev": true "dev": true
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.3.135", "version": "1.3.136",
"resolved": "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.135.tgz", "resolved": "https://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.136.tgz",
"integrity": "sha1-9XmblfK82N4XzeR9Yzktg6RHcEE=", "integrity": "sha1-dYoVYQkHdTZ4DPqCB7GuqpmEPjM=",
"dev": true "dev": true
}, },
"elliptic": { "elliptic": {
...@@ -4679,7 +4684,7 @@ ...@@ -4679,7 +4684,7 @@
}, },
"pkg-dir": { "pkg-dir": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "http://registry.npm.taobao.org/pkg-dir/download/pkg-dir-3.0.0.tgz", "resolved": "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-3.0.0.tgz",
"integrity": "sha1-J0kCDyOe2ZCIGx9xIQ1R62UjvqM=", "integrity": "sha1-J0kCDyOe2ZCIGx9xIQ1R62UjvqM=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -6412,9 +6417,9 @@ ...@@ -6412,9 +6417,9 @@
} }
}, },
"node-releases": { "node-releases": {
"version": "1.1.19", "version": "1.1.20",
"resolved": "https://registry.npm.taobao.org/node-releases/download/node-releases-1.1.19.tgz", "resolved": "https://registry.npm.taobao.org/node-releases/download/node-releases-1.1.20.tgz",
"integrity": "sha1-xJLR44H+oDULM4tkbCeGfojpGz0=", "integrity": "sha1-93+fmk/LIudLqI/hVzKjqLA3FG0=",
"dev": true, "dev": true,
"requires": { "requires": {
"semver": "^5.3.0" "semver": "^5.3.0"
...@@ -7160,7 +7165,7 @@ ...@@ -7160,7 +7165,7 @@
}, },
"pkg-dir": { "pkg-dir": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "http://registry.npm.taobao.org/pkg-dir/download/pkg-dir-2.0.0.tgz", "resolved": "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-2.0.0.tgz",
"integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9230,7 +9235,7 @@ ...@@ -9230,7 +9235,7 @@
}, },
"pkg-dir": { "pkg-dir": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "http://registry.npm.taobao.org/pkg-dir/download/pkg-dir-3.0.0.tgz", "resolved": "https://registry.npm.taobao.org/pkg-dir/download/pkg-dir-3.0.0.tgz",
"integrity": "sha1-J0kCDyOe2ZCIGx9xIQ1R62UjvqM=", "integrity": "sha1-J0kCDyOe2ZCIGx9xIQ1R62UjvqM=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9517,9 +9522,9 @@ ...@@ -9517,9 +9522,9 @@
"dev": true "dev": true
}, },
"uglify-js": { "uglify-js": {
"version": "3.5.13", "version": "3.5.15",
"resolved": "https://registry.npm.taobao.org/uglify-js/download/uglify-js-3.5.13.tgz", "resolved": "https://registry.npm.taobao.org/uglify-js/download/uglify-js-3.5.15.tgz",
"integrity": "sha1-0tiFe1mNd/h2SuO/z5C7HfE00r0=", "integrity": "sha1-/itTeP0LCeEWhkBBQ3v/iJEFziQ=",
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
...@@ -9822,7 +9827,7 @@ ...@@ -9822,7 +9827,7 @@
}, },
"webpack": { "webpack": {
"version": "4.29.0", "version": "4.29.0",
"resolved": "https://registry.npm.taobao.org/webpack/download/webpack-4.29.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack%2Fdownload%2Fwebpack-4.29.0.tgz", "resolved": "https://registry.npm.taobao.org/webpack/download/webpack-4.29.0.tgz",
"integrity": "sha1-8s/vg/euQEuoif9dQ+/Shcom51A=", "integrity": "sha1-8s/vg/euQEuoif9dQ+/Shcom51A=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -10369,7 +10374,7 @@ ...@@ -10369,7 +10374,7 @@
}, },
"xmlbuilder": { "xmlbuilder": {
"version": "9.0.7", "version": "9.0.7",
"resolved": "https://registry.npm.taobao.org/xmlbuilder/download/xmlbuilder-9.0.7.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxmlbuilder%2Fdownload%2Fxmlbuilder-9.0.7.tgz", "resolved": "https://registry.npm.taobao.org/xmlbuilder/download/xmlbuilder-9.0.7.tgz",
"integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
"dev": true "dev": true
}, },
......
questionnaire/package.json
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
"@angular/platform-browser": "~7.2.0", "@angular/platform-browser": "~7.2.0",
"@angular/platform-browser-dynamic": "~7.2.0", "@angular/platform-browser-dynamic": "~7.2.0",
"@angular/router": "~7.2.0", "@angular/router": "~7.2.0",
"bootstrap": "^3.4.1",
"core-js": "^2.5.4", "core-js": "^2.5.4",
"rxjs": "~6.3.3", "rxjs": "~6.3.3",
"tslib": "^1.9.0", "tslib": "^1.9.0",
......
questionnaire/src/app/age/age.component.ts
...@@ -81,15 +81,11 @@ export class AgeComponent implements OnInit { ...@@ -81,15 +81,11 @@ export class AgeComponent implements OnInit {
} else { } else {
return; return;
} }
console.log(this.curPageData);
}); });
} }
// 选择年龄 // 选择年龄
selectedAge(options) { selectedAge(options) {
// debugger;
// console.log(this.curQues);
// console.log(options);
const question = { const question = {
questionId: this.curQues.questionId, questionId: this.curQues.questionId,
questionSubId: this.curQues.questionSubId, questionSubId: this.curQues.questionSubId,
...@@ -121,8 +117,6 @@ export class AgeComponent implements OnInit { ...@@ -121,8 +117,6 @@ export class AgeComponent implements OnInit {
} }
} }
this.pageAnswers.questions.push(question); this.pageAnswers.questions.push(question);
// console.log(this.pageAnswers);
// console.log(this.curPageData);
this.commonService.addAnswer(this.pageAnswers); this.commonService.addAnswer(this.pageAnswers);
this.closeToast(); this.closeToast();
// console.log(this.pageAnswers); // console.log(this.pageAnswers);
...@@ -143,7 +137,7 @@ export class AgeComponent implements OnInit { ...@@ -143,7 +137,7 @@ export class AgeComponent implements OnInit {
question['options'][i]['selected'] = false question['options'][i]['selected'] = false
} }
} }
// if( )
} }
closeToast() { closeToast() {
......
questionnaire/src/app/app.component.html
<router-outlet></router-outlet> <div class="container">
<router-outlet>
</router-outlet>
</div>
questionnaire/src/app/children-health/children-health.component.ts
...@@ -136,7 +136,6 @@ export class ChildrenHealthComponent implements OnInit { ...@@ -136,7 +136,6 @@ export class ChildrenHealthComponent implements OnInit {
} }
} }
} }
console.log(this.curPageData['questions'])
} }
}) })
} }
......
questionnaire/src/app/health/health.component.ts
...@@ -130,7 +130,6 @@ export class HealthComponent implements OnInit { ...@@ -130,7 +130,6 @@ export class HealthComponent implements OnInit {
options: this.questions options: this.questions
}], }],
}; };
console.log(this.pageAnswers)
this.commonService.addAnswer(this.pageAnswers); this.commonService.addAnswer(this.pageAnswers);
if (this.curPageData['questions'].length == this.pageAnswers.questions.length) { if (this.curPageData['questions'].length == this.pageAnswers.questions.length) {
if (this.pageAnswers.questions.every(item => item.options.length > 0)) { if (this.pageAnswers.questions.every(item => item.options.length > 0)) {
......
questionnaire/src/app/live/live.component.html
...@@ -41,3 +41,7 @@ ...@@ -41,3 +41,7 @@
</ul> </ul>
</div> </div>
</div> </div>
<!--提示框-->
<div id="errTips" *ngIf="this.tipsFlag">
提交失败请稍后再试
</div>
\ No newline at end of file
questionnaire/src/app/live/live.component.ts
...@@ -24,7 +24,7 @@ export class LiveComponent implements OnInit { ...@@ -24,7 +24,7 @@ export class LiveComponent implements OnInit {
type: any; type: any;
nextBtn: boolean; nextBtn: boolean;
lastQuestions: Array<any>; lastQuestions: Array<any>;
tipsFlag:boolean;
constructor(private commonService: CommonService, constructor(private commonService: CommonService,
private router: Router, private router: Router,
private route: ActivatedRoute) { private route: ActivatedRoute) {
...@@ -42,6 +42,7 @@ export class LiveComponent implements OnInit { ...@@ -42,6 +42,7 @@ export class LiveComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.nextBtn = false; this.nextBtn = false;
this.showAddress = false; this.showAddress = false;
this.tipsFlag = false;
this.lastQuestions = this.commonService.todosCopy.filter(item => item.pageId == 16).pop(); 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 => {
...@@ -160,6 +161,10 @@ export class LiveComponent implements OnInit { ...@@ -160,6 +161,10 @@ export class LiveComponent implements OnInit {
if (res['success']) { if (res['success']) {
this.router.navigate(['/transit3']); this.router.navigate(['/transit3']);
} else { } else {
this.tipsFlag = true;
setTimeout(()=>{
this.tipsFlag = false;
},2000)
} }
}); });
} else { } else {
......
questionnaire/src/app/transit/transit.component.html
<div class="limbo"> <div class="limbo">
<div class="title"> <div class="title">
<img src="assets/images/bg_1.png" /> <img src="assets/images/bg_1.png" />
...@@ -10,3 +11,4 @@ ...@@ -10,3 +11,4 @@
<div>获取家庭分析报告</div> <div>获取家庭分析报告</div>
</div> </div>
</div> </div>
questionnaire/src/styles.css
...@@ -21,6 +21,9 @@ ul li,ol li{ ...@@ -21,6 +21,9 @@ ul li,ol li{
padding: 0; padding: 0;
height: 100%; height: 100%;
} }
.title{
text-align: center;
}
.wrapper{ .wrapper{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -259,4 +262,19 @@ ul li,ol li{ ...@@ -259,4 +262,19 @@ ul li,ol li{
width: 80%; width: 80%;
margin:15% auto; margin:15% auto;
text-align: center; text-align: center;
}
#errTips{
width: 60%;
height: 60px;
position: fixed;
background-color: rgba(0, 0, 0, 0.7);
top: 45%;
right: 0;
bottom: 0;
left: 0;
margin: 0 auto;
border-radius: 10px;
color: #fff;
text-align: center;
line-height: 60px;
} }
\ 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