diff --git a/package-lock.json b/package-lock.json index d275bfc..5b2bab3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16640,7 +16640,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -16683,7 +16684,8 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", @@ -16694,7 +16696,8 @@ "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -16811,7 +16814,8 @@ "inherits": { "version": "2.0.4", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -16823,6 +16827,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -16852,6 +16857,7 @@ "version": "2.9.0", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -16870,6 +16876,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -16972,6 +16979,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -17057,7 +17065,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -17093,6 +17102,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -17112,6 +17122,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -17155,12 +17166,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -17598,7 +17611,8 @@ "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -17715,7 +17729,8 @@ "inherits": { "version": "2.0.4", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -17757,6 +17772,7 @@ "version": "2.9.0", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -17775,6 +17791,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -17877,6 +17894,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -17962,7 +17980,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -17998,6 +18017,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -18061,12 +18081,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 4251d83..0766107 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -39,10 +39,9 @@ const routes: Routes = [ {path:'drawingResult', component:DrawingResultComponent} // {path:'login', // component:LoginComponent}, - // {path:'getNoMToken', - // component:MTokenK1Component, canActivate: [AuthGuard],}, //K1秘钥验证失败是跳转页面 - + // component:MTokenK1Component, + // canActivate: [AuthGuard]}, //K1秘钥验证失败是跳转页面 // {path:'lockscreen', // component:LockscreenComponent, // canActivate: [AuthGuard]}//守卫验证 diff --git a/src/app/auth.guard.ts b/src/app/auth.guard.ts index b01fc58..9ebb4e4 100644 --- a/src/app/auth.guard.ts +++ b/src/app/auth.guard.ts @@ -19,13 +19,13 @@ export class AuthGuard implements CanActivate { checkLogin(): boolean { // 判断本地有没有token - const token = sessionStorage.getItem('token'); + const arr = sessionStorage.getItem('arr'); // 如果有token,允许访问 - if (token) { return true; } + if (arr) { return true; } //如果没有token,跳转登录页 - this.router.navigate(['/login']); + this.router.navigate(['']); return false; } } diff --git a/src/app/ui/drawing-result/drawing-result.component.html b/src/app/ui/drawing-result/drawing-result.component.html index 373294d..6782094 100644 --- a/src/app/ui/drawing-result/drawing-result.component.html +++ b/src/app/ui/drawing-result/drawing-result.component.html @@ -5,7 +5,7 @@
上一步
-

业务理论考试

+

业务理论考试结果

@@ -22,8 +22,8 @@
{{header}}
-

指挥能力考评

- +

指挥能力考评结果

+
diff --git a/src/app/ui/drawing-result/drawing-result.component.scss b/src/app/ui/drawing-result/drawing-result.component.scss index b367903..35e61b6 100644 --- a/src/app/ui/drawing-result/drawing-result.component.scss +++ b/src/app/ui/drawing-result/drawing-result.component.scss @@ -38,7 +38,7 @@ cursor: pointer; } h3 { - font-size: 26px; + font-size: 33px; color: #fff; margin: 30px 0; } diff --git a/src/app/ui/drawing-result/drawing-result.component.ts b/src/app/ui/drawing-result/drawing-result.component.ts index 53b3415..b197826 100644 --- a/src/app/ui/drawing-result/drawing-result.component.ts +++ b/src/app/ui/drawing-result/drawing-result.component.ts @@ -10,11 +10,30 @@ export class DrawingResultComponent implements OnInit { constructor(private router: Router) { } isOne = false + isTwo = false ngOnInit(): void { if(this.router.url == '/drawingResult?type=1'){ this.isOne = false + this.isTwo = true + this.tableData = [ + {order: 1, fireName: '南宁支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[0], num: localStorage.getItem('0') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("南宁支队seatnumber")).zhi,JSON.parse(localStorage.getItem("南宁支队seatnumber")).fuzhi] }, + {order: 2, fireName: '柳州支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[1], num: localStorage.getItem('1') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("柳州支队seatnumber")).zhi,JSON.parse(localStorage.getItem("柳州支队seatnumber")).fuzhi] }, + {order: 3, fireName: '桂林支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[2], num: localStorage.getItem('2') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("桂林支队seatnumber")).zhi,JSON.parse(localStorage.getItem("桂林支队seatnumber")).fuzhi] }, + {order: 4, fireName: '梧州支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[3], num: localStorage.getItem('3') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("梧州支队seatnumber")).zhi,JSON.parse(localStorage.getItem("梧州支队seatnumber")).fuzhi] }, + {order: 5, fireName: '北海支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[4], num: localStorage.getItem('4') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("北海支队seatnumber")).zhi,JSON.parse(localStorage.getItem("北海支队seatnumber")).fuzhi] }, + {order: 6, fireName: '防城港支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[5], num: localStorage.getItem('5') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("防城港支队seatnumber")).zhi,JSON.parse(localStorage.getItem("防城港支队seatnumber")).fuzhi] }, + {order: 7, fireName: '钦州支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[6], num: localStorage.getItem('6') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("钦州支队seatnumber")).zhi,JSON.parse(localStorage.getItem("钦州支队seatnumber")).fuzhi] }, + {order: 8, fireName: '贵港支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[7], num: localStorage.getItem('7') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("贵港支队seatnumber")).zhi,JSON.parse(localStorage.getItem("贵港支队seatnumber")).fuzhi] }, + {order: 9, fireName: '玉林支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[8], num: localStorage.getItem('8') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("玉林支队seatnumber")).zhi,JSON.parse(localStorage.getItem("玉林支队seatnumber")).fuzhi] }, + {order: 10, fireName: '百色支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[9], num: localStorage.getItem('9') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("百色支队seatnumber")).zhi,JSON.parse(localStorage.getItem("百色支队seatnumber")).fuzhi] }, + {order: 11, fireName: '贺州支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[10], num: localStorage.getItem('10') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("贺州支队seatnumber")).zhi,JSON.parse(localStorage.getItem("贺州支队seatnumber")).fuzhi] }, + {order: 12, fireName: '河池支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[11], num: localStorage.getItem('11') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("河池支队seatnumber")).zhi,JSON.parse(localStorage.getItem("河池支队seatnumber")).fuzhi] }, + {order: 13, fireName: '来宾支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[12], num: localStorage.getItem('12') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("来宾支队seatnumber")).zhi,JSON.parse(localStorage.getItem("来宾支队seatnumber")).fuzhi] }, + {order: 14, fireName: '崇左支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[13], num: localStorage.getItem('13') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("崇左支队seatnumber")).zhi,JSON.parse(localStorage.getItem("崇左支队seatnumber")).fuzhi] }, + ] }else{ this.isOne = true + this.isTwo = false this.tableDataZero = [ {order: 1, fireName: '南宁支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[0] , name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("南宁支队seatnumbercopy")).zhi || '',JSON.parse(localStorage.getItem("南宁支队seatnumbercopy")).fuzhi || ''] }, {order: 2, fireName: '柳州支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[1], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("柳州支队seatnumbercopy")).zhi || '',JSON.parse(localStorage.getItem("柳州支队seatnumbercopy")).fuzhi || ''] }, @@ -35,27 +54,10 @@ export class DrawingResultComponent implements OnInit { } headersZero:string [] = ['序号','支队名称','抽签顺序', '职级','座位号'] - tableDataZero = [ - - ] + tableDataZero = [] headers:string [] = ['序号','支队名称','抽签顺序','场景类型', '职级','座位号'] - tableData = [ - {order: 1, fireName: '南宁支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[0], num: localStorage.getItem('0') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("南宁支队seatnumber")).zhi,JSON.parse(localStorage.getItem("南宁支队seatnumber")).fuzhi] }, - {order: 2, fireName: '柳州支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[1], num: localStorage.getItem('1') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("柳州支队seatnumber")).zhi,JSON.parse(localStorage.getItem("柳州支队seatnumber")).fuzhi] }, - {order: 3, fireName: '桂林支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[2], num: localStorage.getItem('2') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("桂林支队seatnumber")).zhi,JSON.parse(localStorage.getItem("桂林支队seatnumber")).fuzhi] }, - {order: 4, fireName: '梧州支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[3], num: localStorage.getItem('3') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("梧州支队seatnumber")).zhi,JSON.parse(localStorage.getItem("梧州支队seatnumber")).fuzhi] }, - {order: 5, fireName: '北海支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[4], num: localStorage.getItem('4') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("北海支队seatnumber")).zhi,JSON.parse(localStorage.getItem("北海支队seatnumber")).fuzhi] }, - {order: 6, fireName: '防城港支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[5], num: localStorage.getItem('5') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("防城港支队seatnumber")).zhi,JSON.parse(localStorage.getItem("防城港支队seatnumber")).fuzhi] }, - {order: 7, fireName: '钦州支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[6], num: localStorage.getItem('6') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("钦州支队seatnumber")).zhi,JSON.parse(localStorage.getItem("钦州支队seatnumber")).fuzhi] }, - {order: 8, fireName: '贵港支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[7], num: localStorage.getItem('7') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("贵港支队seatnumber")).zhi,JSON.parse(localStorage.getItem("贵港支队seatnumber")).fuzhi] }, - {order: 9, fireName: '玉林支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[8], num: localStorage.getItem('8') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("玉林支队seatnumber")).zhi,JSON.parse(localStorage.getItem("玉林支队seatnumber")).fuzhi] }, - {order: 10, fireName: '百色支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[9], num: localStorage.getItem('9') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("百色支队seatnumber")).zhi,JSON.parse(localStorage.getItem("百色支队seatnumber")).fuzhi] }, - {order: 11, fireName: '贺州支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[10], num: localStorage.getItem('10') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("贺州支队seatnumber")).zhi,JSON.parse(localStorage.getItem("贺州支队seatnumber")).fuzhi] }, - {order: 12, fireName: '河池支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[11], num: localStorage.getItem('11') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("河池支队seatnumber")).zhi,JSON.parse(localStorage.getItem("河池支队seatnumber")).fuzhi] }, - {order: 13, fireName: '来宾支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[12], num: localStorage.getItem('12') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("来宾支队seatnumber")).zhi,JSON.parse(localStorage.getItem("来宾支队seatnumber")).fuzhi] }, - {order: 14, fireName: '崇左支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr"))[13], num: localStorage.getItem('13') || '', name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("崇左支队seatnumber")).zhi,JSON.parse(localStorage.getItem("崇左支队seatnumber")).fuzhi] }, - ] + tableData = [] laststep(){ window.history.back(); } diff --git a/src/app/ui/first-step-copy/first-step-copy.component.scss b/src/app/ui/first-step-copy/first-step-copy.component.scss index f33532b..7bb9109 100644 --- a/src/app/ui/first-step-copy/first-step-copy.component.scss +++ b/src/app/ui/first-step-copy/first-step-copy.component.scss @@ -42,10 +42,10 @@ display: flex; .title{ position: absolute; - left: 28%; - top: 80px; + left: 27%; + top: 75px; color: white; - font-size: 22px; + font-size: 30px; } } .chongzhi{ diff --git a/src/app/ui/first-step-copy/first-step-copy.component.ts b/src/app/ui/first-step-copy/first-step-copy.component.ts index 3f9c168..92d50d5 100644 --- a/src/app/ui/first-step-copy/first-step-copy.component.ts +++ b/src/app/ui/first-step-copy/first-step-copy.component.ts @@ -11,7 +11,29 @@ export class FirstStepCopyComponent implements OnInit { constructor(private router: Router) { } ngOnInit(){ - + var arr2 = [1,2,3,4,5,6,7,8,9,10,11,12,13,14] + let p = arr2.sort(() => { + return Math.round(Math.random()) - 0.5; //返回随机值（大于0|小于0） + }) + var arrSeatcopy = [1,2,3,4,5,6,7,8,9,10,11,12,13,14] + var arrSeat2copy = [15,16,17,18,19,20,21,22,23,24,25,26,27,28] + let s = arrSeatcopy.sort(() => { + return Math.round(Math.random()) - 0.5; //返回随机值（大于0|小于0） + }) + let j = arrSeat2copy.sort(() => { + return Math.round(Math.random()) - 0.5; //返回随机值（大于0|小于0） + }) + if(!localStorage.getItem("arr2")){ + localStorage.setItem("arr2",JSON.stringify(p)) + } + if(!localStorage.getItem("arrSeatcopy")){ + localStorage.setItem("arrSeatcopy",JSON.stringify(s)) + } + if(!localStorage.getItem("arrSeat2copy")){ + localStorage.setItem("arrSeat2copy",JSON.stringify(j)) + } + let orgArr = ['南宁支队','柳州支队','桂林支队','梧州支队','北海支队','防城港支队','钦州支队','贵港支队','玉林支队','百色支队','贺州支队','河池支队','来宾支队','崇左支队',] + localStorage.setItem("orgArr",JSON.stringify(orgArr)) } //支队数据和是否抽奖 choujiang=[ diff --git a/src/app/ui/first-step/first-step.component.scss b/src/app/ui/first-step/first-step.component.scss index 569cf6e..218b8bf 100644 --- a/src/app/ui/first-step/first-step.component.scss +++ b/src/app/ui/first-step/first-step.component.scss @@ -43,10 +43,10 @@ position: relative; .title{ position: absolute; - left: 28%; - top: 36px; + left: 25%; + top: 25px; color: white; - font-size: 22px; + font-size: 30px; } } diff --git a/src/app/ui/first-step/first-step.component.ts b/src/app/ui/first-step/first-step.component.ts index 73df2a2..881ba41 100644 --- a/src/app/ui/first-step/first-step.component.ts +++ b/src/app/ui/first-step/first-step.component.ts @@ -13,51 +13,34 @@ export class FirstStepComponent implements OnInit { ngOnInit(){ var arr = [1,2,3,4,5,6,7,8,9,10,11,12,13,14] - var arr2 = [1,2,3,4,5,6,7,8,9,10,11,12,13,14] + var arrSeat = [1,2,3,4,5,6,7,8,9,10,11,12,13,14] var arrSeat2 = [15,16,17,18,19,20,21,22,23,24,25,26,27,28] - var arrSeatcopy = [1,2,3,4,5,6,7,8,9,10,11,12,13,14] - var arrSeat2copy = [15,16,17,18,19,20,21,22,23,24,25,26,27,28] + let x = arr.sort(() => { return Math.round(Math.random()) - 0.5; //返回随机值（大于0|小于0） }) - let p = arr2.sort(() => { - return Math.round(Math.random()) - 0.5; //返回随机值（大于0|小于0） - }) + let y = arrSeat.sort(() => { return Math.round(Math.random()) - 0.5; //返回随机值（大于0|小于0） }) let z = arrSeat2.sort(() => { return Math.round(Math.random()) - 0.5; //返回随机值（大于0|小于0） }) - let s = arrSeatcopy.sort(() => { - return Math.round(Math.random()) - 0.5; //返回随机值（大于0|小于0） - }) - let j = arrSeat2copy.sort(() => { - return Math.round(Math.random()) - 0.5; //返回随机值（大于0|小于0） - }) + if(!localStorage.getItem("arr")){ localStorage.setItem("arr",JSON.stringify(x)) } - if(!localStorage.getItem("arr2")){ - localStorage.setItem("arr2",JSON.stringify(p)) - } + if(!localStorage.getItem("arrSeat")){ localStorage.setItem("arrSeat",JSON.stringify(y)) } if(!localStorage.getItem("arrSeat2")){ localStorage.setItem("arrSeat2",JSON.stringify(z)) } - if(!localStorage.getItem("arrSeatcopy")){ - localStorage.setItem("arrSeatcopy",JSON.stringify(s)) - } - if(!localStorage.getItem("arrSeat2copy")){ - localStorage.setItem("arrSeat2copy",JSON.stringify(j)) - } - let orgArr = ['南宁支队','柳州支队','桂林支队','梧州支队','北海支队','防城港支队','钦州支队','贵港支队','玉林支队','百色支队','贺州支队','河池支队','来宾支队','崇左支队',] localStorage.setItem("orgArr",JSON.stringify(orgArr)) - localStorage.setItem("pagetype",'true') + } numList = [ diff --git a/src/app/ui/four-step-copy/four-step-copy.component.html b/src/app/ui/four-step-copy/four-step-copy.component.html index b3f7e56..a0d7f27 100644 --- a/src/app/ui/four-step-copy/four-step-copy.component.html +++ b/src/app/ui/four-step-copy/four-step-copy.component.html @@ -13,7 +13,7 @@
- 业务理论考试座位号抽签 + 业务理论考试座位号
diff --git a/src/app/ui/four-step-copy/four-step-copy.component.scss b/src/app/ui/four-step-copy/four-step-copy.component.scss index 5f125c4..6ec6d71 100644 --- a/src/app/ui/four-step-copy/four-step-copy.component.scss +++ b/src/app/ui/four-step-copy/four-step-copy.component.scss @@ -42,10 +42,10 @@ display: flex; .title{ position: absolute; - left: 28%; - top: 80px; + left: 27%; + top: 75px; color: white; - font-size: 22px; + font-size: 30px; } } diff --git a/src/app/ui/four-step/four-step.component.html b/src/app/ui/four-step/four-step.component.html index f12b5af..bc2b541 100644 --- a/src/app/ui/four-step/four-step.component.html +++ b/src/app/ui/four-step/four-step.component.html @@ -72,7 +72,7 @@
- +
diff --git a/src/app/ui/four-step/four-step.component.scss b/src/app/ui/four-step/four-step.component.scss index b24785b..0100ec6 100644 --- a/src/app/ui/four-step/four-step.component.scss +++ b/src/app/ui/four-step/four-step.component.scss @@ -42,16 +42,16 @@ display: flex; .title{ position: absolute; - left: 28%; - top: 80px; + left: 27%; + top: 75px; color: white; - font-size: 22px; + font-size: 30px; } } .chongzhi{ position: relative; top: 75%; - right: 23%; + right: 23.4%; } .centerLeft{ diff --git a/src/app/ui/luck-draw/luck-draw.component.scss b/src/app/ui/luck-draw/luck-draw.component.scss index 66c3316..97d0d1d 100644 --- a/src/app/ui/luck-draw/luck-draw.component.scss +++ b/src/app/ui/luck-draw/luck-draw.component.scss @@ -41,10 +41,10 @@ display: flex; .title{ position: absolute; - left: 28%; - top: 80px; + left: 24%; + top: 75px; color: white; - font-size: 22px; + font-size: 30px; } /* background-attachment: fixed; background-repeat:no-repeat; */
{{header}}