修改年会首页内容

32e7af99 · Mac · c4d44bc1 · 32e7af99 · 32e7af99 · 32e7af99
Commit 32e7af99 authored Dec 30, 2019 by Mac
15 changed files
--- a/html/annualMeeting/AnnuaLmeetingHome.html
+++ b/html/annualMeeting/AnnuaLmeetingHome.html
@@ -131,11 +131,11 @@
    }
    localStorage.activity = JSON.stringify(activity)

-
+    var MenusList=[];
    $("input").on("blur",function(){
        window.scroll(0,0);//失焦后强制让页面归位
    });
-    var conn = $.hubConnection("http://localhost:7838/signalr", {
+    var conn = $.hubConnection("http://192.168.2.66:7838/signalr", {
        qs: `i=${customerId}&n=${EmName}&p=${encodeURIComponent(imgUrl)}`
    });
    var proxy = conn.createHubProxy("annualLeaveHub");
@@ -164,29 +164,44 @@
        //年会首页菜单
        proxy.on("getMenus", function (data){
            console.log(data)
+            MenusList = data
            $(".menu_view").remove()
            var html="";
            $.each(data, function(i,v) {
                html+='<div class="menu_view" onclick="menu_btn('+data[i].Id+')">\n' +
-                    '                        <img src="../../images/aM/menu@2x.png" alt="">\n' +
+                    '                        <img src="../../images/aM/menu.png" alt="">\n' +
+                    // '                        <img src="http://imgfile.oytour.com/New" '+data[i].Id+' alt="">\n' +
                    '                        <p>'+data[i].MName+'</p>\n' +
+                    '                        <img src="../../images/aM/hourglass.png" class="hourglass"/>\n' +
                    '                    </div>'
            });
            $(".menu").append(html);
        });

        proxy.on("getChangeMenu",  function(data) {
+            console.log(data)
            if(data.code == 'Mouse'){
                if(data.status ==1 ){
                    $('#activity').css('display','flex')
+                    renderHourglass(data.code,'block')
+                }else if(data.status ==-1 || data.status ==-1 ){
+                    renderHourglass(data.code,'none')
+
                }
            }
+
            if (data.code == "Money") {
                if(data.status ==1 ){
                    $('#activity2').css('display','flex')
+                    renderHourglass(data.code,'block')
+                }else if(data.status ==-1 || data.status ==-1 ){
+                    renderHourglass(data.code,'none')
+
                }
            }
        })
+
+
        //节目单
        proxy.on('getPrograms',function (data) {
            programguides(data)
@@ -197,6 +212,20 @@
            $(".rNumber").html(data)
        })
    }
+
+    function renderHourglass(code,type){
+        var key = 0
+        for(var i=0;i<MenusList.length ; i++){
+            if(MenusList[i].Code == code){
+                key = i
+            }
+        }
+        if(type== 'block'){
+            $('.menu_view:eq('+key+') .hourglass').css('display','block')
+        }else {
+            $('.menu_view:eq('+key+') .hourglass').css('display','none')
+        }
+    }
    function menu_btn(id) {
        if(id == 1){
            window.location.href = `./HitMouse.html`

--- a/html/annualMeeting/HitMouse.html
+++ b/html/annualMeeting/HitMouse.html
@@ -14,7 +14,7 @@
 <body>

    <div class="Box">
-<!--        <div class="bbb" style="position: fixed;font-size: 0.15rem">asdsdas</div>-->
+<!--        <div class="bbb" style="position: fixed;font-size: 0.15rem">测试</div>-->
 <!--        头部一块-->
        <div class="top">
            <div class="top_title">
@@ -98,7 +98,7 @@
        <div class="status3">
            <p>游戏已结束</p>
        </div>
-        <div class="circleCount">3</div>
+        <div class="circleCount">ready</div>

        <audio id="audio" src="img/game_running.mp3" autoplay="autoplay">
            您的浏览器不支持audio标签
@@ -154,7 +154,6 @@

    var activity = JSON.parse(localStorage.activity);

-
    var status=0; //活动状态
    var laoshudata = [];//老鼠数据
    var audio=document.getElementById("audio");
@@ -277,7 +276,7 @@

    }
    $('.bbb').click(function () {
-        ces2()
+        StartGame()
    })
    // sort 是顺序，score分数，type -1鼠，2猪，location位置（出现在第几个洞），interval时间（与下一个间隔时间单位：毫秒）
    var key = 0
@@ -360,11 +359,16 @@
        }
        key++
    }
-
+    var Count_key = 0
    function StartGame() {
        audio2.play()
-        Count=3;
+        Count=5;
        Count2=30;
+        Count_key = 0;//初始为0
+        $('.circleCount').html('ready');
+
+        var Count_c=['ready','3','2','1','go']
+
        $('.circleCount').css('display','block');
        $('.status').css({'display':'none'});
        $('.status1').css({'display':'none'});
@@ -372,7 +376,8 @@
        $('.status3').css({'display':'none'});
        var clock = window.setInterval(function(){
            Count--;
-            $('.circleCount').html(Count);
+            Count_key++
+            $('.circleCount').html(Count_c[Count_key]);
            if(Count==0){
                $('.circleCount').css('display','none');
                $('.status').css({'display':'none'});

--- a/html/annualMeeting/css/Amhome.css
+++ b/html/annualMeeting/css/Amhome.css
@@ -73,6 +73,7 @@ p{
    flex-direction: column;
    align-items: center;
    justify-content: space-between;
+    position: relative;
 }
 .menu_view img{
    width: 0.22rem;
@@ -82,6 +83,20 @@ p{
    color: #F2E47C;
    font-size: 0.12rem;
 }
+.hourglass{
+    display: none;
+    position: absolute;
+    right: 0;
+    top:-0.08rem;
+    animation: rotate 3s linear infinite;
+}
+@keyframes rotate{
+
+    from{transform: rotate(0deg)}
+
+    to{transform: rotate(359deg)}
+
+}
 .barrage{
    width: 92%;
    height: 0.3rem;

--- a/html/annualMeeting/css/HitMouse.css
+++ b/html/annualMeeting/css/HitMouse.css
@@ -227,14 +227,13 @@ li{
    left:50%;
    margin-left:-0.25rem;
    color:#fdbe23;
-    font-size:0.3rem;
+    font-size:0.18rem;
    border-radius:50%;
    text-align: center;
    line-height: 0.5rem;
    border:0.05rem solid #fdbe23;
    display: none;
    animation: numberAni 1s infinite ease;
-    display:none;
 }
 @keyframes numberAni {
    1% {

--- a/images/aM/hourglass.png
+++ b/images/aM/hourglass.png
--- a/images/aM/menu@2x.png
+++ b/images/aM/menu@2x.png
--- a/images/aM/menu2@2x.png
+++ b/images/aM/menu2@2x.png
--- a/images/aM/menu2_fg.png
+++ b/images/aM/menu2_fg.png
--- a/images/aM/menu3@2x.png
+++ b/images/aM/menu3@2x.png
--- a/images/aM/menu3_fg.png
+++ b/images/aM/menu3_fg.png
--- a/images/aM/menu4@2x.png
+++ b/images/aM/menu4@2x.png
--- a/images/aM/menu4_fg.png
+++ b/images/aM/menu4_fg.png
--- a/images/aM/menu5@2x.png
+++ b/images/aM/menu5@2x.png
--- a/images/aM/menu5_fg.png
+++ b/images/aM/menu5_fg.png
--- a/images/aM/menu_fg.png
+++ b/images/aM/menu_fg.png