新增账单,和修复bug

This commit is contained in:
dragon
2024-10-30 13:57:05 +08:00
parent 672e738456
commit 191e0bbe0d
31 changed files with 122 additions and 43 deletions

View File

@@ -340,6 +340,12 @@ body {
color: #fff;
}
.weeklyRewards .weeklyRewards_in .box .left .getOut {
background: #CDCED6;
border: none;
color: #fff;
}
.weeklyRewards .weeklyRewards_in .box .right {
float: right;
width: 6.21333rem;

View File

@@ -342,6 +342,11 @@ body {
border: none;
color: #fff;
}
.getOut {
background: #CDCED6;
border: none;
color: #fff;
}
}
.right {

View File

@@ -158,6 +158,12 @@ body {
color: #fff;
}
.box ul li .left .getOut {
background: #CDCED6;
border: none;
color: #fff;
}
.box ul li .right {
float: right;
width: 6.21333rem;

View File

@@ -159,6 +159,11 @@ body {
border: none;
color: #fff;
}
.getOut {
background: #CDCED6;
border: none;
color: #fff;
}
}
.right {

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@@ -108,7 +108,7 @@
<div class="textTop">
<div class="l"><strong class="weeklyRewardsText4"></strong><b>1</b></div>
<div class="r">
<b class="b1">0</b>/<b class="b2">0</b><img src="./images/coin.png" alt="">
<b class="b1">0</b>/<b class="b2">0</b><img src="./images/diamondss.png" alt="">
</div>
</div>
<div class="line">

View File

@@ -211,15 +211,23 @@ function get() {
});
$('.guildList ul').append(str);
// 渲染周奖励
$('.weeklyRewards .weeklyRewards_in .box .left span').text(unitProcessingAr(res.data.weekLevelReward.itemList[0].rewardNum, 2));
$('.weeklyRewards .weeklyRewards_in .box .right .textTop .l b').text(res.data.weekLevelReward.itemList[0].level);
$('.weeklyRewards .weeklyRewards_in .box .right .textTop .r .b1').text(res.data.weekLevelReward.itemList[0].processNum);
$('.weeklyRewards .weeklyRewards_in .box .right .textTop .r .b2').text(res.data.weekLevelReward.itemList[0].maxNum);
$('.weeklyRewards .weeklyRewards_in .box .right .line .line_in').css('width', `${(res.data.weekLevelReward.itemList[0].processNum / res.data.weekLevelReward.itemList[0].maxNum) * 100}%`);
$('.weeklyRewards .weeklyRewards_in .box .left .get').attr('id', res.data.weekLevelReward.itemList[0].id);
if (res.data.weekLevelReward.itemList[0].status == 1) {
$('.weeklyRewards .weeklyRewards_in .box .left .get').addClass('act');
$('.weeklyRewards .weeklyRewards_in .box .left .get').attr('status', res.data.weekLevelReward.itemList[0].status);
if (res.data.weekLevelReward.dateRange && res.data.weekLevelReward.itemList[0]) {
$('.weeklyRewards .weeklyRewards_in .box .left span').text(unitProcessingAr(res.data.weekLevelReward.itemList[0].rewardNum, 2));
$('.weeklyRewards .weeklyRewards_in .box .right .textTop .l b').text(res.data.weekLevelReward.itemList[0].level);
$('.weeklyRewards .weeklyRewards_in .box .right .textTop .r .b1').text(res.data.weekLevelReward.itemList[0].processNum);
$('.weeklyRewards .weeklyRewards_in .box .right .textTop .r .b2').text(res.data.weekLevelReward.itemList[0].maxNum);
$('.weeklyRewards .weeklyRewards_in .box .right .line .line_in').css('width', `${(res.data.weekLevelReward.itemList[0].processNum / res.data.weekLevelReward.itemList[0].maxNum) * 100}%`);
$('.weeklyRewards .weeklyRewards_in .box .left .get').attr('id', res.data.weekLevelReward.itemList[0].id);
if (res.data.weekLevelReward.itemList[0].status == 1) {
$('.weeklyRewards .weeklyRewards_in .box .left .get').addClass('act');
$('.weeklyRewards .weeklyRewards_in .box .left .get').attr('status', res.data.weekLevelReward.itemList[0].status);
}
if (res.data.weekLevelReward.itemList[0].status == 2) {
$('.weeklyRewards .weeklyRewards_in .box .left .get').addClass('getOut');
$('.weeklyRewards .weeklyRewards_in .box .left .get').text(langReplace(localLang.weeklyRewards.text5))
}
}else{
$('.weeklyRewards').hide();
}
} else {
toastMsg(res.message)

View File

@@ -114,13 +114,13 @@ function ulFun(index) {
<div class="left">
<img src="./images/coin.png" alt="" class="gold">
<span>${unitProcessingAr(res.rewardNum, 2)}</span>
<div class="get ${res.status == 1 ? 'getAct' : ''}" id=${res.id} status=${res.status}>${langReplace(localLang.weeklyRewards.text3)}</div>
<div class="get ${res.status == 1 ? 'getAct' : res.status == 2 ? 'getOut' : ''}" id=${res.id} status=${res.status}>${res.status == 2 ? langReplace(localLang.weeklyRewards.text5) : langReplace(localLang.weeklyRewards.text3)}</div>
</div>
<div class="right">
<div class="textTop">
<div class="l">${langReplace(localLang.weeklyRewards.text4)}<b>${res.level}</b></div>
<div class="r">
<b class="b1">${res.processNum}</b>/<b class="b2">${res.maxNum}</b><img src="./images/coin.png" alt="">
<b class="b1">${res.processNum}</b>/<b class="b2">${res.maxNum}</b><img src="./images/diamondss.png" alt="">
</div>
</div>
<div class="line">

View File

@@ -39,6 +39,7 @@ langAr = {
weeklyRewardsText1: 'مكافآت المضيف الأسبوعية',
weeklyRewardsText2: 'يمكنك الحصول على 2240000 عملة بالمجموع.',
weeklyRewardsText3: 'احصل على',
weeklyRewardsText33: `تم الاستلام`,
weeklyRewardsText4: 'مستوى المضيف',
weeklyRewardsText5: 'وقت إعادة التعيين: الاثنين 0:00 (GMT+3)',
},
@@ -326,7 +327,7 @@ langAr = {
text2: `يمكنك الحصول على <b>2240000</b> عملة بالمجموع.`,
text3: `احصل على`,
text4: `مستوى المضيف`,
text5: ``,
text5: `تم الاستلام`,
},
weeklyRewardsRule: {
text1: `القواعد`,

View File

@@ -37,6 +37,7 @@ langEn = {
weeklyRewardsText1: 'Host weekly rewards',
weeklyRewardsText2: 'You can get 2240000 coins totally.',
weeklyRewardsText3: 'Get',
weeklyRewardsText33: 'Got',
weeklyRewardsText4: 'Host Lv',
weeklyRewardsText5: 'Reset time: Monday 0:00 (GMT+3)',
},
@@ -325,7 +326,7 @@ langEn = {
text2: `You can get <b>2240000</b> coins totally.`,
text3: `Get`,
text4: `Host Lv`,
text5: ``,
text5: `Got`,
},
weeklyRewardsRule: {
text1: `Rules`,

View File

@@ -39,6 +39,7 @@ langZh = {
weeklyRewardsText1: '主播每週獎勵',
weeklyRewardsText2: '您可以總共獲得 2240000 金幣。',
weeklyRewardsText3: '領取',
weeklyRewardsText33: '已獲得',
weeklyRewardsText4: '主播等級',
weeklyRewardsText5: '重置時間:週一 0:00GMT+3',
},
@@ -327,7 +328,7 @@ langZh = {
text2: `您可以總共獲得 <b>2240000</b> 金幣。`,
text3: `領取`,
text4: `主播等級`,
text5: ``,
text5: `已獲得`,
},
weeklyRewardsRule: {
text1: `規則`,

View File

@@ -32,7 +32,7 @@
<div class="textTop">
<div class="l">Host Lv<b>1</b></div>
<div class="r">
<b class="b1">0</b>/<b class="b2">0</b><img src="./images/coin.png" alt="">
<b class="b1">0</b>/<b class="b2">0</b><img src="./images/diamondss.png" alt="">
</div>
</div>
<div class="line">

View File

@@ -343,6 +343,12 @@ body {
color: #fff;
}
.weeklyRewards .weeklyRewards_in .box .left .getOut {
background: #CDCED6;
border: none;
color: #fff;
}
.weeklyRewards .weeklyRewards_in .box .right {
float: right;
width: 6.21333rem;

View File

@@ -346,6 +346,11 @@ body {
border: none;
color: #fff;
}
.getOut {
background: #CDCED6;
border: none;
color: #fff;
}
}
.right {

View File

@@ -158,6 +158,12 @@ body {
color: #fff;
}
.box ul li .left .getOut {
background: #CDCED6;
border: none;
color: #fff;
}
.box ul li .right {
float: right;
width: 6.21333rem;

View File

@@ -158,6 +158,12 @@ body {
border: none;
color: #fff;
}
.getOut {
background: #CDCED6;
border: none;
color: #fff;
}
}
.right {
@@ -227,13 +233,16 @@ body {
right: auto;
left: px2rem(32);
}
.box ul li .left{
.box ul li .left {
float: right;
}
.box ul li .right{
.box ul li .right {
float: left;
}
.box ul li .right .line .line_in{
.box ul li .right .line .line_in {
left: auto;
right: 0;
}

View File

@@ -176,17 +176,25 @@ function get() {
`
});
$('.guildList ul').append(str);
// 渲染周奖励
$('.weeklyRewards .weeklyRewards_in .box .left span').text(unitProcessingAr(res.data.weekLevelReward.itemList[0].rewardNum, 2));
$('.weeklyRewards .weeklyRewards_in .box .right .textTop .l b').text(res.data.weekLevelReward.itemList[0].level);
$('.weeklyRewards .weeklyRewards_in .box .right .textTop .r .b1').text(res.data.weekLevelReward.itemList[0].processNum);
$('.weeklyRewards .weeklyRewards_in .box .right .textTop .r .b2').text(res.data.weekLevelReward.itemList[0].maxNum);
$('.weeklyRewards .weeklyRewards_in .box .right .line .line_in').css('width', `${(res.data.weekLevelReward.itemList[0].processNum / res.data.weekLevelReward.itemList[0].maxNum) * 100}%`);
$('.weeklyRewards .weeklyRewards_in .box .left .get').attr('id', res.data.weekLevelReward.itemList[0].id);
if (res.data.weekLevelReward.itemList[0].status == 1) {
$('.weeklyRewards .weeklyRewards_in .box .left .get').addClass('act');
$('.weeklyRewards .weeklyRewards_in .box .left .get').attr('status', res.data.weekLevelReward.itemList[0].status);
}
// 渲染周奖励
if (res.data.weekLevelReward.dateRange && res.data.weekLevelReward.itemList[0]) {
$('.weeklyRewards .weeklyRewards_in .box .left span').text(unitProcessingAr(res.data.weekLevelReward.itemList[0].rewardNum, 2));
$('.weeklyRewards .weeklyRewards_in .box .right .textTop .l b').text(res.data.weekLevelReward.itemList[0].level);
$('.weeklyRewards .weeklyRewards_in .box .right .textTop .r .b1').text(res.data.weekLevelReward.itemList[0].processNum);
$('.weeklyRewards .weeklyRewards_in .box .right .textTop .r .b2').text(res.data.weekLevelReward.itemList[0].maxNum);
$('.weeklyRewards .weeklyRewards_in .box .right .line .line_in').css('width', `${(res.data.weekLevelReward.itemList[0].processNum / res.data.weekLevelReward.itemList[0].maxNum) * 100}%`);
$('.weeklyRewards .weeklyRewards_in .box .left .get').attr('id', res.data.weekLevelReward.itemList[0].id);
if (res.data.weekLevelReward.itemList[0].status == 1) {
$('.weeklyRewards .weeklyRewards_in .box .left .get').addClass('act');
$('.weeklyRewards .weeklyRewards_in .box .left .get').attr('status', res.data.weekLevelReward.itemList[0].status);
}
if (res.data.weekLevelReward.itemList[0].status == 2) {
$('.weeklyRewards .weeklyRewards_in .box .left .get').addClass('getOut');
$('.weeklyRewards .weeklyRewards_in .box .left .get').text(langReplace(localLang.weeklyRewards.text5))
}
} else {
$('.weeklyRewards').hide();
}
} else {
toastMsg(res.message)
}

View File

@@ -114,7 +114,7 @@ function ulFun(index) {
<div class="left">
<img src="./images/coin.png" alt="" class="gold">
<span>${unitProcessingAr(res.rewardNum, 2)}</span>
<div class="get ${res.status == 1 ? 'getAct' : ''}" id=${res.id} status=${res.status}>${langReplace(localLang.weeklyRewards.text3)}</div>
<div class="get ${res.status == 1 ? 'getAct' : res.status == 2 ? 'getOut' : ''}" id=${res.id} status=${res.status}>${res.status == 2 ? langReplace(localLang.weeklyRewards.text5) : langReplace(localLang.weeklyRewards.text3)}</div>
</div>
<div class="right">
<div class="textTop">

View File

@@ -33,6 +33,7 @@ langAr = {
weeklyRewardsText1: 'مكافآت المضيف الأسبوعية',
weeklyRewardsText2: 'يمكنك الحصول على 185000 عملة بالمجموع.',
weeklyRewardsText3: 'احصل على',
weeklyRewardsText33: 'تم الاستلام',
weeklyRewardsText4: 'مستوى المضيف',
weeklyRewardsText5: 'وقت إعادة التعيين: الاثنين 0:00 (GMT+8)',
},
@@ -193,7 +194,7 @@ langAr = {
text2: `يمكنك الحصول على <b>185000</b> عملة بالمجموع.`,
text3: `احصل على`,
text4: `مستوى المضيف`,
text5: ``,
text5: `تم الاستلام`,
},
weeklyRewardsRule: {
text1: `القواعد`,

View File

@@ -31,6 +31,7 @@ langEn = {
weeklyRewardsText1: 'Host weekly rewards',
weeklyRewardsText2: 'You can get 185000 coins totally.',
weeklyRewardsText3: 'Get',
weeklyRewardsText33: 'Got',
weeklyRewardsText4: 'Host Lv',
weeklyRewardsText5: 'Reset time: Monday 0:00 (GMT+8)',
},
@@ -191,7 +192,7 @@ langEn = {
text2: `You can get <b>185000</b> coins totally.`,
text3: `Get`,
text4: `Host Lv`,
text5: ``,
text5: `Got`,
},
weeklyRewardsRule: {
text1: `Rules`,

View File

@@ -33,6 +33,7 @@ langZh = {
weeklyRewardsText1: '主播每週獎勵',
weeklyRewardsText2: '您可以總共獲得 185000 金幣。',
weeklyRewardsText3: '領取',
weeklyRewardsText33: '已獲得',
weeklyRewardsText4: '主播等級',
weeklyRewardsText5: '重置時間:週一 0:00GMT+8',
},
@@ -194,7 +195,7 @@ langZh = {
text2: `您可以總共獲得 <b>185000</b> 金幣。`,
text3: `領取`,
text4: `主播等級`,
text5: ``,
text5: `已獲得`,
},
weeklyRewardsRule: {
text1: `規則`,

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>molistar</title><link href=./static/css/app.5d698968ff9d3617c43c45d3138d3365.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.407bc85e06ac972f36f7.js></script><script type=text/javascript src=./static/js/vendor.ef63a6e67767f10f7bb6.js></script><script type=text/javascript src=./static/js/app.c0a55aa553bd3b88aa1d.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>molistar</title><link href=./static/css/app.44211d465cb0d014cc9246142d7a13a7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.64d282af95bfe3b8d31f.js></script><script type=text/javascript src=./static/js/vendor.ef63a6e67767f10f7bb6.js></script><script type=text/javascript src=./static/js/app.1f42635e687324c7f3ae.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 +1,2 @@
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[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 a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"9b42e162ef90c3d92a52",1:"c2ef46c6dcac24931ba4",2:"17debe0f6011a97521e8",3:"a4c2cd2893242b26adcb",4:"1c8935faedda18361064",5:"ef1af840bdcca111b7da",6:"0e7ac399b5d59483b7f2",7:"770781e704ff5805cd00",8:"4218eb5becaddd649623",9:"d02156509389fc441584",10:"9f5644b8d8539a302508",11:"5d316356ba01de644f13",12:"b16a14104ab77a57b8a2"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),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.407bc85e06ac972f36f7.js.map
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(n&&n(r,a,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=o(o.s=c[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 a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"9b42e162ef90c3d92a52",1:"c2ef46c6dcac24931ba4",2:"17debe0f6011a97521e8",3:"a4c2cd2893242b26adcb",4:"1c8935faedda18361064",5:"fe141e2285ec9a9a15b3",6:"0e7ac399b5d59483b7f2",7:"770781e704ff5805cd00",8:"4218eb5becaddd649623",9:"d02156509389fc441584",10:"9f5644b8d8539a302508",11:"5d316356ba01de644f13",12:"b16a14104ab77a57b8a2"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,a.appendChild(c),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.64d282af95bfe3b8d31f.js.map

View File

@@ -1,5 +1,6 @@
const ar = {
diamondLog: {
主播周奖励: "مكافآت الأسبوع للمضيف",
解除CP手续费: 'بالتأكيد',
SS公会活动奖励: 'جوائز حدث نقابة SS',
公會usd兌換給代儲收入: 'دخل تبادل الدولار للإيداع',

View File

@@ -1,5 +1,6 @@
const en = {
diamondLog: {
主播周奖励: "Host Weekly Rewards",
解除CP手续费: 'Pay Fee',
SS公会活动奖励: 'SS Guild Event Rewards',
公會usd兌換給代儲收入: ' Guild USD for Deposit Income',

View File

@@ -1,5 +1,6 @@
const zh = {
diamondLog: {
主播周奖励: "主播周獎勵",
解除CP手续费: '解除CP手續費',
SS公会活动奖励: 'SS公會活動奬勵',
公會usd兌換給代儲收入: '公會usd兌換給代儲收入',

View File

@@ -168,6 +168,12 @@
<p v-else-if="tab === 11 && item1.objType === 125">
{{ $t("diamondLog.SS公会活动奖励") }}
</p>
<p v-else-if="tab === 11 && item1.objType === 134">
{{ $t("diamondLog.主播周奖励") }}
</p>
<p v-else-if="tab === 11 && item1.objType === 135">
{{ $t("diamondLog.主播周奖励") }}
</p>
<p v-if="tab === 12 && item1.objType === 40">
{{ $t("diamondLog.全服紅包_發生在") }}{{ item1.roomTitle }}
</p>