修改

c789bc1c · Mac · 9dff7650 · c789bc1c · c789bc1c · c789bc1c
Commit c789bc1c authored Dec 30, 2019 by Mac
5 changed files
--- a/html/annualMeeting/AnnuaLmeetingHome.html
+++ b/html/annualMeeting/AnnuaLmeetingHome.html
@@ -54,6 +54,54 @@
                </div>
            </div>
        </div>
+
+<!--        中奖弹窗-->
+        <div class="rank_mask" id="notice">
+            <div class="zhezao"></div>
+            <div class="notice_box">
+                <img src="../../images/aM/all_d.png" alt="" class="notice_top">
+                <span>恭喜你中奖啦！</span>
+                <div class="notice_content">
+                    <span>121212</span>
+                </div>
+                <div class="all_Receive">
+                    <span>立即领取</span>
+                </div>
+                <div class="all_Close"></div>
+            </div>
+        </div>
+<!--        老鼠活动进行中-->
+        <div class="rank_mask" id="activity">
+            <div class="zhezao"></div>
+            <div class="activity_box">
+                <span class="activity_title">打老鼠活动正在进行</span>
+                <div class="activity_Receive" onclick="JumpActivity('mouse')">
+                    <span>立即参与</span>
+                </div>
+                <div class="activity_Close"></div>
+            </div>
+        </div>
+<!--        数钞票活动进行中-->
+        <div class="rank_mask" id="activity2">
+            <div class="zhezao"></div>
+            <div class="activity_box2">
+                <span class="activity_title">数钞票活动正在进行</span>
+                <div class="activity_Receive" onclick="JumpActivity('money')">
+                    <span>立即参与</span>
+                </div>
+                <div class="activity_Close2"></div>
+            </div>
+        </div>
+
+<!--        我的奖品-->
+        <div class="rank_mask" id="prize">
+            <div class="zhezao"></div>
+            <div class="prize_box">
+                <div class="prize_Close"></div>
+
+            </div>
+        </div>
+
    </div>


@@ -63,15 +111,29 @@
 <script src="../../js/moveJs/jquery.min.js"></script>
 <script src="../../js/moveJs/jquery.signalR.min.js"></script>
 <script type="text/javascript" src="../../js/layer/layer.js"></script>
+<!--<script src="./js/JsBarcode.all.min.js"></script>-->

 <script>
+    var href='GT_activities.html?customerId=1951&EmName=张建国&imgUrl=http://imgfile.oytour.com/New/Upload/User/20191018150051176.png&GiftCode=21312312323';
+    var param = href.split('?')[1].split("&");
+    var customerId = param[0].split('=')[1];
+    var EmName = param[1].split('=')[1];
+    var imgUrl = param[2].split('=')[1];
+    var GiftCode = param[3].split('=')[1];
+    var activity ={
+        customerId:customerId,
+        EmName:EmName,
+        imgUrl:imgUrl,
+
+    }
+    localStorage.activity = JSON.stringify(activity)
+
+
    $("input").on("blur",function(){
        window.scroll(0,0);//失焦后强制让页面归位
    });
    var conn = $.hubConnection("http://192.168.2.66:7838/signalr", {
-        qs: `i=1951&n=张建国&p=${encodeURIComponent(
-            "http://imgfile.oytour.com/New/Upload/User/20191018150051176.png"
-        )}`
+        qs: `i=${customerId}&n=${EmName}&p=${encodeURIComponent(imgUrl)}`
    });
    var proxy = conn.createHubProxy("annualLeaveHub");
    conn.start().done(data => {
@@ -112,8 +174,6 @@

        //节目单
        proxy.on('getPrograms',function (data) {
-            console.log(data)
-
            programguides(data)

        });
@@ -124,11 +184,14 @@
    }
    function menu_btn(id) {
        if(id == 1){
-            window.location.href = './HitMouse.html'
-
+            window.location.href = `./HitMouse.html`
+        }
+        if(id == 2){
+            window.location.href = './money.html'
        }

        if(id ==5 ){ //我的礼品
+            $('#prize').css('display','flex')

        }
    }
@@ -149,7 +212,7 @@
        var html_l="";
        var html_c="";
        var html_r="";
-        $.each(rightList, function(i,v) {//这里的函数参数是键值对的形式，k代表键名，v代表值
+        $.each(rightList, function(i,v) {
            if(i==0){
                html_l+='<div class="right_box" style="margin-top:0 ">\n' +
                    '                        <p class="time">'+rightList[i].StartTime+'</p>\n' +
@@ -170,7 +233,7 @@

        });
        $(".c_right").append(html_l);
-        $.each(data, function(i,v) {//这里的函数参数是键值对的形式，k代表键名，v代表值
+        $.each(data, function(i,v) {
            html_c+=' <div class="c_xian">\n' +
                '                        <div class="yuan"></div>\n' +
                '                        <div class="yuan_x"></div>\n' +
@@ -178,7 +241,7 @@
        });
        $(".c_center").append(html_c);

-        $.each(leftList, function(i,v) {//这里的函数参数是键值对的形式，k代表键名，v代表值
+        $.each(leftList, function(i,v) {
            html_r+='<div class="letf_box" style="margin-top: 0.75rem">\n' +
                '                        <div class="time">\n' +
                '                            <p>'+leftList[i].StartTime+'</p>\n' +
@@ -191,6 +254,36 @@
        });
        $(".c_left").append(html_r);
    }
+    $('.all_Close').click(function () {
+        $('#notice').css('display','none')
+    })
+    $('.activity_Close').click(function () {
+        $('#activity').css('display','none')
+    })
+    $('.activity_Close2').click(function () {
+        $('#activity2').css('display','none')
+    })
+    $('.prize_Close').click(function () {
+        $('#prize').css('display','none')
+    })
+    // //条形码生成
+    // var barcode = document.getElementById('prize'),
+    //     str = "16620902551",
+    //     options = {
+    //         format: "CODE128",
+    //         displayValue: false,
+    //         fontSize: 18,
+    //         height: 100
+    //     };
+    // JsBarcode(barcode, str, options); //原生
+    function JumpActivity(type) {//活动进行时的跳转
+        if(type == 'mouse'){
+
+        }
+        if(type == 'money'){
+
+        }
+    }

 </script>
 </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="top">
            <div class="top_title">
@@ -93,7 +93,7 @@
            <p>游戏即将开始</p>
        </div>
        <div class="status2">
-            <p>抱歉！游戏正在进行中</p>
+            <p>你来晚了，游戏已经开始了</p>
        </div>
        <div class="status3">
            <p>游戏已结束</p>
@@ -103,7 +103,7 @@
        <audio id="audio" src="img/game_running.mp3" autoplay="autoplay">
            您的浏览器不支持audio标签
        </audio>
-        <audio id="audio2" src="img/ready321go.mp3" autoplay="autoplay">
+        <audio id="audio2" src="img/ready321go.mp3">
            您的浏览器不支持audio标签
        </audio>

@@ -115,9 +115,8 @@
                    <p>排行榜</p>
                </div>
                <div class="rank_y">
-                    <p>你的排名 第</p>
-                    <p class="o_ranking">1</p>
-                    <p>名</p>
+                    <p>你的排名  </p>
+                    <p class="o_ranking"></p>
                </div>
                <div class="rank_i">

@@ -141,9 +140,6 @@
                </div>
                <div class="all_Close"></div>
            </div>
-
-
-
        </div>
    </div>

@@ -156,17 +152,18 @@

 <script>

+    var activity = JSON.parse(localStorage.activity);
+
+
    var status=0; //活动状态
    var laoshudata = [];//老鼠数据
    var audio=document.getElementById("audio");
    var audio2=document.getElementById("audio2");
-    audio.play();
+    // audio.play();
    audio.loop=true;

    var conn = $.hubConnection("http://192.168.2.66:7838/signalr", {
-        qs: `i=1951&n=张建国&p=${encodeURIComponent(
-            "http://imgfile.oytour.com/New/Upload/User/20191018150051176.png"
-        )}`
+        qs: `i=${activity.customerId}&n=${activity.EmName}&p=${encodeURIComponent(activity.imgUrl)}`
    });
    var proxy = conn.createHubProxy("annualLeaveHub");
    conn.start().done(data => {
@@ -204,6 +201,7 @@
                $('.status3').css({'display':'none'});
            }
            if(data.status==-1){
+
                $('.status').css({'display':'none'});
                $('.status1').css({'display':'none'});
                $('.status2').css({'display':'none'});
@@ -226,9 +224,14 @@
    function ownranking() {
        proxy.invoke("GetUserRank", 'Mouse').done(data => {
            console.log(data)
-            $('.o_ranking').html(data)
+            if(data == 0){
+                $('.o_ranking').html('未上榜')
+
+            }else {
+                $('.o_ranking').html('第'+data+'名')
+
+            }
            //显示统计窗口
-            $('#rank_mask').css('display','block');
        });
    }

@@ -238,6 +241,7 @@
            console.log(data)

            laoshudata =  JSON.parse(data.data)
+            console.log(laoshudata)
            if(data.status==0){
                $('.status').css({'display':'flex'});
                $('.status1').css({'display':'none'});
@@ -267,10 +271,14 @@
        })
        proxy.on('notifyMouseGamerResult',function (data) {
            getRankList(data)
+            ownranking() //获取自己排名
        })


    }
+    $('.bbb').click(function () {
+        ces2()
+    })
    // sort 是顺序，score分数，type -1鼠，2猪，location位置（出现在第几个洞），interval时间（与下一个间隔时间单位：毫秒）
    var key = 0
    var timer1;
@@ -283,7 +291,7 @@
        for (var i=0 ;i<laoshudata.length; i++){
            laoshudata[i].noclick =0; //0 为未点击 1为点击过
        }
-          timer1 = setInterval(increase ,laoshudata[key].Interval+300)
+        timer1 = setInterval(increase ,laoshudata[key].Interval+300)
    }

    function increase() {
@@ -299,10 +307,8 @@
                    $('.score').html(score + '分')
                    sendScore(score)
                    $('.hole-container .hole:eq(' + wz + ') .mouse .zoon').remove()
-
                    $('.hole-container .hole:eq('+wz+') .mouse').append('<img src="../../images/aM/dadao.png" alt="" class="yan">');
-                    $('.hole-container .hole:eq('+wz+') .mouse').append('<p class="show_score"> +500 </p>');
-
+                    $('.hole-container .hole:eq('+wz+') .mouse').append('<p class="show_score">+500</p>');
                    setTimeout(function () {
                        $('.hole-container .hole:eq('+wz+') .mouse .yan').remove();
                        $('.hole-container .hole:eq('+wz+') .mouse .show_score').remove();
@@ -321,12 +327,13 @@

        }
        if(laoshudata[key].Type == 2){
-            $('.hole-container .hole:eq('+wz+') .mouse').append('<img src="../../images/aM/pig.png" alt="" class="zoon>');
+            $('.hole-container .hole:eq('+wz+') .mouse').append('<img src="../../images/aM/pig.png" alt="" class="zoon">');
            $('.hole-container .hole:eq('+wz+') .mouse img').animate({top:"0.02rem"},600);
+            //为老鼠的时候加100分
            $('.hole-container .hole:eq('+wz+') .mouse .zoon').click(function () {
-                if(laoshudata[key].noclick == 0){
-                    score=score- 100;
-                    $('.score').html(score+ '分')
+                if(laoshudata[key].noclick == 0) {
+                    score = score - 100;
+                    $('.score').html(score + '分')
                    sendScore(score)
                    $('.hole-container .hole:eq(' + wz + ') .mouse .zoon').remove()
                    $('.hole-container .hole:eq('+wz+') .mouse').append('<img src="../../images/aM/dadao.png" alt="" class="yan">');
@@ -334,11 +341,15 @@
                    setTimeout(function () {
                        $('.hole-container .hole:eq('+wz+') .mouse .yan').remove();
                        $('.hole-container .hole:eq('+wz+') .mouse .show_score').remove();
+
                    },300)
+
                    laoshudata[key].noclick=1
                }
            })
            $('.hole-container .hole:eq('+wz+') .mouse img').animate({top:"0.65rem"},600);
+
+            //等动画消失之后删除元素
            setTimeout(function () {
                $('.hole-container .hole:eq('+wz+') .mouse').empty();
            },1200)
@@ -384,8 +395,8 @@
                window.clearInterval(clock);
                window.clearInterval(timer1); //清除老鼠
                sendScore(score)
-                ownranking() //获取自己排名
-
+                // ownranking() //获取自己排名
+                $('#rank_mask').css('display','block');
            }
        }, 1000)
    }
@@ -395,7 +406,7 @@
        $.each(data, function(i,v) {//这里的函数参数是键值对的形式，k代表键名，v代表值
            html+='<div class="rank_item">\n' +
                '                        <div class="rank_itemL">\n' +
-                '                            <div class="rank_num">'+data[i].r+'</div>\n' +
+                '                            <div class="rank_num">'+(i+1)+'</div>\n' +
                '                            <p>'+data[i].n+'</p>\n' +
                '                        </div>\n' +
                '                        <div class="rank_itemR">\n' +
@@ -406,6 +417,7 @@
        });
        $(".rank_i").append(html);
    };
+
    $('.Close').click(function () {
        $('#rank_mask').css('display','none')
    })
@@ -418,6 +430,7 @@

    $('.return').click(function () {
        //返回首页
+        window.history.back()
    })



--- a/html/annualMeeting/css/Amhome.css
+++ b/html/annualMeeting/css/Amhome.css
@@ -211,3 +211,152 @@ p{
    justify-content: flex-end;
 }

+.rank_mask{
+    position: absolute;
+    left: 0;
+    top:0;
+    width: 100%;height: 100%;
+    display: none;
+    align-items: center;
+    justify-content: center;
+}
+.zhezao{
+    width: 100%;height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    background: #111111;
+    opacity: 0.5;
+}
+.notice_box{
+    width: 2.8rem;
+    height: 2.6rem;
+    background-image: url('../../../images/aM/all_bg.png');
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+.notice_top{
+    width: 0.63rem;
+    height: 0.63rem;
+    margin-top: 0.28rem;
+
+}
+.notice_box span{
+    color: #893630;
+    font-size: 0.15rem;
+    margin-top: 0.2rem;
+}
+.notice_content{
+    width: 2.2rem;
+    height: 0.4rem;
+    border-radius: 0.08rem;
+    border: 1px solid #C8532B;
+    background: white;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 0.14rem;
+}
+.notice_content span{
+    width: 2rem;
+    text-overflow:ellipsis;
+    overflow: hidden;
+    margin-top: 0;
+    white-space:nowrap;
+
+
+}
+.all_Receive{
+    width: 1.5rem;
+    height: 0.27rem;
+    background: #F9CB3B;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 0.18rem;
+    border-radius: 0.135rem;
+
+}
+.all_Receive span{
+    color: #893630;
+    font-size: 0.13rem;
+    margin-top: 0;
+}
+.all_Close{
+    position: absolute;
+    left: 50%;
+    bottom: -0.5rem;
+    margin-left: -0.17rem;
+    width: 0.34rem;
+    height: 0.34rem;
+    background-image: url('../../../images/aM/close.png');
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+}
+
+.activity_box{
+    width: 3.48rem;
+    height: 3.25rem;
+    background-image: url('../../../images/aM/activity_mouse.png');
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+.activity_title{
+    color: #893630;
+    font-size: 0.12rem;
+    margin-top: 2.32rem;
+}
+
+.activity_Receive{
+    width: 1.5rem;
+    height: 0.27rem;
+    background: #F9CB3B;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 0.1rem;
+    border-radius: 0.135rem;
+
+}
+.activity_Receive span{
+    color: #893630;
+    font-size: 0.13rem;
+    margin-top: 0;
+}
+.activity_Close,.activity_Close2,.prize_Close{
+    position: absolute;
+    left: 50%;
+    bottom: -0.5rem;
+    margin-left: -0.17rem;
+    width: 0.34rem;
+    height: 0.34rem;
+    background-image: url('../../../images/aM/close.png');
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+}
+.activity_box2{
+    width: 3.48rem;
+    height: 3.25rem;
+    background-image: url('../../../images/aM/activity_money.png');
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.prize_box{
+    width: 100%;
+    height: 2rem;
+    background: white;
+    position: relative;
+}
--- a/images/aM/activity_money.png
+++ b/images/aM/activity_money.png
--- a/images/aM/activity_mouse.png
+++ b/images/aM/activity_mouse.png