Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised

html/annualMeeting/HitMouse.html

@@ -164,10 +164,10 @@
     });
     var proxy = conn.createHubProxy("annualLeaveHub");
     conn.start().done(data => {
+        // ownranking();//自己排名
         sendMsg();
         sendScore();
         joinGeme() //参加活动
-        ownranking();//自己排名
 
     }).fail(data => {});
     getMsg()
@@ -199,7 +199,7 @@
                 $('.status3').css({'display':'none'});
             }
             if(data.status==-1){
-
+                ownranking()
                 $('.status').css({'display':'none'});
                 $('.status1').css({'display':'none'});
                 $('.status2').css({'display':'none'});
@@ -226,11 +226,11 @@
                 $('.o_ranking').html('第'+data.r+'名')
             }else {
                 $('.o_ranking').html('未上榜')
-
-
             }
-            //显示统计窗口
         });
+
+
+
     }
 
     function getMsg() {
@@ -279,7 +279,6 @@
         })
 
 
-
     }
     $('.bbb').click(function () {
         StartGame()
@@ -412,7 +411,7 @@
                 window.clearInterval(clock);
                 window.clearInterval(timer1); //清除老鼠
                 sendScore(score)
-                ownranking() //获取自己排名
+                // ownranking() //获取自己排名
                 $('#rank_mask').css('display','block');
             }
         }, 1000)

html/annualMeeting/css/vote.css

@@ -22,7 +22,7 @@ p{
 .content{
     width:90% ;
     height: 50%;
-    margin-top: 1.8rem;
+    margin-top: 2rem;
     display: flex;
     flex-direction: column;
     align-items: center;

html/annualMeeting/vote.html

@@ -116,9 +116,16 @@
             }else {
                 proxy.invoke("UserVoteProgarm",activity.EmployeeId).done(data => {
                     console.log(data)
-                    $('.popup').css('display','block')
-                    $('.popup_bg img').attr('src','../../images/aM/toupiao.png')
-                    $('.popup_bg span').html('恭喜你！投票成功')
+                    if(data == 2){
+                        layer.msg('您已对本节目投过票了');
+                        $('.vote_s').css('display','none')
+
+                    }else {
+                        $('.popup').css('display','block')
+                        $('.popup_bg img').attr('src','../../images/aM/toupiao.png')
+                        $('.popup_bg span').html('恭喜你！投票成功')
+                    }
+
                 })