From aa3f9a7203062d94270f971e578c198cf436d6c0 Mon Sep 17 00:00:00 2001 From: dragon <3013557874@qq.com> Date: Thu, 22 Aug 2024 19:13:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/molistar/common/js/common2.js | 20 +++---- .../molistar/modules/guild-ar/css/success.css | 2 + .../modules/guild-ar/css/success.scss | 2 + view/molistar/modules/guild-ar/js/personal.js | 3 +- view/molistar/modules/guild-ar/js/salary.js | 53 +++++++++++++------ view/molistar/modules/guild-ar/js/success.js | 6 +-- .../modules/guild-ar/salary_account.html | 2 +- .../molistar/modules/guild-ar/successful.html | 4 +- 8 files changed, 60 insertions(+), 32 deletions(-) diff --git a/view/molistar/common/js/common2.js b/view/molistar/common/js/common2.js index 90748211..b2a46b4b 100644 --- a/view/molistar/common/js/common2.js +++ b/view/molistar/common/js/common2.js @@ -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'); diff --git a/view/molistar/modules/guild-ar/css/success.css b/view/molistar/modules/guild-ar/css/success.css index c982dc82..986fcd48 100644 --- a/view/molistar/modules/guild-ar/css/success.css +++ b/view/molistar/modules/guild-ar/css/success.css @@ -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, diff --git a/view/molistar/modules/guild-ar/css/success.scss b/view/molistar/modules/guild-ar/css/success.scss index 7698fbbf..308668be 100644 --- a/view/molistar/modules/guild-ar/css/success.scss +++ b/view/molistar/modules/guild-ar/css/success.scss @@ -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); diff --git a/view/molistar/modules/guild-ar/js/personal.js b/view/molistar/modules/guild-ar/js/personal.js index 5fc4fc77..eaa1f63d 100644 --- a/view/molistar/modules/guild-ar/js/personal.js +++ b/view/molistar/modules/guild-ar/js/personal.js @@ -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 + '%'); diff --git a/view/molistar/modules/guild-ar/js/salary.js b/view/molistar/modules/guild-ar/js/salary.js index 2e002851..a30b2721 100644 --- a/view/molistar/modules/guild-ar/js/salary.js +++ b/view/molistar/modules/guild-ar/js/salary.js @@ -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) { ( 1 ÜS = ${res.ratio} ) ` - } else if (res.type == 3) { + } else if (res.type == 5) { str += `

  • @@ -223,14 +224,14 @@ function typeTabFun(type) {

    • ` - } else if (res.type == 5) { + } else if (res.type == 3) { str += `

  • ${langReplace(localLang.salary.text23)}

    -
    +
    • @@ -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) diff --git a/view/molistar/modules/guild-ar/js/success.js b/view/molistar/modules/guild-ar/js/success.js index 9f1f735c..9f3ac3ed 100644 --- a/view/molistar/modules/guild-ar/js/success.js +++ b/view/molistar/modules/guild-ar/js/success.js @@ -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(`${res.target.nick.length >= 8 ? res.target.nick.slice(0, 8) + '... ' : res.target.nick}(ID:${res.target.erbanNo})`); + $('.settlement_wrap .settlement_account b').html(`${res.target.nick.length >= 6 ? res.target.nick.slice(0, 6) + '... ' : res.target.nick}(ID:${res.target.erbanNo})`); } $('.settlement_wrap .time b').text(dateFormat(res.createTime, 'yyyy/MM/dd hh:mm:ss')); $('.settlement_wrap .order b h6').text(res.no); diff --git a/view/molistar/modules/guild-ar/salary_account.html b/view/molistar/modules/guild-ar/salary_account.html index c149f208..da0980bf 100644 --- a/view/molistar/modules/guild-ar/salary_account.html +++ b/view/molistar/modules/guild-ar/salary_account.html @@ -121,7 +121,7 @@
    -
    +