From 6900f546e624a31920a138e183ef01ffb3378690 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Sun, 18 Oct 2020 15:05:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E9=A1=B5=E9=9D=A2=E5=8A=A0?= =?UTF-8?q?=E8=BD=BDjs=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/ui/luck-draw/luck-draw.component.html | 4 +-- src/app/ui/luck-draw/luck-draw.component.ts | 33 ++++++++++--------- src/assets/js/zhuanpan.js | 7 ++-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/app/ui/luck-draw/luck-draw.component.html b/src/app/ui/luck-draw/luck-draw.component.html index b76e58b..31c10ad 100644 --- a/src/app/ui/luck-draw/luck-draw.component.html +++ b/src/app/ui/luck-draw/luck-draw.component.html @@ -4,12 +4,12 @@ * @Author: sueRimn * @Date: 2020-09-25 08:48:50 * @LastEditors: sueRimn - * @LastEditTime: 2020-10-18 14:09:42 + * @LastEditTime: 2020-10-18 14:51:07 --> - +
diff --git a/src/app/ui/luck-draw/luck-draw.component.ts b/src/app/ui/luck-draw/luck-draw.component.ts index 7d639af..9f5c657 100644 --- 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 11:06:41 + * @LastEditTime: 2020-10-18 14:40:06 */ import { Component, OnInit } from '@angular/core'; import { from } from 'rxjs'; @@ -29,24 +29,25 @@ export class LuckDrawComponent implements OnInit { window.setTimeout(()=>{ //window.location.reload() },0) - + console.log(this.weekArray) } + weekArray = JSON.parse(localStorage.getItem('arr')); //支队数据和是否抽奖 choujiang=[ - {name:"南宁支队(5)",idnum:1}, - {name:"柳州支队(10)",idnum:2}, - {name:"桂林支队(14)",idnum:3}, - {name:"梧州支队(3)",idnum:4}, - {name:"北海支队(8)",idnum:5}, - {name:"防城港支队(13)",idnum:6}, - {name:"钦州支队(6)",idnum:7}, - {name:"贵港支队(1)",idnum:8}, - {name:"玉林支队(7)",idnum:9}, - {name:"百色支队(12)",idnum:10}, - {name:"贺州支队(2)",idnum:11}, - {name:"河池支队(4)",idnum:12}, - {name:"来宾支队(9)",idnum:13}, - {name:"崇左支队(11)",idnum:14} + {name:`南宁支队(${this.weekArray[0]})`,idnum:1}, + {name:`柳州支队(${this.weekArray[1]})`,idnum:2}, + {name:`桂林支队(${this.weekArray[2]})`,idnum:3}, + {name:`梧州支队(${this.weekArray[3]})`,idnum:4}, + {name:`北海支队(${this.weekArray[4]})`,idnum:5}, + {name:`防城港支队(${this.weekArray[5]})`,idnum:6}, + {name:`钦州支队(${this.weekArray[6]})`,idnum:7}, + {name:`贵港支队(${this.weekArray[7]})`,idnum:8}, + {name:`玉林支队(${this.weekArray[8]})`,idnum:9}, + {name:`百色支队(${this.weekArray[9]})`,idnum:10}, + {name:`贺州支队(${this.weekArray[10]})`,idnum:11}, + {name:`河池支队(${this.weekArray[11]})`,idnum:12}, + {name:`来宾支队(${this.weekArray[12]})`,idnum:13}, + {name:`崇左支队(${this.weekArray[13]})`,idnum:14} ] //选中支队 chooseid=-1 diff --git a/src/assets/js/zhuanpan.js b/src/assets/js/zhuanpan.js index a08767b..81dff5e 100644 --- a/src/assets/js/zhuanpan.js +++ b/src/assets/js/zhuanpan.js @@ -8,7 +8,7 @@ var turnplate={ startAngle:0, //开始角度 bRotate:false //false:停止;ture:旋转 }; -var url=(window.location.href).substring(22.26) +var url=(window.location.href).split("/")[(window.location.href).split("/").length - 1] var num=-1 function chongzhi(){ @@ -16,17 +16,16 @@ function chongzhi(){ } $(document).ready(function(){ - console.log(url) if(url=="twoStep"||url=="Reset"){ //$('.chongzhi').addClass("stop") - $("#Reset").on("click",function(){ + $("#Reset").on("contextmenu",function(){ drawRouletteWheel() $("#clickButton").attr("src", "../../../assets/images/turnplate-pointer.png") localStorage.clear(); localStorage.setItem("Luckdraw","succed") $('.pointer').removeClass("stop") }) - $("#Reset").on("contextmenu",function(){ + $("#Reset").on("click",function(){ drawRouletteWheel() $("#clickButton").attr("src", "../../../assets/images/turnplate-pointer.png") localStorage.clear();