From 672047e54b7abf4e5674c01cf4f3ac0e8b3d4662 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Sun, 18 Oct 2020 10:41:08 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=B5=8B=E8=AF=95=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E8=B7=B3=E8=BD=AC=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/app-routing.module.ts                          |  2 +-
 .../ui/first-step-copy/first-step-copy.component.ts    |  2 +-
 src/app/ui/first-step/first-step.component.html        |  2 +-
 src/app/ui/first-step/first-step.component.ts          | 10 ----------
 src/assets/js/firststep.js                             |  2 +-
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index b82bfc5..95eae48 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -32,7 +32,7 @@ const routes: Routes = [
   {path:'firstStep',component:FirstStepComponent},
   {path:'firstStep2',component:FirstStepCopyComponent},
   {path:'Reset',component:ResetComponent},
-  //{path:'LuckDrawBatch',component:LuckDrawBatchComponent}
+  {path:'LuckDrawBatch',component:LuckDrawComponent},
   {path:'fourStep',component:FourStepComponent},
   {path:'fourStep2',component:FourStepCopyComponent},
   {path:'drawingResult', component:DrawingResultComponent}
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 0960420..8906b0f 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
@@ -62,6 +62,6 @@ export class FirstStepCopyComponent implements OnInit {
     }
   }
   nextstep(){
-    this.router.navigate(['/fourStep2']);
+    window.location.href="/fourStep2";
   }
 }
diff --git a/src/app/ui/first-step/first-step.component.html b/src/app/ui/first-step/first-step.component.html
index 6c4a971..d2bdda7 100644
--- a/src/app/ui/first-step/first-step.component.html
+++ b/src/app/ui/first-step/first-step.component.html
@@ -25,7 +25,7 @@
 				<div class="centerLeft" >
 					<div class="tanCenterbtn" id="chooseZhishao">
 						<span style="background-color: #ff4d29;color:#FFF;" name="zhidui" data-id=`{{chooseid}}`>请选择支队</span>
-						<span [attr.key]="item.id" name="aaa" *ngFor="let item of choujiang; let key=index" [ngClass]="{'beijicolor': chooseid ==key}" (click)="clickName(item)">{{item.name}}
+						<span [attr.key]="item.id" name="lll" *ngFor="let item of choujiang; let key=index" [ngClass]="{'beijicolor': chooseid ==key}" (click)="clickName(item)">{{item.name}}
 							<img class="img" [ngClass]="{'block': item.result == '' ? false : true}" style="margin-left: 8px;" src="../../../assets/images/dui.png">
 						</span>
 					  </div>
diff --git a/src/app/ui/first-step/first-step.component.ts b/src/app/ui/first-step/first-step.component.ts
index 37c1e9f..aa1fccc 100644
--- a/src/app/ui/first-step/first-step.component.ts
+++ b/src/app/ui/first-step/first-step.component.ts
@@ -61,14 +61,4 @@ export class FirstStepComponent implements OnInit {
     }
   }
 
-   turnplate={
-    restaraunts:[],				//大转盘奖品名称
-    colors:[],					//大转盘奖品区块对应背景颜色
-    outsideRadius:192,			//大转盘外圆的半径
-    textRadius:155,				//大转盘奖品位置距离圆心的距离
-    insideRadius:68,			//大转盘内圆的半径
-    startAngle:0,				//开始角度
-    bRotate:false				//false:停止;ture:旋转
-  };
-  
 }
diff --git a/src/assets/js/firststep.js b/src/assets/js/firststep.js
index 19b8b84..cd5edbb 100644
--- a/src/assets/js/firststep.js
+++ b/src/assets/js/firststep.js
@@ -73,7 +73,7 @@ $(document).ready(function(){
     });
 
     //左侧表格点击事件
-    $("span[name='aaa']").on("click",function(e,index){
+    $("span[name='lll']").on("click",function(e,index){
         selected = $(this)[0].innerText
         selectedIndex = localStorage.getItem("indexNum")
         if($("#endjieguoshao span").eq(selectedIndex)[0].innerText){