Merge remote-tracking branch 'origin/zxc' into ch

HMLIU · Jan 22, 2017 · 203db6f · 203db6f
2 parents 9699f9c + d6af689
commit 203db6f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/webapp/WEB-INF/lottery/lottery.new.html b/src/main/webapp/WEB-INF/lottery/lottery.new.html
@@ -10,7 +10,7 @@
     <script type="text/javascript" src="../message/js/jquery.barrager.js"></script>
     <script type="text/javascript" src="../lottery/js/common.min.js"></script>
     <script type="text/javascript" src="../config/config.js"></script>
-    <script type="text/javascript" src="../lottery/js/lottery.new.min.js"></script>
+    <script type="text/javascript" src="../lottery/js/lottery.new.js"></script>
 
     <title>年会抽奖系统</title>
     <script type="application/javascript">
@@ -102,7 +102,10 @@
                 你的浏览器不支持canvas
             </canvas>
             <div class="header">
-                <p class="total-join">共有 <span class="J-num" id="userCount">-</span> 个小伙伴参与抽奖</p>
+                <p class="total-join"
+                   style="background: rgba(0,0,0,0.4);padding: 0 10px;line-height: 28px;margin-right: 160px;border-radius: 20px;">
+                    共有 <span
+                        class="J-num" id="userCount" style="font-size: 28px;">-</span> 个人参与抽奖</p>
                 <div class="btn" style="position:absolute;top:0;right:10px;z-index:999;">
                     <label class="switch-btn">
                         <input class="checked-switch" type="checkbox"/>