Merge branch 'master' of http://39.106.78.171:3000/nzdrtrt/Luck-Draw

4 years ago · 6ebb8b7df7
5 changed files with 22 additions and 6 deletions
--- a/src/app/ui/four-step/four-step.component.html
+++ b/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-14 09:08:17
+ * @LastEditTime: 2020-10-18 10:45:51
 -->
 <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>
            
--- a/src/app/ui/four-step/four-step.component.scss
+++ b/src/app/ui/four-step/four-step.component.scss
@ -41,6 +41,11 @@
    padding: 0.125rem 0.125rem 0;
    display: flex;
  }
+  .chongzhi{
+    position: relative;
+    top: 85%;
+    right: 17%;
+  }
  
  .centerLeft{
    background-color: #FFF;
--- a/src/app/ui/four-step/four-step.component.ts
+++ b/src/app/ui/four-step/four-step.component.ts
@ -1,3 +1,11 @@
+/*
+ * @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({
@ -76,5 +84,8 @@ export class FourStepComponent implements OnInit {
      this.isDraw = false
    }
  }
+  nextStep(){
+    window.location.href="/drawingResult";
+  }

 }
--- a/src/app/ui/luck-draw/luck-draw.component.html
+++ b/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:15:32
+ * @LastEditTime: 2020-10-18 10:41:21
 -->

 <html>
@ -50,7 +50,7 @@
 				</div>
 				
 			</div>
-			<div  class="chongzhi" style="height: 20%;"><button type="button" [routerLink]="['/fourStep/']"   class="button">下一步</button></div>
+			<div  class="chongzhi" style="height: 20%;"><button type="button" (click)="nextStep()"   class="button">下一步</button></div>
 			
 			</div>
 			
--- a/src/app/ui/luck-draw/luck-draw.component.ts
+++ b/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:39:53
+ * @LastEditTime: 2020-10-18 10:42:13
 */
 import { Component, OnInit } from '@angular/core';
 import { from } from 'rxjs';
@ -66,7 +66,7 @@ export class LuckDrawComponent implements OnInit {
  
  //跳转第三个页面
  nextStep(){
-    window.location.href="/twoStep";
+    window.location.href="/fourStep";
  }