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

4 years ago · 0c9f1fdfe2
3 changed files with 5 additions and 4 deletions
--- 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 14:40:06
+ * @LastEditTime: 2020-10-18 15:06:21
 */
 import { Component, OnInit } from '@angular/core';
 import { from } from 'rxjs';
@ -29,7 +29,7 @@ export class LuckDrawComponent implements OnInit {
    window.setTimeout(()=>{
      //window.location.reload()
    },0)
-    console.log(this.weekArray)
+    //console.log(this.weekArray)
  }
  weekArray = JSON.parse(localStorage.getItem('arr'));
  //支队数据和是否抽奖
--- a/src/assets/js/zhuanpan.js
+++ b/src/assets/js/zhuanpan.js
@ -18,6 +18,7 @@ function chongzhi(){
 $(document).ready(function(){
  if(url=="twoStep"||url=="Reset"){
    //$('.chongzhi').addClass("stop")
+    console.log("aaa")
    $("#Reset").on("contextmenu",function(){
      drawRouletteWheel()
      $("#clickButton").attr("src", "../../../assets/images/turnplate-pointer.png")
--- a/src/index.html
+++ b/src/index.html
@ -4,7 +4,7 @@
 * @Author: sueRimn
 * @Date: 2020-09-25 08:48:54
 * @LastEditors: sueRimn
- * @LastEditTime: 2020-10-18 09:05:19
+ * @LastEditTime: 2020-10-18 15:11:32
 -->
 <!doctype html>
 <html lang="zh-CN">
@ -27,6 +27,6 @@
 <!-- <script src="/assets/js/kinerLottery.js"></script>
 <script src="/assets/js/zepto.min.js"></script> -->
 <!-- <script src="/assets/js/zhuanpan.js"></script> -->
-<!-- <script src="/assets/js/awardRotate.js"></script> -->
+<script src="/assets/js/awardRotate.js"></script>
 <!-- <script src="/assets/js/zhuanpan.js"></script> -->
 </html>