diff --git a/src/app/ui/first-step-copy/first-step-copy.component.html b/src/app/ui/first-step-copy/first-step-copy.component.html
index f6c062c..b467f2c 100644
--- a/src/app/ui/first-step-copy/first-step-copy.component.html
+++ b/src/app/ui/first-step-copy/first-step-copy.component.html
@@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-09-25 08:48:50
* @LastEditors: sueRimn
- * @LastEditTime: 2020-10-14 09:08:17
+ * @LastEditTime: 2020-10-18 11:21:18
-->
diff --git a/src/app/ui/first-step-copy/first-step-copy.component.scss b/src/app/ui/first-step-copy/first-step-copy.component.scss
index 85b9fd4..dcc44ad 100644
--- a/src/app/ui/first-step-copy/first-step-copy.component.scss
+++ b/src/app/ui/first-step-copy/first-step-copy.component.scss
@@ -41,7 +41,11 @@
padding: 0.125rem 0.125rem 0;
display: flex;
}
-
+ .chongzhi{
+ position: relative;
+ top: 85%;
+ right: 29%;
+ }
.centerLeft{
background-color: #FFF;
float: left;
@@ -148,11 +152,7 @@
margin: 4px 2px;
cursor: pointer;
}
- .chongzhi{
- position: relative;
- top: 85%;
- right: 17%;
- }
+
//选择后加背景色
.beijicolor{
diff --git a/src/app/ui/four-step-copy/four-step-copy.component.html b/src/app/ui/four-step-copy/four-step-copy.component.html
index 7eb1100..a162bed 100644
--- a/src/app/ui/four-step-copy/four-step-copy.component.html
+++ b/src/app/ui/four-step-copy/four-step-copy.component.html
@@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-09-25 08:48:50
* @LastEditors: sueRimn
- * @LastEditTime: 2020-10-14 09:08:17
+ * @LastEditTime: 2020-10-18 11:22:16
-->
@@ -68,7 +68,7 @@
-
+
diff --git a/src/app/ui/four-step-copy/four-step-copy.component.scss b/src/app/ui/four-step-copy/four-step-copy.component.scss
index 85b9fd4..3121e8a 100644
--- a/src/app/ui/four-step-copy/four-step-copy.component.scss
+++ b/src/app/ui/four-step-copy/four-step-copy.component.scss
@@ -151,7 +151,7 @@
.chongzhi{
position: relative;
top: 85%;
- right: 17%;
+ right: 23.5%;
}
//选择后加背景色
diff --git a/src/app/ui/four-step-copy/four-step-copy.component.ts b/src/app/ui/four-step-copy/four-step-copy.component.ts
index 1f93d88..f75197b 100644
--- a/src/app/ui/four-step-copy/four-step-copy.component.ts
+++ b/src/app/ui/four-step-copy/four-step-copy.component.ts
@@ -1,3 +1,11 @@
+/*
+ * @Descripttion:
+ * @version:
+ * @Author: sueRimn
+ * @Date: 2020-10-18 10:23:46
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2020-10-18 11:22:51
+ */
import { Component, OnInit } from '@angular/core';
import '../../../assets/js/fourstepcopy'
@Component({
diff --git a/src/app/ui/luck-draw/luck-draw.component.ts b/src/app/ui/luck-draw/luck-draw.component.ts
index dca8ddf..7d639af 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 10:42:13
+ * @LastEditTime: 2020-10-18 11:06:41
*/
import { Component, OnInit } from '@angular/core';
import { from } from 'rxjs';
@@ -33,20 +33,20 @@ export class LuckDrawComponent implements OnInit {
}
//支队数据和是否抽奖
choujiang=[
- {name:"南宁支队",idnum:1},
- {name:"柳州支队",idnum:2},
- {name:"桂林支队",idnum:3},
- {name:"梧州支队",idnum:4},
- {name:"北海支队",idnum:5},
- {name:"防城港支队",idnum:6},
- {name:"钦州支队",idnum:7},
- {name:"贵港支队",idnum:8},
- {name:"玉林支队",idnum:9},
- {name:"百色支队",idnum:10},
- {name:"贺州支队",idnum:11},
- {name:"河池支队",idnum:12},
- {name:"来宾支队",idnum:13},
- {name:"崇左支队",idnum:14}
+ {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}
]
//选中支队
chooseid=-1
diff --git a/src/assets/js/zhuanpan.js b/src/assets/js/zhuanpan.js
index 38da4ac..06d4647 100644
--- a/src/assets/js/zhuanpan.js
+++ b/src/assets/js/zhuanpan.js
@@ -18,6 +18,7 @@ function chongzhi(){
$(document).ready(function(){
console.log(url)
if(url=="twoStep"){
+ $('.chongzhi').addClass("stop")
$("#Reset").on("click",function(){
drawRouletteWheel()
$("#clickButton").attr("src", "../../../assets/images/turnplate-pointer.png")
@@ -623,6 +624,7 @@ $(document).ready(function(){
callback:function (){
$("#clickButton").attr("src", "../../../assets/images/turnplate-pointer-hui.png")
$("span[name='aaachen']").removeClass("stop")
+ $('.chongzhi').removeClass("stop")
//抽签完成后左侧表格点击事件
$("span[name='aaachen']").on("click",function(){