diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index a070bca..4251d83 100644 --- a/src/app/app-routing.module.ts +++ b/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} 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 05147f7..e9fc62a 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 @@
请选择支队 - {{item.name}} + {{item.name}}
diff --git a/src/app/ui/first-step/first-step.component.ts b/src/app/ui/first-step/first-step.component.ts index 0669409..b01246f 100644 --- a/src/app/ui/first-step/first-step.component.ts +++ b/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"; 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){