[年会抽奖]抽奖逻辑调整

zouyang0921
1 parent 8de94f1a
Showing 4 changed files with 15 additions and 10 deletions
barrage.html
lottery.js
mobile.html
server.js
@@ -19,7 +19,7 @@
     <script src="./js/danmaku.min.js"></script>
     <script src="//cdn.bootcss.com/socket.io/2.0.3/socket.io.js"></script>
     <script>
-        var socketUrl = '//106.54.64.163:3000';
+        var socketUrl = '//localhost:3000';
         var colors = ['#FFD590', '#DE452D', '#FFFFFF'];
         var danmaku = new Danmaku();
         danmaku.init({
@@ -29,7 +29,7 @@
         socket.on('barrage', function(msg) {
             console.log('socket.on: ', msg);
             var colorIndex = Math.floor(Math.random() * (2 - 0 + 1)); // 生成 0-2 随机数
-            var topNum = Math.floor(Math.random() * (13 - 1 + 1) + 1); // 生成 1-13 随机数
+            var topNum = Math.floor(Math.random() * (10 - 1 + 1) + 1); // 生成 1-10 随机数
  
             var comment = {
                 text: msg,
@@ -37,7 +37,7 @@
                     fontSize: '35px',
                     fontWeight: '500',
                     color: colors[colorIndex],
-                    top: topNum * 35 + 'px'
+                    top: topNum * 50 + 'px'
                 },
                 speed: 144
             };
@@ -164,8 +164,9 @@ let action = {
         }, interval);
         return timer;
     },
+    // 继续抽奖
     continueLottery: function() {
-        action.userList.splice(action.curUserIndex, 1);
+        // action.userList.splice(action.curUserIndex, 1);
         if (action.userList.length === 0) {
             alert('暂无数据');
             return;
@@ -224,6 +225,8 @@ let action = {
  
         // 更新中奖名单模板
         action.updateResultTmpl();
+        // 获取抽奖用户列表
+        action.getUserList();
     },
     // 更新中奖名单模板
     updateResultTmpl: function() {
@@ -28,6 +28,7 @@
         img {display: block;}
         input {outline: none;border: none;-webkit-appearance: none;appearance: none;}
         .wrap {position: relative;width: 100%;min-height: 100%;box-sizing: border-box;}
+        .sign-in, .pic, .home, .seat {user-select: none;-webkit-user-select: none;-moz-user-select: none;}
         .common-btn {position: relative;width: 5.9rem;height: 1.08rem;margin: 0 auto;}
         .common-btn:not(:first-of-type) {margin-top: .4rem;}
         .common-btn-bg {display: inline-block;width: 6.82rem;margin-left: -.46rem;margin-top: -.5rem;}
@@ -158,7 +159,8 @@
             <!-- 自拍出境 -->
             <div class="common-btn">
                 <img class="common-btn-bg" src="./img/mobile/pic_btn1.png">
-                <div class="common-btn-inner" onclick="action.openCamera(1)"></div>
+                <!-- <div class="common-btn-inner" onclick="action.openCamera(1)"></div> -->
+                <div class="common-btn-inner" onclick="action.goHome()"></div>
             </div>
             <div class="pic-btn-album" onclick="action.openCamera(2)">
                 <span class="album-text">还是相册选一张吧</span>
@@ -51,16 +51,16 @@ io.on(&#39;connection&#39;, function(socket) {
         // 过滤 xss
         // var msg = xss(msg);
         io.emit('barrage', msg);
-        clearTimeout(timer);
+        clearInterval(timer);
+        timer = setInterval(function() {
+            var msg = defaultMsgs[Math.floor(Math.random() * (19 - 0 + 1))];
+            io.emit('barrage', msg);
+        }, 20000);
     });
  
     // 断开连接
     socket.on('disconnect', function() {
         console.log('user disconnected');
-        timer = setTimeout(function() {
-            var msg = defaultMsgs[Math.floor(Math.random() * (19 - 0 + 1))];
-            io.emit('barrage', msg);
-        }, 15000);
     });
 });