Commit 121fb76c authored by Mac's avatar Mac

修改页面内容

parent 1d4bfb27
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0" />
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0,viewport-fit=cover" />
<meta name="format-detection" content="telephone=no" />
<meta content="yes" name="mobile-web-app-capable">
<meta content="yes" name="apple-mobile-web-app-capable" />
......@@ -54,7 +54,10 @@
</div>
</div>
</div>
<!-- AR寻宝-->
<div class="AR">
</div>
<!-- 中奖弹窗-->
<div class="rank_mask" id="notice">
<div class="zhezao"></div>
......@@ -128,14 +131,17 @@
<script>
var href='GT_activities.html?customerId=1951&EmName=张建国&imgUrl=http://imgfile.oytour.com/New/Upload/User/20191018150051176.png&GiftCode=21312312323';
// var href = window.location.href;
var href='AnnuaLmeetingHome.html?EmployeeId=1951&EmName=张建国&imgUrl=http://192.168.2.214:8130/Upload/Temporary/20191223022557036.jpg&GiftCode=201912231427008436';
var param = href.split('?')[1].split("&");
var customerId = param[0].split('=')[1];
var EmName = param[1].split('=')[1];
var EmployeeId = param[0].split('=')[1];
var EmName = decodeURI(param[1].split('=')[1]);
var imgUrl = param[2].split('=')[1];
var GiftCode = param[3].split('=')[1];
var activity ={
customerId:customerId,
EmployeeId:EmployeeId,
EmName:EmName,
imgUrl:imgUrl,
......@@ -146,8 +152,8 @@
$("input").on("blur",function(){
window.scroll(0,0);//失焦后强制让页面归位
});
var conn = $.hubConnection("http://192.168.2.66:7838/signalr", {
qs: `i=${customerId}&n=${EmName}&p=${encodeURIComponent(imgUrl)}`
var conn = $.hubConnection("http://192.168.2.65:7838/signalr", {
qs: `i=${EmployeeId}&n=${EmName}&p=${encodeURIComponent(imgUrl)}`
});
var proxy = conn.createHubProxy("annualLeaveHub");
conn.start().done(data => {
......@@ -172,17 +178,12 @@
// 10秒后启用点击事件
setTimeout(function(){
clickBtn=true;
console.log(123)
},10000);
}else {
layer.msg('发送频繁');
}
}
}
function getMsg() {
......@@ -246,6 +247,9 @@
if(list.VoteState == 1){
console.log('进入投票')
$('#activity3').css('display','flex')
renderHourglass('vote','block')
}else {
renderHourglass('vote','none')
}
});
......@@ -374,11 +378,29 @@
window.location.href = './money.html'
}
if(type='votes'){
if(type=='votes'){
window.location.href = './vote.html'
}
}
$('.AR').click(function () {
let data = {
'action': 'jump',
'page': 'arCamera',
'pageData': {
}
}
window.postMessage(JSON.stringify(data));
})
//键盘弹起遮挡内容的处理方法
$('input[type="text"],textarea').on('click', function () {
var target = this;
setTimeout(function(){
target.scrollIntoViewIfNeeded();
},400);
});
</script>
</html>
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0" />
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0,viewport-fit=cover" />
<meta name="format-detection" content="telephone=no" />
<meta content="yes" name="mobile-web-app-capable">
<meta content="yes" name="apple-mobile-web-app-capable" />
......@@ -15,13 +15,8 @@
<div class="Box">
<a id="goali" href="alipays://platformapi/startapp" target="_blank" style="position: absolute;z-index: -1;">GO</a>
<audio id="audio" src="img/game_running.mp3" autoplay="autoplay">
您的浏览器不支持audio标签
</audio>
<audio id="audio2" src="img/ready321go.mp3">
您的浏览器不支持audio标签
</audio>
<audio src="img/all.mp3" id="music" ></audio>
<audio id="audio" src="video/welcom_mouse.mp3" autoplay></audio>
<!-- <div class="bbb" style="position: fixed;font-size: 0.15rem">测试</div>-->
<!-- 头部一块-->
......@@ -158,18 +153,13 @@
var activity = JSON.parse(localStorage.activity);
var clipboard = new Clipboard('.all_Receive');
var customerId = activity.customerId + '_Mouse';
var status=0; //活动状态
var EmployeeId = activity.EmployeeId + '_Mouse';
var laoshudata = [];//老鼠数据
var audio=document.getElementById("audio");
var audio2=document.getElementById("audio2");
document.addEventListener('touchstart', function() {
document.getElementById('audio').play()
})
audio.loop=true;
var conn = $.hubConnection("http://192.168.2.66:7838/signalr", {
qs: `i=${customerId}&n=${activity.EmName}&p=${encodeURIComponent(activity.imgUrl)}`
var conn = $.hubConnection("http://192.168.2.65:7838/signalr", {
qs: `i=${EmployeeId}&n=${activity.EmName}&p=${encodeURIComponent(activity.imgUrl)}`
});
var proxy = conn.createHubProxy("annualLeaveHub");
conn.start().done(data => {
......@@ -229,7 +219,7 @@
});
}
function ownranking() {
proxy.invoke("GetUserRank", 'Mouse',customerId).done(data => {
proxy.invoke("GetUserRank", 'Mouse',EmployeeId).done(data => {
console.log(data)
if(data.r != -1){
$('.o_ranking').html('第'+data.r+'名')
......@@ -272,13 +262,14 @@
$('.status3').css({'display':'flex'});
}
});
proxy.on('notifyMouseGamerResult',function (data) {
proxy.on('notifyMouseGamerResult',function (data) { //全部排名
console.log(data)
ownranking() //获取自己排名
getRankList(data)
})
proxy.on('notifyMouseWinning',function (data) { //活动中奖通知
console.log(data)
$('#audio').attr("src","video/zhongjiang.mp3");
$('#notice').css('display','flex');
$('#tokenReadPackage').val(data);
$('#rank_mask').css('display','none');
......@@ -377,7 +368,8 @@
}
var Count_key = 0
function StartGame() {
audio2.play()
$('#audio').attr("src","video/ready321go.mp3");
Count=5;
Count2=30;
Count_key = 0;//初始为0
......@@ -407,12 +399,15 @@
}
//30秒倒计时
function Count30(){
$('#audio').attr("src","video/game_running.mp3");
ces2()
$("#time").html(30);
let clock = window.setInterval(function() {
Count2--;
$("#time").html(Count2);
if (Count2 === 0) {
$('#audio').attr("src","video/gameover.mp3");
window.clearInterval(clock);
window.clearInterval(timer1); //清除老鼠
sendScore(score)
......@@ -449,9 +444,12 @@
$('#notice').css('display','none')
})
$('#getAliPay').click(function(){
// setTimeout(function(){
// $('#goali')[0].click();
// },500);
setTimeout(function(){
let data = {
'action': 'Linking',
}
window.postMessage(JSON.stringify(data));
},500);
});
$('.return').click(function () {
......
......@@ -2,14 +2,14 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no">
<meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=no,viewport-fit=cover">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="full-screen" content="true">
<meta name="screen-orientation" content="portrait">
<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;">
......@@ -147,12 +147,12 @@
}
});
}
function initConnection(){
conn = $.hubConnection("http://localhost:7838/signalr", {
qs: `i=1951_Money&n=张建国&p=${encodeURIComponent(
"http://imgfile.oytour.com/Upload/User/636738107265395640.jpg"
)}`
});
var activity = JSON.parse(localStorage.activity);
var EmployeeId = activity.EmployeeId + '_Money';
function initConnection(){
var conn = $.hubConnection("http://192.168.2.65:7838/signalr", {
qs: `i=${EmployeeId}&n=${activity.EmName}&p=${encodeURIComponent(activity.imgUrl)}`
});
proxy = conn.createHubProxy("annualLeaveHub");
conn.start().done(data => {
console.log('connection 链接成功');
......@@ -171,10 +171,10 @@
$("#smm").css('display','none');
})
}
this.initConnection()
$(function () {
var clipboard = new Clipboard('.all_Receive');
var clipboard = new Clipboard('.all_Receive');
var music=document.getElementById('music');
var money_en = $("body");
//传递后台的分数
......@@ -210,7 +210,10 @@
});
$('#getAliPay').click(function(){
setTimeout(function(){
$('#goali')[0].click();
let data = {
'action': 'Linking',
}
window.postMessage(JSON.stringify(data));
},500);
});
//点击查看排行榜
......@@ -233,7 +236,7 @@
$('.tipsDiv').text('保存体力,等待开始');
if(data.status==1){
proxy.invoke('JoinGame','Money').done(data=>{
});
}
$("#rankBox").html("");
......@@ -342,7 +345,7 @@
// dosomething
$("#my_score").html(msg)
});
//$(".money_add span").html("¥"+i)
});
setTimeout(function () {
......@@ -356,4 +359,4 @@
}, false);
});
</script>
</html>
\ No newline at end of file
</html>
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0" />
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0,viewport-fit=cover" />
<meta name="format-detection" content="telephone=no" />
<meta content="yes" name="mobile-web-app-capable">
<meta content="yes" name="apple-mobile-web-app-capable" />
......@@ -207,8 +207,8 @@
<script>
var activity = JSON.parse(localStorage.activity);
var conn = $.hubConnection("http://192.168.2.66:7838/signalr", {
qs: `i=${activity.customerId}&n=${activity.EmName}&p=${encodeURIComponent(activity.imgUrl)}`
var conn = $.hubConnection("http://192.168.2.65:7838/signalr", {
qs: `i=${activity.EmployeeId}&n=${activity.EmName}&p=${encodeURIComponent(activity.imgUrl)}`
});
var proxy = conn.createHubProxy("annualLeaveHub");
conn.start().done(data => {
......@@ -216,8 +216,7 @@
}).fail(data => {});
getMsg()
function sendMsg() {
proxy.invoke("SendVoteProgarm",'1',activity.customerId).done(data => {
console.log(data)
proxy.invoke("SendVoteProgarm",'1',activity.EmployeeId).done(data => {
RankingList(data)
})
}
......
......@@ -5,6 +5,9 @@ body {
overflow-x: hidden;
height: 100%;
}
*{
-webkit-tap-highlight-color: transparent;
}
p{
margin: 0;
}
......@@ -131,7 +134,7 @@ p{
align-items: center;
justify-content: center;
}
.send_btn{
.send_btn p{
color: #893630;
font-size: 0.13rem;
}
......@@ -388,3 +391,13 @@ p{
align-items: center;
justify-content: center;
}
.AR{
width: 0.515rem;
height: 0.535rem;
position: fixed;
right: 0.15rem;
bottom: 1.5rem;
background-image: url('../../../images/aM/AR@2x.png');
background-size: 100% 100%;
background-repeat: no-repeat;
}
......@@ -7,6 +7,9 @@ body {
-webkit-overflow-scrolling: auto;
overflow-scrolling: auto
}
*{
-webkit-tap-highlight-color: transparent;
}
p{
margin: 0;
}
......
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0" />
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0,viewport-fit=cover" />
<meta name="format-detection" content="telephone=no" />
<meta content="yes" name="mobile-web-app-capable">
<meta content="yes" name="apple-mobile-web-app-capable" />
......@@ -48,8 +48,8 @@
<script>
var activity = JSON.parse(localStorage.activity);
var conn = $.hubConnection("http://192.168.2.66:7838/signalr", {
qs: `i=${activity.customerId}&n=${activity.EmName}&p=${encodeURIComponent(activity.imgUrl)}`
var conn = $.hubConnection("http://192.168.2.65:7838/signalr", {
qs: `i=${activity.EmployeeId}&n=${activity.EmName}&p=${encodeURIComponent(activity.imgUrl)}`
});
var proxy = conn.createHubProxy("annualLeaveHub");
conn.start().done(data => {
......@@ -98,7 +98,7 @@
}else {
if(giveUp ==false){
proxy.invoke("UserVoteProgarm",activity.customerId).done(data => {
proxy.invoke("UserVoteProgarm",activity.EmployeeId).done(data => {
console.log(data)
$('.popup').css('display','block')
$('.popup_bg img').attr('src','../../images/aM/toupiao.png')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment