Compare commits

..

No commits in common. 'c765b16ca91404b963eaf3d58a6b9698481dfc4b' and 'bc7dfc02f0a25a2c1db328cced0146dc03946bed' have entirely different histories.

  1. 4
      src/app/ui/four-step/four-step.component.html
  2. 5
      src/app/ui/four-step/four-step.component.scss
  3. 11
      src/app/ui/four-step/four-step.component.ts
  4. 4
      src/app/ui/luck-draw/luck-draw.component.html
  5. 4
      src/app/ui/luck-draw/luck-draw.component.ts

4
src/app/ui/four-step/four-step.component.html

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-09-25 08:48:50
* @LastEditors: sueRimn
* @LastEditTime: 2020-10-18 10:45:51
* @LastEditTime: 2020-10-14 09:08:17
-->
<div class="box">
<div class="head">
@ -68,7 +68,7 @@
</div>
<div class="chongzhi" style="height: 20%;"><button type="button" (click)="nextStep()" class="button">下一步</button></div>
</div>
</div>

5
src/app/ui/four-step/four-step.component.scss

@ -41,11 +41,6 @@
padding: 0.125rem 0.125rem 0;
display: flex;
}
.chongzhi{
position: relative;
top: 85%;
right: 17%;
}
.centerLeft{
background-color: #FFF;

11
src/app/ui/four-step/four-step.component.ts

@ -1,11 +1,3 @@
/*
* @Descripttion:
* @version:
* @Author: sueRimn
* @Date: 2020-10-18 10:23:46
* @LastEditors: sueRimn
* @LastEditTime: 2020-10-18 10:47:51
*/
import { Component, OnInit } from '@angular/core';
import '../../../assets/js/fourstep'
@Component({
@ -84,8 +76,5 @@ export class FourStepComponent implements OnInit {
this.isDraw = false
}
}
nextStep(){
window.location.href="/drawingResult";
}
}

4
src/app/ui/luck-draw/luck-draw.component.html

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-09-25 08:48:50
* @LastEditors: sueRimn
* @LastEditTime: 2020-10-18 10:41:21
* @LastEditTime: 2020-10-18 10:15:32
-->
<html>
@ -50,7 +50,7 @@
</div>
</div>
<div class="chongzhi" style="height: 20%;"><button type="button" (click)="nextStep()" class="button">下一步</button></div>
<div class="chongzhi" style="height: 20%;"><button type="button" [routerLink]="['/fourStep/']" class="button">下一步</button></div>
</div>

4
src/app/ui/luck-draw/luck-draw.component.ts

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-09-25 08:48:50
* @LastEditors: sueRimn
* @LastEditTime: 2020-10-18 10:42:13
* @LastEditTime: 2020-10-18 10:39:53
*/
import { Component, OnInit } from '@angular/core';
import { from } from 'rxjs';
@ -66,7 +66,7 @@ export class LuckDrawComponent implements OnInit {
//跳转第三个页面
nextStep(){
window.location.href="/fourStep";
window.location.href="/twoStep";
}

Loading…
Cancel
Save