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

src/app/app-routing.module.ts

@@ -33,7 +33,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}

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";
   }
 }

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>

src/app/ui/first-step/first-step.component.ts

@@ -60,16 +60,6 @@ export class FirstStepComponent implements OnInit {
       this.isDraw = false
     }
   }
-
-   turnplate={
-    restaraunts:[],				//大转盘奖品名称
-    colors:[],					//大转盘奖品区块对应背景颜色
-    outsideRadius:192,			//大转盘外圆的半径
-    textRadius:155,				//大转盘奖品位置距离圆心的距离
-    insideRadius:68,			//大转盘内圆的半径
-    startAngle:0,				//开始角度
-    bRotate:false				//false:停止;ture:旋转
-  };
   //跳转第二个页面
   nextStep(){
     window.location.href="/twoStep";

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){