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

c4d44bc1 · Mac · 0ed2b65a · 01148dfa · c4d44bc1 · c4d44bc1
Commit c4d44bc1 authored Dec 30, 2019 by Mac
12 changed files
--- a/html/annualMeeting/AnnuaLmeetingHome.html
+++ b/html/annualMeeting/AnnuaLmeetingHome.html
@@ -135,7 +135,7 @@
    $("input").on("blur",function(){
        window.scroll(0,0);//失焦后强制让页面归位
    });
-    var conn = $.hubConnection("http://192.168.2.66:7838/signalr", {
+    var conn = $.hubConnection("http://localhost:7838/signalr", {
        qs: `i=${customerId}&n=${EmName}&p=${encodeURIComponent(imgUrl)}`
    });
    var proxy = conn.createHubProxy("annualLeaveHub");

--- a/html/annualMeeting/Money.html
+++ b/html/annualMeeting/Money.html
@@ -9,10 +9,24 @@
    <meta name="x5-fullscreen" content="true">
    <meta name="360-fullscreen" content="true">
    <link rel="stylesheet" href="css/money.css" type="text/css" />
+	
    <title>疯狂数钞票</title>
 </head>
 <body style="height: 100%;overflow: hidden;width: 100%;position: fixed;">
+	<audio src="video/welcom_money.mp3" autoplay></audio>
    <div class="money_count">
+		<div class="useropera">
+			<div class="content-opt-title">
+				<button type="button" class="home" id="back_ico"></button>
+				<span class="title">疯狂数钞票</span>
+				<button type="button" class="rank" id="rankBtn"></button>
+			</div>
+		</div>
+		<div class="score">分数：<span id="my_score">0</span> 分</div>
+		<div class="timer">
+			倒计时：<span id="time">0</span>
+			<img class="ico" src="img/money/timer.png"/>
+		</div>
        <div class="reg_bag" style='background-image: url("img/money/red_bag.png")'></div>
        <div class="money_box">
            <img src="img/money/money.png" alt=""/>
@@ -24,12 +38,12 @@
        <!-- <input type="button" value="开始" id="Start" style="z-index:9999;position: fixed;top:0;">
        <input type="button" value="重置" id="reset" style="z-index:9999;position: fixed;top:0;left:40px;"> -->

-        <div class="time">
+        <!-- <div class="time">
            <div class="time-txt">倒计时</div>
        <span>
            <span id="time">0</span>秒
        </span>
-        </div>
+        </div> -->
        <div class="tipsDiv">保存体力，等待开始</div>
        <div class="circleCount">3</div>
    </div>
@@ -37,11 +51,11 @@
        <div class="arrow"></div>
        <div class="hand"></div>
    </div>
-    <div class="opt">
+    <!-- <div class="opt">
        <div class="back_ico" id="back_ico"></div>
        <div class="rank_ico" id="rankBtn"></div>
-    </div>
-    <div class="rank_mask">
+    </div> -->
+    <div class="rank_mask" id="smm">
        <div style="height:3rem"></div>
        <div class="close" id="closeBtn"></div>
        <div class="rank_list_box">
@@ -59,6 +73,20 @@
            </div>
        </div>
    </div>
+	<div class="rank_mask rank_mask2" 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 id="tokenReadPackage"></span>
+			</div>
+			<div class="all_Receive">
+				<span>立即领取</span>
+			</div>
+			<div class="all_Close"></div>
+		</div>
+	</div>
 </body>
 <script type="text/javascript" src="../../js/jquery-1.10.2.js"></script>
 <script src="../../js/moveJs/jquery.signalR.min.js"></script>
@@ -67,13 +95,15 @@
 	let proxy;
 	let status=0;
 	let clock=null;
+	let isWinning=false;
 	function getMyRank(){
 		proxy.invoke('GetUserRank','Money').done(r=>{
-			if(r!=-1){
+			if(r.r!=-1){
 				$('#myTop').html(r);
 			}else{
 				$('#myTop').html('未上榜');
 			}
+			$('#my_score').html(r.s);
 		})
 	}
 	function GetStatus(){
@@ -127,7 +157,10 @@
 	}
 	function winning(){
 		proxy.on("notifyWinning",function(d){
-			alert("恭喜你中奖了："+d);
+			//alert("恭喜你中奖了："+d);
+			$('#notice').css('display','flex');
+			$('#tokenReadPackage').text(d);
+			$("#smm").css('display','none');
 		})
 	}
 	
@@ -168,20 +201,29 @@
        });
        //点击查看排行榜
        $('#rankBtn').click(function(){
-            $('.rank_mask').css('display','block');
+            $('#smm').css('display','block');
        });
+		$('.all_Close').click(function () {
+			$('#notice').css('display','none')
+		})
 		proxy.on("getChangeMenu",  function(data) {
 			if (data.code == "Money") {
 				if(data.status==2){
 					StartGame();
-				}else if(data.status==1){
+				}else if(data.status==1||data.status==0){
 					//conn.disconnect();
 					//initConnection();
 					$('.play_tips').css('display','block');
+					$('#notice').css('display','none');
+					$('#smm').css('display','none');
 					$('.tipsDiv').text('保存体力，等待开始');
-					proxy.invoke('JoinGame','Money').done(data=>{
-						
-					});
+					if(data.status==1){
+						proxy.invoke('JoinGame','Money').done(data=>{
+							
+						});
+					}
+					$("#rankBox").html("");
+					$("#my_score").html("0");
 				}else if(data.status==-1){
 					window.clearInterval(clock);
 					clock=null;
@@ -190,6 +232,7 @@
 					$('.rank_mask').css('display','block');
 					$('.play_tips').css('display','none');
 					$('.tipsDiv').text('游戏已经结束咯');
+					$('.tipsDiv').css('display','block');
 				}
 			}
 		})
@@ -275,6 +318,7 @@
                        i+=100;
 						proxy.invoke("SetGameScore","Money", 100).done(msg => {
 							// dosomething
+							$("#my_score").html(msg)
 						});
 						
                        //$(".money_add span").html("￥"+i)

--- a/html/annualMeeting/css/money.css
+++ b/html/annualMeeting/css/money.css
--- a/html/annualMeeting/img/money/gold.png
+++ b/html/annualMeeting/img/money/gold.png
--- a/html/annualMeeting/img/money/home.png
+++ b/html/annualMeeting/img/money/home.png
--- a/html/annualMeeting/img/money/money_bg.jpg
+++ b/html/annualMeeting/img/money/money_bg.jpg
--- a/html/annualMeeting/img/money/money_bg2.png
+++ b/html/annualMeeting/img/money/money_bg2.png
--- a/html/annualMeeting/img/money/opt-title.png
+++ b/html/annualMeeting/img/money/opt-title.png
--- a/html/annualMeeting/img/money/rank.png
+++ b/html/annualMeeting/img/money/rank.png
--- a/html/annualMeeting/img/money/timer.png
+++ b/html/annualMeeting/img/money/timer.png
--- a/html/annualMeeting/video/game_running.mp3
+++ b/html/annualMeeting/video/game_running.mp3
--- a/html/annualMeeting/video/welcom_money.mp3
+++ b/html/annualMeeting/video/welcom_money.mp3