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

4 years ago · b9da31562e
3 changed files with 5 additions and 13 deletions
--- a/src/app/ui/luck-draw/luck-draw.component.html
+++ b/src/app/ui/luck-draw/luck-draw.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-17 10:59:46
 -->
 <html>
 	<meta charset="utf-8"/>
@ -49,11 +49,7 @@
 				</div>
 				
 			</div>
-				
-			
-			<!-- <div class="colum" style="display: none;padding-left: 10%;margin-top: 20%;" id="end">
-				<span id="jieguo" ></span>
-			</div> -->
+			<div class="chongzhi" style="height: 20%;"><button  class="button">下一步</button></div>
 			
 			</div>
 			
--- a/src/assets/js/zhuanpan.js
+++ b/src/assets/js/zhuanpan.js
@ -20,11 +20,7 @@ $(document).ready(function(){
  $("#Reset").on("click",function(){
    drawRouletteWheel()
    $("#clickButton").attr("src", "../../../assets/images/turnplate-pointer.png")
-    for(var i=0;i<29;i++){
-      localStorage.removeItem(i);
-      $("#endjieguo span").eq(i+1).html("")
-    $("#chooseZhi img").eq(i).hide()
-    }
+    localStorage.clear();
    $('.pointer').removeClass("stop")
  })
    for(var i=0;i<14;i++){
--- 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-07 14:13:32
+ * @LastEditTime: 2020-10-17 11:00:47
 -->
 <!doctype html>
 <html lang="zh-CN">
@ -27,5 +27,5 @@
 <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/zhuanpan.js"></script>
+<!-- <script src="/assets/js/zhuanpan.js"></script> -->
 </html>