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

5 years ago · 032718f010
6 changed files with 1290 additions and 10 deletions
--- a/angular.json
+++ b/angular.json
@ -105,7 +105,10 @@
            "styles": [
              "src/styles.scss"
            ],
-            "scripts": []
+            "scripts": [
+              "src/assets/js/zhuanpan.js",
+              "src/assets/js/zhuanpanpici.js"
+            ]
          }
        },
        "lint": {
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@ -4,7 +4,7 @@
 * @Author: sueRimn
 * @Date: 2020-10-07 15:00:15
 * @LastEditors: sueRimn
- * @LastEditTime: 2020-10-09 15:28:06
+ * @LastEditTime: 2020-10-18 08:45:09
 */
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
@ -18,6 +18,8 @@ import {AuthGuard} from './auth.guard'
 import {MTokenK1Component} from './m-token-k1/m-token-k1.component' //K1秘钥
 import { LuckDrawComponent } from './ui/luck-draw/luck-draw.component';
 import {ResetComponent} from './ui/reset/reset.component'
+//import {LuckDrawBatchComponent} from './ui/luck-draw-batch/luck-draw-batch.component'
+import { from } from 'rxjs';
 import { FirstStepComponent } from './ui/first-step/first-step.component';
 import { FourStepComponent } from './ui/four-step/four-step.component';
 import { DrawingResultComponent } from './ui/drawing-result/drawing-result.component';
@ -30,6 +32,7 @@ const routes: Routes = [
  {path:'firstStep',component:FirstStepComponent},
  {path:'firstStep2',component:FirstStepCopyComponent},
  {path:'Reset',component:ResetComponent},
+  //{path:'LuckDrawBatch',component:LuckDrawBatchComponent}
  {path:'fourStep',component:FourStepComponent},
  {path:'fourStep2',component:FourStepCopyComponent},
  {path:'drawingResult', component:DrawingResultComponent}
--- a/src/app/ui/luck-draw/luck-draw.component.html
+++ b/src/app/ui/luck-draw/luck-draw.component.html
@ -4,8 +4,9 @@
 * @Author: sueRimn
 * @Date: 2020-09-25 08:48:50
 * @LastEditors: sueRimn
- * @LastEditTime: 2020-10-17 10:59:46
+ * @LastEditTime: 2020-10-17 11:06:52
 -->
+
 <html>
 	<meta charset="utf-8"/>
 	<body>
@ -57,7 +58,6 @@
 		
 	</body>
 </html>
-
    


--- a/src/app/ui/luck-draw/luck-draw.component.ts
+++ b/src/app/ui/luck-draw/luck-draw.component.ts
@ -4,12 +4,17 @@
 * @Author: sueRimn
 * @Date: 2020-09-25 08:48:50
 * @LastEditors: sueRimn
- * @LastEditTime: 2020-10-13 15:49:22
+ * @LastEditTime: 2020-10-18 08:36:27
 */
 import { Component, OnInit } from '@angular/core';
+import { from } from 'rxjs';
+import '../../../assets/js/zhuanpan'
 //import * from '../../../assets/js/awardRotate'
+//import *as '../../../assets/js/zhuanpan';

-declare var zhuan:any
+
+//declare var zhuan:any
+//declare function zhuan():any 
@Component({
  selector: 'app-luck-draw',
  templateUrl: './luck-draw.component.html',
@ -21,7 +26,7 @@ export class LuckDrawComponent implements OnInit {

  ngOnInit(){
    window.setTimeout(()=>{
-      //zhuan.drawRouletteWheel()
+      //zhuan()
    },0)
    
  }
--- a/src/assets/js/zhuanpan.js
+++ b/src/assets/js/zhuanpan.js
@ -10,7 +10,7 @@ var turnplate={
 };
 var url=(window.location.href).substring(22.26)

-num=-1
+var num=-1
 function chongzhi(){
  localStorage.removeItem(num);
 }
@ -78,7 +78,7 @@ $(document).ready(function(){
        drawRouletteWheel()
      }else if($(this).html().substring(0,4)=="南宁支队")
      {
-        turnplate.restaraunts = ["钦州吾悦广场（模板）", "龙城地下商业街（模板）", "兴安油库（模板） ","九洲国际"];
+        turnplate.restaraunts = ["钦州吾悦广场（模板）", "龙城地下商业街（模板）", "兴安油库（模板） ","地王财富中心（模板）"];
        turnplate.colors = ["#FFEBEA", "#FF7245", "#FFEBEA", "#FF7245"];
        num=0
        if(window.localStorage["0"]==undefined)
@ -666,7 +666,7 @@ var rotateFn = function (item, txt){
            drawRouletteWheel()
          }else if($(this).html().substring(0,4)=="南宁支队")
          {
-            turnplate.restaraunts = ["钦州吾悦广场（模板）", "龙城地下商业街（模板）", "兴安油库（模板） ","九洲国际"];
+            turnplate.restaraunts = ["钦州吾悦广场（模板）", "龙城地下商业街（模板）", "兴安油库（模板） ","地王财富中心（模板）"];
            turnplate.colors = ["#FFEBEA", "#FF7245", "#FFEBEA", "#FF7245"]; 
            num=0
            if(window.localStorage["0"]==undefined)
--- a/src/assets/js/zhuanpanpici.js
+++ b/src/assets/js/zhuanpanpici.js