moliparty/eparty-h5
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
dragon
2024-08-22 19:13:25 +08:00
parent 9cfd53a88c
commit aa3f9a7203
8 changed files with 60 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
view/molistar/common/js/common2.js
View File

@@ -739,11 +739,11 @@ function getInfoFromClient() {
}
} else {
// 非app环境调试参数
pubInfo.uid = sessionStorage.getItem("uid") ? sessionStorage.getItem("uid") : '';
// pubInfo.ticket = sessionStorage.getItem("ticket") ? sessionStorage.getItem("ticket") : '';
pubInfo.h5_token = sessionStorage.getItem("ticket") ? sessionStorage.getItem("ticket") : '';
pubInfo.deviceId = "0";
// 非app环境调试参数
pubInfo.uid = sessionStorage.getItem("uid") ? sessionStorage.getItem("uid") : '';
// pubInfo.ticket = sessionStorage.getItem("ticket") ? sessionStorage.getItem("ticket") : '';
pubInfo.h5_token = sessionStorage.getItem("ticket") ? sessionStorage.getItem("ticket") : '';
pubInfo.deviceId = "0";
pubInfo.deviceInfo = {
app: 'molistarApp',
appVersion: '9.9.9',
@@ -829,11 +829,11 @@ function langCodeFun(langCode) {
// if (window.location.href.match(/guildAr/)) {
// return
// }
var body = document.body;
body.style.display = 'none';
setTimeout(function () {
body.style.display = 'block';
}, 500)
// var body = document.body;
// body.style.display = 'none';
// setTimeout(function () {
// body.style.display = 'block';
// }, 500)
if (langCode == "ar") {
document.documentElement.setAttribute("dir", "rtl");
document.body.classList.add('arabic');

2
view/molistar/modules/guild-ar/css/success.css
View File

@@ -90,6 +90,7 @@ main .settlement_wrap li p {
font-weight: 500;
font-size: 0.37333rem;
color: #7b7b7d;
white-space: nowrap;
}
main .exchange_wrap li b,
@@ -99,6 +100,7 @@ main .settlement_wrap li b {
color: #313131;
display: flex;
align-items: center;
white-space: nowrap;
}
main .exchange_wrap li b #copy,

2
view/molistar/modules/guild-ar/css/success.scss
View File

@@ -90,6 +90,7 @@ main {
font-weight: 500;
font-size: px2rem(14);
color: #7b7b7d;
white-space: nowrap;
}
b {
@@ -98,6 +99,7 @@ main {
color: #313131;
display: flex;
align-items: center;
white-space: nowrap;
#copy {
width: px2rem(16);

3
view/molistar/modules/guild-ar/js/personal.js
View File

@@ -94,11 +94,11 @@ function getAccount() {
// 判断是否展示agency
// person
// 处理自己
$('.page1 .diamond p b').text(res.data.person.diamondNum);
var me = res.data.person.me;
$('.page1 .my .tx').attr('src', me.avatar);
$('.page1 .my .user p').text(me.nick);
$('.page1 .my .user b').text(me.erbanNo);
$('.page1 .diamond p b').text(res.data.diamondNum);
// 处理当前
var curCycle = res.data.person.curCycle;
$('.page1 .incomeTitle i').text(curCycle.cycleDate);
@@ -115,6 +115,7 @@ function getAccount() {
if (res.data.agency) {
var agency = res.data.agency
$('.page2 .agentSalary i').text(agency.curCycleInterval);
$('.page2 .agentSalary2 i').text(agency.curCycleInterval);
$('.page2 .agentSalaryInfo .top b').text(`${agency.usdWage} ÜS`);
$('.page2 .agentSalaryInfo .bottom div .p1').text(agency.diamondNum);
$('.page2 .agentSalaryInfo .bottom div .p2').text(agency.diamondRatio * 100 + '%');

53
view/molistar/modules/guild-ar/js/salary.js
View File

@@ -105,7 +105,7 @@ function getTab() {
// 渲染公会长结算弹窗数据
var guildOwner = res.data.guildOwner;
$('.president_pop .avatar').attr('src', guildOwner.avatar);
$('.president_pop .sure').attr('src', guildOwner.uid);
$('.president_pop .sure').attr('uid', guildOwner.uid);
$('.president_pop .name p').text(`${guildOwner.nick}`);
$('.president_pop .id').text(`ID:${guildOwner.erbanNo}`);
// 代理弹窗数据
@@ -128,6 +128,7 @@ function getTab() {
`
})
$('.agent_pop .wrap').append(agent_popStr);
$('.agent_pop .sure').attr('uid', rechargeUserList[0].uid);
}
// 当前可提现余额
usGold = res.data.guildUsdNum
@@ -156,10 +157,10 @@ function getTab() {
$('.agent_pop .wrap').on('click', 'li', function () {
var uid = $(this).attr('uid');
$(this).addClass('li_act').siblings().removeClass('li_act')
$('.agent_pop .btn_wrap sure').attr('uid', uid);
$('.agent_pop .btn_wrap .sure').attr('uid', uid);
})
// 选择会长结算
$('.president_pop .btn_wrap sure').click(function () {
$('.president_pop .btn_wrap .sure').click(function () {
than = $(this);
operateValue(than);
})
@@ -175,8 +176,8 @@ function typeTabFun(type) {
ratio = arr[0].ratio
$('.confirm').attr('type', transfer_dollars_ArrType);
$('.custom_pop .sure').attr('type', transfer_dollars_ArrType);
$('.president_pop .btn_wrap sure').attr('type', transfer_dollars_ArrType);
$('.agent_pop .btn_wrap sure').attr('type', transfer_dollars_ArrType);
$('.president_pop .btn_wrap .sure').attr('type', transfer_dollars_ArrType);
$('.agent_pop .btn_wrap .sure').attr('type', transfer_dollars_ArrType);
arr.forEach((res, i) => {
transfer_dollars_Arr[res.type] = res;
if (res.type == 1) {
@@ -199,7 +200,7 @@ function typeTabFun(type) {
<span>( 1 ÜS = <e>${res.ratio}</e> <img src="./images/coin.png" class="coin" />)</span>
</li>
`
} else if (res.type == 3) {
} else if (res.type == 5) {
str += `
<li class="official_withdraw ${i == 0 ? 'li_act' : ''}" type="${res.type}" ratio="${res.ratio}">
<p>
@@ -223,14 +224,14 @@ function typeTabFun(type) {
</div>
</li>
`
} else if (res.type == 5) {
} else if (res.type == 3) {
str += `
<li class="agent_settlement ${i == 0 ? 'li_act' : ''}" type="${res.type}" ratio="${res.ratio}">
<p>
<img src="./images/dollar.png" class="dollar" alt="">
<e>${langReplace(localLang.salary.text23)}</e>
</p>
<div class="pop">
<div class="pop" style="display:none">
${langReplace(localLang.salary.text21)}
</div>
</li>
@@ -258,8 +259,8 @@ function dollarsFun(type) {
if (i == 0) {
$('.confirm').attr('guildusdnum', res.guildUsdNum);
$('.custom_pop .sure').attr('guildusdnum', res.guildUsdNum);
$('.president_pop .btn_wrap sure').attr('guildusdnum', res.guildUsdNum);
$('.agent_pop .btn_wrap sure').attr('guildusdnum', res.guildUsdNum);
$('.president_pop .btn_wrap .sure').attr('guildusdnum', res.guildUsdNum);
$('.agent_pop .btn_wrap .sure').attr('guildusdnum', res.guildUsdNum);
}
if (res.type == 2) {
str2 += `
@@ -289,6 +290,16 @@ $('.president_pop .cancel').click(function () {
})
// 确定公会长结算弹窗
$('.president_pop .sure').click(function () {
var than = $(this);
var guildUsdNum = than.attr('guildUsdNum');
var targetUid = than.attr('uid');
var type = than.attr('type');
var obj = {
guildUsdNum,
targetUid: targetUid,
type,
};
operate(obj)
$('.president_pop').hide();
bodyScroolFun(false);
})
@@ -299,6 +310,16 @@ $('.agent_pop .cancel').click(function () {
})
// 确定代理结算弹窗
$('.agent_pop .sure').click(function () {
var than = $(this);
var guildUsdNum = than.attr('guildUsdNum');
var targetUid = than.attr('uid');
var type = than.attr('type');
var obj = {
guildUsdNum,
targetUid: targetUid,
type,
};
operate(obj)
$('.agent_pop').hide();
bodyScroolFun(false);
})
@@ -316,8 +337,8 @@ $('.transfer_method').on('click', 'li', function () {
ratio = $(this).attr("ratio");
$('.confirm').attr('type', type);
$('.custom_pop .sure').attr('type', type);
$('.president_pop .btn_wrap sure').attr('type', type);
$('.agent_pop .btn_wrap sure').attr('type', type);
$('.president_pop .btn_wrap .sure').attr('type', type);
$('.agent_pop .btn_wrap .sure').attr('type', type);
transfer_dollars_ArrType = type;
dollarsFun(transfer_dollars_ArrType);
})
@@ -327,14 +348,16 @@ $('.transfer_dollars').on('click', 'li', function () {
var custom_amount = $(this).attr('custom_amount');
var guildUsdNum = $(this).attr('guildusdnum');
if (custom_amount) {
$('.confirm').hide();
$('.custom_pop').show();
bodyScroolFun(true);
} else {
console.log(guildUsdNum);
$('.confirm').attr('guildusdnum', guildUsdNum);
$('.custom_pop .sure').attr('guildusdnum', guildUsdNum);
$('.president_pop .btn_wrap sure').attr('guildusdnum', guildUsdNum);
$('.agent_pop .btn_wrap sure').attr('guildusdnum', guildUsdNum);
$('.president_pop .btn_wrap .sure').attr('guildusdnum', guildUsdNum);
$('.agent_pop .btn_wrap .sure').attr('guildusdnum', guildUsdNum);
$('.confirm').show();
}
})
@@ -416,7 +439,7 @@ function operateValue(than) {
} else {
var obj = {
guildUsdNum,
targetUid: type != 3 || type != 4 ? null : targetUid,
targetUid: targetUid,
type,
};
operate(obj)

6
view/molistar/modules/guild-ar/js/success.js
View File

@@ -61,18 +61,18 @@ $(function () {
$('h1 strong').html(res.me.nick)
$('.dollar').html(res.guildUsdNum + ' ÜS')
if (type == 2) {
$('.exchange_wrap .exchange_account b').html(`${res.me.nick.length >= 8 ? res.me.nick.slice(0, 8) + '... ' : res.me.nick}(ID:${res.me.erbanNo})`);
$('.exchange_wrap .exchange_account b').html(`${res.me.nick.length >= 6 ? res.me.nick.slice(0, 6) + '... ' : res.me.nick}(ID:${res.me.erbanNo})`);
$('.exchange_wrap .exchange_coins b').html(res.currencyNum);
$('.exchange_wrap .exchange_time b').text(dateFormat(res.createTime, 'yyyy/MM/dd hh:mm:ss'));
$('.exchange_wrap .order b h6').text(res.no);
$('.exchange_wrap').show();
$('.text1').text(langReplace(localLang.success.text2));
} else {
$('.settlement_wrap .account b').html(`${res.me.nick.length >= 8 ? res.me.nick.slice(0, 8) + '... ' : res.me.nick}(ID:${res.me.erbanNo})`);
$('.settlement_wrap .account b').html(`${res.me.nick.length >= 6 ? res.me.nick.slice(0, 6) + '... ' : res.me.nick}(ID:${res.me.erbanNo})`);
if (type == 5) {
$('.settlement_wrap .settlement_account').hide();
} else {
$('.settlement_wrap .settlement_account b').html(`<b>${res.target.nick.length >= 8 ? res.target.nick.slice(0, 8) + '... ' : res.target.nick}<img src="" class="flag" alt="">(ID:${res.target.erbanNo})</b>`);
$('.settlement_wrap .settlement_account b').html(`<b>${res.target.nick.length >= 6 ? res.target.nick.slice(0, 6) + '... ' : res.target.nick}<img src="" class="flag" alt="">(ID:${res.target.erbanNo})</b>`);
}
$('.settlement_wrap .time b').text(dateFormat(res.createTime, 'yyyy/MM/dd hh:mm:ss'));
$('.settlement_wrap .order b h6').text(res.no);

2
view/molistar/modules/guild-ar/salary_account.html
View File

@@ -121,7 +121,7 @@
<!-- 公会长结算弹窗 -->
<div class="president_pop">
<div class="president_pop_in">
<div class=" text13"></div>
<div class="title text13"></div>
<h2 class="text14"></h2>
<ul class="wrap">
<li class="li_act">

4
view/molistar/modules/guild-ar/successful.html
View File

@@ -26,9 +26,9 @@
<main>
<img src="./images/dui.png" class="icon" alt="">
<h1>
<e class="text3"></e>-<strong>Username</strong>
<e class="text3"></e>-<strong></strong>
</h1>
<div class="dollar">0 ÜS</div>
<div class="dollar"></div>
<!-- 兑换成功 -->
<ul class="exchange_wrap" style="display: none;">