Compare commits

..

35 Commits

Author SHA1 Message Date
dragon
1faa0d238e 清楚缓存 2024-04-10 16:59:15 +08:00
dragon
7f5996c18d 修改判断正式测试方式 2024-04-10 16:47:29 +08:00
dragon
2720ddcb96 修改提示 2024-04-09 12:06:44 +08:00
wanglong
6e6b3ce88e 修改贵族规则,新增规则账单 2024-04-01 18:10:33 +08:00
Dragon
93b7698a95 修改疯狂动物园音效声音大小 2024-03-29 16:52:05 +08:00
Dragon
7659a5db68 清除缓存 2024-03-29 16:30:02 +08:00
Dragon
3790ddf2b8 完善厨房音效特性 2024-03-29 16:27:27 +08:00
Dragon
78be3be98e 新增标头信息 2024-03-29 14:53:11 +08:00
Dragon
597d717c9d 厨房音效暂存 2024-03-29 14:42:50 +08:00
Dragon
00f179e786 优化名字 2024-03-28 10:58:09 +08:00
Dragon
ddc6d7e6c4 优化房间帮ui 2024-03-28 10:17:29 +08:00
Dragon
4f23c91703 替换图片 2024-03-27 17:59:34 +08:00
Dragon
bfac90f0d5 替换ui优化首页魔盒任务 2024-03-27 14:42:00 +08:00
Dragon
700c523190 修复bug 2024-03-26 20:48:39 +08:00
Dragon
26c35ac780 新增未直播跳转房间逻辑 2024-03-26 18:21:57 +08:00
Dragon
c9179fe6c7 修改倒计时判断内容 2024-03-26 17:21:31 +08:00
Dragon
c788cc4f9c 修复房间列表报错问题 2024-03-26 15:45:06 +08:00
Dragon
f62710be48 繁体化 2024-03-26 15:25:09 +08:00
Dragon
f17f734d6a 新增未开始倒计时判断 2024-03-26 15:22:57 +08:00
Dragon
aa1880de2d 新增图片 2024-03-25 19:05:14 +08:00
Dragon
f71a301cd1 完成愚人节活动 2024-03-25 19:05:14 +08:00
Dragon
880d9db326 首页暂存 2024-03-25 19:05:13 +08:00
Dragon
c2f227a79e 暂存 2024-03-25 19:05:13 +08:00
Dragon
c11b655899 新增幸运礼物账单 2024-03-25 15:33:38 +08:00
Dragon
913cb44d94 修改账单 2024-03-20 21:24:29 +08:00
Dragon
295eae5074 重新加载js 2024-03-20 21:15:55 +08:00
Dragon
a760db5870 修改规则 2024-03-20 19:49:39 +08:00
Dragon
4b5ca4596b ios专用mobling 2024-03-20 16:26:59 +08:00
Dragon
3befdb2473 修改ios跳转逻辑 2024-03-20 14:09:26 +08:00
Dragon
9a30334f5d 新增ios跳转 2024-03-20 11:16:26 +08:00
Dragon
2e32e08284 新增账单;修改分享标题 2024-03-19 18:36:52 +08:00
Dragon
8f73aee4dc 修复bug 2024-03-18 16:05:30 +08:00
Dragon
4c4f8f1713 新增邀请活动 2024-03-18 11:13:22 +08:00
Dragon
b4d2acfe26 替换奖励规则 2024-03-13 16:17:34 +08:00
Dragon
cc1f0a2ef1 修改活动规则 2024-03-13 01:07:58 +08:00
50 changed files with 61 additions and 46 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 KiB

After

Width:  |  Height:  |  Size: 240 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 341 KiB

After

Width:  |  Height:  |  Size: 329 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 356 KiB

After

Width:  |  Height:  |  Size: 345 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 414 KiB

After

Width:  |  Height:  |  Size: 414 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 414 KiB

View File

@@ -417,7 +417,7 @@ function giftGetRank (rankType, date) {
top3.forEach((res, i) => {
$(`.page4 .top3 .no${i + 1} .tx`).attr('src', res.avatar);
$(`.page4 .top3 .no${i + 1} .nick`).text(res.nick);
$(`.page4 .top3 .no${i + 1} .score`).html(`${rankType == 1 || rankType == 2 ? '愚樂值' : '樂值'}<br>` + unitProcessing(res.score, 10000, 1, 'w'))
$(`.page4 .top3 .no${i + 1} .score`).html(`${rankType == 1 || rankType == 2 ? '愚樂值' : '樂值'}<br>` + unitProcessing(res.score, 10000, 1, 'w'))
})
// 非前三
var str = '';
@@ -428,7 +428,7 @@ function giftGetRank (rankType, date) {
<div class="num">${res.ranking}.</div>
<img src="${res.avatar}" alt="" class="tx">
<div class="nick">${res.nick}</div>
<div class="score">${rankType == 1 || rankType == 2 ? '愚樂值' : '樂值'}: ${unitProcessing(res.score, 10000, 1, 'w')}</div>
<div class="score">${rankType == 1 || rankType == 2 ? '愚樂值' : '樂值'}: ${unitProcessing(res.score, 10000, 1, 'w')}</div>
</li>
`
})
@@ -437,7 +437,7 @@ function giftGetRank (rankType, date) {
$('.page4 .my .num').text(res.data.meRank.ranking == 0 ? '未上榜' : res.data.meRank.ranking);
$('.page4 .my .tx').attr('src', res.data.meRank.avatar);
$('.page4 .my .nick').text(res.data.meRank.nick);
$('.page4 .my .score').text(`${rankType == 1 || rankType == 2 ? '愚樂值' : '樂值'}` + unitProcessing(res.data.meRank.score, 10000, 1, 'w'));
$('.page4 .my .score').text(`${rankType == 1 || rankType == 2 ? '愚樂值' : '樂值'}` + unitProcessing(res.data.meRank.score, 10000, 1, 'w'));
} else {
toastMsg(res.message)
}

View File

@@ -96,7 +96,7 @@
<span class="sp2">+1000 <img src="./images/diamond.png" alt="" class="diamond"></span>
</div>
<div class="rule2">
<h3>邀請好友儲值返現,纍計高達10%持續30天</h3>
<h3>邀請好友儲值返現,纍計高達7%持續30天</h3>
<div class="text1">邀請人:妳</div>
<div class="text2">直接邀請對象</div>
<div class="text3">間接邀請對象</div>
@@ -143,7 +143,7 @@
<li class="title">關於邀請獎勵結算</li>
<li>1.被邀用戶收益:新用戶填寫邀請碼後繫統自動發放權益至所屬賬號</li>
<li>2.邀請用戶收益:被邀新用戶填寫邀請碼後繫統自動發放權益至所屬賬號</li>
<li>3.充值獎勵新用戶自填寫邀請碼30日內完成首次儲值,可獲得魔法棒獎勵,魔法棒可用於參與許願之星玩法,獲取珍稀禮物獎勵;完成指定數額儲值後,邀請人可獲得額外收益,收益實時到賬;</li>
<li>3.充值獎勵:僅統計直接充值數據;新用戶自填寫邀請碼30日內完成首,可獲得魔法棒獎勵,魔法棒可用於參與許願之星玩法,獲取珍稀禮物獎勵;完成指定數額充值,邀請人可獲得額外收益,收益實時到賬;</li>
<li class="title">關於無效的邀請</li>
<li>1.使用同一設備,同一手機號碼,同一身份信息註冊的用戶視為同一用戶,不能重復獲得獎勵;若邀請人與被邀請人使用同一設備,同一身份信息,同一手機號碼,邀請人無法獲取獎勵</li>
<li>2.每位新用戶僅能填寫一次邀請碼,填寫後不支持修改,註意註意!邀請碼不支持補填,還請邀請新用戶時告知新用戶註冊時及時填寫邀請碼,否則本次邀請無效;</li>

View File

@@ -233,7 +233,7 @@ function profitPage () {
var str = '';
if (text == '直接' && typeStr == "1,3") {
$('.bg .incomeBox .tableTitle div').remove();
$('.bg .incomeBox .tableTitle').append(`<div>時間</div><div>收益</div><div>收益類型</div><div>直接請對象</div>`);
$('.bg .incomeBox .tableTitle').append(`<div>時間</div><div>收益</div><div>收益類型</div><div>直接請對象</div>`);
} else if (text == '間接' && typeStr == "2,4") {
$('.bg .incomeBox .tableTitle div').remove();
$('.bg .incomeBox .tableTitle').append(`<div>時間</div><div>收益</div><div>收益類型</div><div>間接邀請對象</div>`);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 164 KiB

After

Width:  |  Height:  |  Size: 159 KiB

View File

@@ -186,14 +186,16 @@
<li>c.每送齊或收齊一次全套,所獲得的裝扮贈禮天數會纍加;</li>
<li>2.甜蜜升溫</li>
<li>a.活動期間,超珍稀禮物直購限時開放,贈送禮物每達指定價值即可解鎖直購;</li>
<li>b.贈送禮物價值每滿13140鉆即可購買【心動一剎13140鉆】贈送禮物價值每滿33440鉆即可購買【絕對寵溺33440鉆】</li>
<li>b.贈送禮物價值每滿131400即可購買【心動一剎131400鉆】贈送禮物價值每滿334400即可購買【絕對寵溺334400鉆】;</li>
<li>c.購買的禮物將直接放入背包當中;</li>
<li>3.熱戀時刻</li>
<li>a.活動期間比拼熱戀值</li>
<li>b.詳細榜單規則與獎勵可見榜單說明;</li>
<li>a.活動期間,比拼熱戀值活動期間內,送禮方與收禮方產生CP關系,收到禮物可增加熱戀值,10鑽=1熱戀值;</li>
<li>b. 禮物包含禮物面板禮物和背包禮物;</li>
<li>c. 若熱戀值相同則按照最早贈送時間優先排序;</li>
<li>d. 活動榜單僅有總榜,總榜前3可獲得相應獎勵,CP中男方獲得藍色裝扮,女方獲得粉色裝扮,總榜獎勵將在活動結束後統一自動發放;</li>
<li> 三、特別說明</li>
<li>1.靚號持有者需要在活動結束後2周內確認靚號否則將自動過期無法使用</li>
<li>2.本活動以及獎勵與蘋果公司無關。</li>
<li>a. 靚號持有者需要在活動結束後2周內確認靚號否則將自動過期無法使用</li>
<li>b. 本活動以及獎勵與Apple公司無關。</li>
</ul>
</div>
</div>
@@ -251,7 +253,7 @@
<div class="page3Rule_in">
<img src="./images/page3Title.png" alt="" class="title">
<div class="box">
<img src="./images/page3Rule_inBg.png" alt="">
<img src="./images/page3Rule_inBg.png?v=1.0" alt="">
</div>
</div>
</div>

View File

@@ -44,8 +44,8 @@ html {
width: 0.8rem;
height: 0.8rem;
position: absolute;
right: 0.1rem;
top: 2.0rem;
right: 0.55rem;
top: 1.8rem;
}
.header .record_icon {

View File

@@ -47,8 +47,9 @@ html {
width: px2rem(60);
height: px2rem(60);
position: absolute;
right: 0.1rem;
top: 2.0rem;
right: 0.55rem;
// top: 2.0rem;
top: 1.8rem;
}
.record_icon {

Binary file not shown.

Binary file not shown.

View File

@@ -7,7 +7,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>瘋狂動物園</title>
<link rel="stylesheet" href="../../common/css/reset.css">
<link rel="stylesheet" href="./css/index.css?v=1.0">
<link rel="stylesheet" href="./css/index.css?v=1.1">
</head>
<body>
@@ -315,15 +315,15 @@
<!-- 投入音效 -->
<audio style="display: none;" id="draw">
<source src="https://img.tukuppt.com/newpreview_music/09/00/67/5c8941a76fd1b53174.mp3" type="audio/mp3">
<source src="./images/draw.mp3" type="audio/mp3">
</audio>
<!-- 开奖中音效 -->
<audio style="display: none;" id="lotteryMusic">
<source src="https://img.tukuppt.com/newpreview_music/09/00/67/5c8941a43051468781.mp3" type="audio/mp3">
<source src="./images/lotteryMusic.mp3" type="audio/mp3">
</audio>
<!-- 背景音效 -->
<audio style="display: none;" id="backgroundMusic" autoplay loop>
<source src="https://img.tukuppt.com/newpreview_music/08/99/14/5c88e514c9bd380408.mp3" type="audio/mp3">
<source src="./images/backgroundMusic.mp3" type="audio/mp3">
</audio>
</body>
@@ -335,4 +335,4 @@
<script src="../../common/js/vconsole.min.js"></script>
<script src="../../common/js/svga.min.js"></script>
<script src="./js/wow.js"></script>
<script src="./js/index.js?v=1.1"></script>
<script src="./js/index.js?v=1.3"></script>

View File

@@ -42,11 +42,27 @@ let pageSizeLack = true;
var audioIf = true;
var backgroundMusic = document.getElementById('backgroundMusic');
var lotteryMusic = document.getElementById('lotteryMusic');
var drawBut = document.getElementById("draw");
backgroundMusic.volume = 0.2;
drawBut.volume = 1;
$(function () {
getInfoFromClient()
setTimeout(function () {
getNewestAct();
}, 100)
let startPlayPromise = backgroundMusic.play();
if (startPlayPromise !== undefined) {
startPlayPromise.catch(error => {
if (error.name === "NotAllowedError") {
// 弹窗引导用户与页面做交互,只需要一个简单的按钮即可
// 记得在按钮上绑定一个带有play()方法的回调函数以element-plus的组件为例
audioIf = false;
$('.muciek').attr('src', './images/jin.png');
toastMsg('检测到您的设备因权限问题,无法播放音乐,请在右上角打开音乐')
}
}).then(() => {
});
}
})
// 獲取用戶相關信息
function getUserInfo () {
@@ -111,8 +127,10 @@ function getNewestAct () {
// 第二階段
backgroundMusic.pause();
lotteryMusic.currentTime = 0;
lotteryMusic.volume = 100 / 100;
lotteryMusic.play();
lotteryMusic.volume = 1;
if (audioIf) {
lotteryMusic.play();
}
console.log("第二階段");
countupTimes = Math.floor(((showResultStageStartTime - drawStageStartTime) - (userComeinTime - drawStageStartTime)) / 1000 + 1);
@@ -315,10 +333,11 @@ function draw (itemId, tais) {
$('.box .box_in .sBox').click(function () {
var id = $(this).attr('id');
// $(this).children('.qp').show();
var drawBut = document.getElementById("draw");
drawBut.pause();
drawBut.currentTime = 0; // 将当前时间设置为0可选
drawBut.play();
if (audioIf) {
drawBut.play();
}
draw(id, $(this));
})
@@ -516,12 +535,14 @@ $('.muciek').click(function () {
if (audioIf) {
$(this).attr('src', './images/bo.png')
backgroundMusic.play();
lotteryMusic.volume = 0;
lotteryMusic.play();
} else {
$(this).attr('src', './images/jin.png')
backgroundMusic.pause();
lotteryMusic.pause();
}
})
//返回页面 重新请求接口
// var hiddenProperty = 'hidden' in document ? 'hidden' :
// 'webkitHidden' in document ? 'webkitHidden' :

View File

@@ -66,8 +66,8 @@ function convert (_url) {
// 根据域名适配环境
function EnvCheck () {
if (window.location.href) {
var _url = window.location.href;
if (window.location.host) {
var _url = window.location.host;
var res = _url.match(/uat/);
var res1 = _url.match(/120.79.211.243/);
var res2 = _url.match(/192.168./)

View File

@@ -57,4 +57,4 @@
<script src="../../common/js/vconsole.min.js"></script>
<script src="../../common/js/route-constant.js"></script>
<script src="../../common/js/svga.min.js"></script>
<script src="./js/index.js?v=1.1"></script>
<script src="./js/index.js?v=1.0"></script>

View File

@@ -46,12 +46,11 @@ function getQueryWithRoomType () {
type: 'GET',
url: urlPrefix + '/purse/queryWithRoomType',
success (res) {
console.log(res);
if (res.code === 200) {
$('.diamond p').text(res.data.diamonds);
$('.gold p').text(res.data.golds);
} else if (res.code ? res.code == 1444 : JSON.parse(res).code == 401) {
// window.location.href = './login.html'
window.location.href = './login.html'
} else {
toastMsg(res.message)
}
@@ -71,13 +70,12 @@ function getUser () {
url: urlPrefix + '/user/get',
data: { uid: pubInfo.uid },
success (res) {
console.log(res);
if (res.code === 200) {
$('.myInfo img').attr('src', res.data.avatar);
$('.myInfo div p').text(res.data.nick);
$('.myInfo div b').text("ID:" + res.data.erbanNo);
} else if (res.code ? res.code == 1444 : JSON.parse(res).code == 401) {
// window.location.href = './login.html'
window.location.href = './login.html'
} else {
toastMsg(res.message)
}

View File

@@ -21,11 +21,11 @@
<div class="box1">
<div>
<span>開戶姓氏</span>
<input class="name" type="text" placeholder="例:ZHANG">
<input class="name" type="text" placeholder="例:">
</div>
<div>
<span>開戶名稱</span>
<input class="accountName" type="text" placeholder="例:LEE HONG">
<input class="accountName" type="text" placeholder="例:">
</div>
<div>
<span>身份證號备份</span>

View File

@@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>piko</title><link href=./static/css/app.8fde499311653463cf20b629040b9f05.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.1653609013b7d6707594.js></script><script type=text/javascript src=./static/js/vendor.549947ec2550614f506c.js></script><script type=text/javascript src=./static/js/app.f56d535f53d3c277e0fd.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>piko</title><link href=./static/css/app.8fde499311653463cf20b629040b9f05.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.1653609013b7d6707594.js></script><script type=text/javascript src=./static/js/vendor.549947ec2550614f506c.js></script><script type=text/javascript src=./static/js/app.f56d535f53d3c277e0fd.js></script></body></html>

View File

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

View File

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

View File

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 60 KiB

View File

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

View File

Before

Width:  |  Height:  |  Size: 208 KiB

After

Width:  |  Height:  |  Size: 208 KiB

View File

@@ -1 +0,0 @@
<!DOCTYPE html><html><head><meta charset=UTF-8><meta name=viewport content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1"><title>piko</title><link href=./static/css/app.f28780edec4bbb06351c63c43d46b092.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.52adb06e7cb7bf02e373.js></script><script type=text/javascript src=./static/js/vendor.549947ec2550614f506c.js></script><script type=text/javascript src=./static/js/app.f56d535f53d3c277e0fd.js></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,2 +0,0 @@
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,f){for(var a,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(a in c)Object.prototype.hasOwnProperty.call(c,a)&&(e[a]=c[a]);for(n&&n(r,c,f);s.length;)s.shift()();if(f)for(d=0;d<f.length;d++)u=o(o.s=f[d]);return u};var r={},t={15:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,o.nc&&f.setAttribute("nonce",o.nc),f.src=o.p+"static/js/"+e+"."+{0:"ec4de892f04f94b4c2f6",1:"c2ef46c6dcac24931ba4",2:"17debe0f6011a97521e8",3:"fe32c1237c8826c80886",4:"95d3c8221db60b228eb2",5:"17af78067186c41627dc",6:"0e7ac399b5d59483b7f2",7:"c60dff0fd854d6fc291f",8:"43a07f21010bbe7fcd6c",9:"d02156509389fc441584",10:"68b3b250aa24f55d8a82",11:"5d316356ba01de644f13",12:"34fff916cd789ce22038"}[e]+".js";var a=setTimeout(i,12e4);function i(){f.onerror=f.onload=null,clearTimeout(a);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return f.onerror=f.onload=i,c.appendChild(f),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.52adb06e7cb7bf02e373.js.map

View File

@@ -102,7 +102,7 @@
</html>
<script src="../../common/js/flexible.js"></script>
<script src="../../common/js/jquery-3.2.1.min.js"></script>
<script src="../../common/js/common2.js"></script>
<script src="../../common/js/common2.js?v=1.0"></script>
<script src="../../common/js/layer.js"></script>
<script src="../../common/js/vconsole.min.js"></script>
<script src="../../common/js/route-constant.js"></script>

View File

@@ -61,8 +61,8 @@
<p v-else-if="tab === 11 && item1.objType === 102">中秋活动瓜分钻石</p>
<p v-else-if="tab === 11 && item1.objType === 35">官方贈送鉆石</p>
<p v-else-if="tab === 11 && item1.objType === 67">守護星球獲得</p>
<p v-else-if="tab === 11 && item1.objType === 103">邀请好友注册奖励</p>
<p v-else-if="tab === 11 && item1.objType === 104">被邀请注册奖励</p>
<p v-else-if="tab === 11 && item1.objType === 104">邀请好友注册奖励</p>
<p v-else-if="tab === 11 && item1.objType === 103">被邀请注册奖励</p>
<p v-else-if="tab === 11 && item1.objType === 105">直接邀请储值返点</p>
<p v-else-if="tab === 11 && item1.objType === 106">间接邀请储值返点</p>
<p v-else-if="tab === 11 && item1.objType === 107">超级幸运礼物价值分成</p>