From 95a27e7b3bc0fad2dc3fc3c6f85c1b0f65c52f78 Mon Sep 17 00:00:00 2001 From: dragon <3013557874@qq.com> Date: Fri, 23 Aug 2024 18:33:48 +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/modules/guild-ar/css/bill.css | 1 + view/molistar/modules/guild-ar/css/bill.scss | 10 ++- view/molistar/modules/guild-ar/css/index.css | 9 +- view/molistar/modules/guild-ar/css/index.scss | 90 ++----------------- view/molistar/modules/guild-ar/js/bill.js | 4 +- view/molistar/modules/guild-ar/js/index.js | 14 +-- view/molistar/modules/guild-ar/js/salary.js | 8 ++ 7 files changed, 36 insertions(+), 100 deletions(-) diff --git a/view/molistar/modules/guild-ar/css/bill.css b/view/molistar/modules/guild-ar/css/bill.css index aa03ab92..9a76d957 100644 --- a/view/molistar/modules/guild-ar/css/bill.css +++ b/view/molistar/modules/guild-ar/css/bill.css @@ -102,6 +102,7 @@ ul li div b { font-weight: 600; font-size: 0.48rem; color: #04D5C6; + white-space: nowrap; } ul li div span { diff --git a/view/molistar/modules/guild-ar/css/bill.scss b/view/molistar/modules/guild-ar/css/bill.scss index d4505a26..d6d98435 100644 --- a/view/molistar/modules/guild-ar/css/bill.scss +++ b/view/molistar/modules/guild-ar/css/bill.scss @@ -1,5 +1,5 @@ @function px2rem($px, $rem: 37.5) { - @return $px / $rem + rem; + @return $px / $rem +rem; } body, @@ -86,28 +86,34 @@ ul { background: #ffffff; border-radius: px2rem(12); margin-bottom: px2rem(14); + div { width: px2rem(325); padding: px2rem(10) px2rem(9); display: flex; align-items: center; justify-content: space-between; + p { font-weight: 600; font-size: px2rem(15); color: #313131; } + b { font-weight: 600; font-size: px2rem(18); color: #04D5C6; + white-space: nowrap; } + span { font-weight: 400; font-size: px2rem(13); color: #7b7b7d; line-height: px2rem(16); } + // .time { // width: 4.4rem; // } @@ -123,4 +129,4 @@ ul { transform: rotate(180deg); } } -} +} \ No newline at end of file diff --git a/view/molistar/modules/guild-ar/css/index.css b/view/molistar/modules/guild-ar/css/index.css index 145e4f7b..b83378f6 100644 --- a/view/molistar/modules/guild-ar/css/index.css +++ b/view/molistar/modules/guild-ar/css/index.css @@ -1,7 +1,6 @@ html, body { width: 100%; - height: 17.78667rem; background: #fff; } @@ -105,7 +104,6 @@ body { .headerBox { width: 10rem; - height: auto; border-radius: 0.26667rem; margin: -0.4rem auto 0rem; position: relative; @@ -115,7 +113,7 @@ body { .headerBox .headerBox_in { width: 9.14667rem; - height: 3.06667rem; + max-height: 3.06667rem; display: flex; justify-content: space-between; flex-wrap: wrap; @@ -256,9 +254,8 @@ body { .guildList { width: 10rem; - height: 6.7rem; border-radius: 0.26667rem; - margin: 0.26667rem auto 0rem; + margin: 0.26667rem auto 0; position: relative; background: #fff; overflow: hidden; @@ -417,7 +414,7 @@ body { border-radius: 0.56rem; position: absolute; right: 0.34667rem; - top: 0.09333rem; + top: 0.69rem; text-align: center; color: #fff; line-height: 0.56rem; diff --git a/view/molistar/modules/guild-ar/css/index.scss b/view/molistar/modules/guild-ar/css/index.scss index e710434f..3d03642a 100644 --- a/view/molistar/modules/guild-ar/css/index.scss +++ b/view/molistar/modules/guild-ar/css/index.scss @@ -5,7 +5,7 @@ html, body { width: 100%; - height: px2rem(1334); + // height: px2rem(1334); background: #fff; } @@ -95,85 +95,6 @@ body { left: px2rem(220); } - // .adminSet { - // padding: px2rem(0) px2rem(16); - // box-sizing: border-box; - // height: px2rem(44); - // line-height: px2rem(44); - // color: #fff; - // font-size: px2rem(32); - // font-weight: 400; - // background: linear-gradient(90deg, rgba(82, 59, 85, 0.98), rgba(21, 5, 16, 0.98)); - // border-radius: px2rem(44) 0px 0px px2rem(44); - // position: absolute; - // right: 0; - // top: px2rem(184); - // display: none; - // } - - // .guildInfoSet { - // padding: px2rem(0) px2rem(16); - // box-sizing: border-box; - // height: px2rem(44); - // line-height: px2rem(44); - // color: #fff; - // font-size: px2rem(32); - // font-weight: 400; - // background: linear-gradient(90deg, rgba(82, 59, 85, 0.7), rgba(21, 5, 16, 0.7)); - // border-radius: px2rem(44) 0px 0px px2rem(44); - // position: absolute; - // right: 0; - // top: px2rem(239); - // display: none; - // } - - // .memberFlow { - // width: px2rem(208); - // height: px2rem(56); - // line-height: px2rem(56); - // text-align: center; - // color: #fff; - // font-size: px2rem(32); - // font-weight: 400; - // background: linear-gradient(90deg, rgba(128, 146, 255, .6) 0%, rgba(108, 208, 255, .6) 100%); - // border-radius: px2rem(14); - // position: absolute; - // left: px2rem(156); - // top: px2rem(466); - // display: none; - // } - - // .memberFlowMy { - // width: px2rem(208); - // height: px2rem(56); - // line-height: px2rem(56); - // text-align: center; - // color: #fff; - // font-size: px2rem(32); - // font-weight: 400; - // background: linear-gradient(90deg, rgba(128, 146, 255, .6) 0%, rgba(108, 208, 255, .6) 100%); - // border-radius: px2rem(14) 0 0 px2rem(14); - // position: absolute; - // right: px2rem(0); - // top: px2rem(218); - // display: none; - // } - - // .inveMember { - // width: px2rem(208); - // height: px2rem(56); - // line-height: px2rem(56); - // text-align: center; - // color: #fff; - // font-size: px2rem(32); - // font-weight: 400; - // background: linear-gradient(90deg, rgba(128, 146, 255, .6) 0%, rgba(108, 208, 255, .6) 100%); - // border-radius: px2rem(14); - // position: absolute; - // right: px2rem(156); - // top: px2rem(466); - // display: none; - // } .guildNick { width: 100%; @@ -192,7 +113,6 @@ body { .headerBox { width: px2rem(750); - height: auto; border-radius: px2rem(20); margin: px2rem(-30) auto px2rem(0); position: relative; @@ -201,7 +121,7 @@ body { .headerBox_in { width: px2rem(686); - height: px2rem(230); + max-height: px2rem(230); display: flex; justify-content: space-between; flex-wrap: wrap; @@ -344,9 +264,9 @@ body { .guildList { width: px2rem(750); // height: 11rem; - height: 6.7rem; + // height: 6.7rem; border-radius: px2rem(20); - margin: px2rem(20) auto px2rem(0); + margin: px2rem(20) auto 0; position: relative; background: #fff; overflow: hidden; @@ -508,7 +428,7 @@ body { border-radius: px2rem(42); position: absolute; right: px2rem(26); - top: px2rem(7); + top: 0.69rem; text-align: center; color: #fff; line-height: px2rem(42); diff --git a/view/molistar/modules/guild-ar/js/bill.js b/view/molistar/modules/guild-ar/js/bill.js index c5296b40..8604fad2 100644 --- a/view/molistar/modules/guild-ar/js/bill.js +++ b/view/molistar/modules/guild-ar/js/bill.js @@ -90,7 +90,7 @@ function getData() { networkRequest({ type: "GET", url: urlPrefix + "/guild/usd/bill/page", - data: { type, pageNo, pageSize, uid: pubInfo.uid }, + data: { type, page:pageNo, pageSize, uid: pubInfo.uid }, success: function (res) { if (res.code == 200) { list = res.data @@ -100,7 +100,7 @@ function getData() { // if (item.tradeType == 1) { str += `
  • -

    ${item.type == 1 ? `${langReplace(localLang.bill.text5)}` : item.type == 2 ? `${langReplace(localLang.bill.text6)}` : item.type == 3 ? `${langReplace(localLang.bill.text7)}` : item.type == 4 ? `（ID:${me.erbanNo}）${langReplace(localLang.bill.text8)} (ID: ${target.erbanNo})` : `${langReplace(localLang.bill.text9)}`}

    +

    ${item.type == 1 ? `${langReplace(localLang.bill.text5)}` : item.type == 2 ? `${langReplace(localLang.bill.text6)}` : item.type == 3 ? `${langReplace(localLang.bill.text7)}` : item.type == 4 ? `ID:${item.me.erbanNo} ${langReplace(localLang.bill.text8)} ID: ${item.target.erbanNo}` : `${langReplace(localLang.bill.text9)}`}

    ${item.operateUsdNum.toLocaleString()} ÜS
    diff --git a/view/molistar/modules/guild-ar/js/index.js b/view/molistar/modules/guild-ar/js/index.js index c8fff064..644c9fc6 100644 --- a/view/molistar/modules/guild-ar/js/index.js +++ b/view/molistar/modules/guild-ar/js/index.js @@ -142,9 +142,13 @@ function get() { $('.agencylevel .agencylevelInfo h3 b').text(cycleDiamondWageLevel.curLevel); $('.agencylevel .agencylevelInfo h4 b').text(cycleDiamondWageLevel.nextLevelGap); $('.agencylevel .agencylevelInfo .bottom div').eq(0).text(`${cycleDiamondWageLevel.curLevel}(${unitProcessingAr(cycleDiamondWageLevel.curLevelWage, 0)})`); - $('.agencylevel .agencylevelInfo .bottom div').eq(1).text(`${cycleDiamondWageLevel.nextLevel}(${unitProcessingAr(cycleDiamondWageLevel.nextLevelWage, 0)})`); - // $('.agencylevel .agencylevelInfo .line .line_in').css('width', (cycleDiamondWageLevel.nextLevelWage - cycleDiamondWageLevel.nextLevelGap) / cycleDiamondWageLevel.nextLevelWage * 100 + '%') - $('.agencylevel .agencylevelInfo .line .line_in').css('width', (cycleDiamondWageLevel.nextLevelWage - cycleDiamondWageLevel.curLevelWage) / (cycleDiamondWageLevel.nextLevelWage - cycleDiamondWageLevel.curLevelWage) * 100 + '%') + if (cycleDiamondWageLevel.nextLevelWage) { + $('.agencylevel .agencylevelInfo .bottom div').eq(1).text(`${cycleDiamondWageLevel.nextLevel}(${unitProcessingAr(cycleDiamondWageLevel.nextLevelWage, 0)})`); + $('.agencylevel .agencylevelInfo .line .line_in').css('width', (cycleDiamondWageLevel.nextLevelWage - cycleDiamondWageLevel.curLevelWage) / (cycleDiamondWageLevel.nextLevelWage - cycleDiamondWageLevel.curLevelWage) * 100 + '%') + }else{ + $('.agencylevel .agencylevelInfo .bottom div').eq(1).hide(); + $('.agencylevel .agencylevelInfo .line .line_in').css('width', '100%') + } res.data.authCodes.forEach((res) => { console.log(res); if (res == 'set_info') { @@ -231,7 +235,7 @@ function searchUser(erbanNo) { var res = res.data; var str = `
  • -
    ${langReplace(localLang.demoModule.text12)}
    +
    ${langReplace(localLang.demoModule.text12)}
    ${langReplace(localLang.demoModule.text13)}
    @@ -241,7 +245,7 @@ function searchUser(erbanNo) { ID:${res.erbanNo}
    - ${roleTypes == 1 ? `
    ${langReplace(localLang.demoModule.text14)}
    ` : roleTypes == 2 && res.roleType != 1 && res.roleType != 2 ? `
    ${langReplace(localLang.demoModule.text14)}
    ` : ``} + ${roleTypes == 1 && res.roleType != 1 ? `
    ${langReplace(localLang.demoModule.text14)}
    ` : roleTypes == 2 && res.roleType != 1 && res.roleType != 2 ? `
    ${langReplace(localLang.demoModule.text14)}
    ` : ``}
    • ` $('.guildList ul').append(str); diff --git a/view/molistar/modules/guild-ar/js/salary.js b/view/molistar/modules/guild-ar/js/salary.js index a30b2721..b24de645 100644 --- a/view/molistar/modules/guild-ar/js/salary.js +++ b/view/molistar/modules/guild-ar/js/salary.js @@ -377,6 +377,7 @@ $('.custom_pop .custom_pop_in .btn_wrap .sure').click(function () { } than = $(this); operateValue(than); + $(".custom_pop .ipt input").val('') $(".custom_pop h2 b").html('0'); $('.custom_pop').hide(); bodyScroolFun(false); @@ -410,11 +411,18 @@ $(".custom_pop .ipt input").on("input", function () { $(".custom_pop h2 b").html(gold); tradeUsb = value } + + $('.custom_pop .sure').attr('guildUsdNum',value); + $('.agent_pop .sure').attr('guildUsdNum',value); + $('.president_pop .sure').attr('guildUsdNum',value); }); // 自定义金额全部按钮 $('.custom_pop .custom_pop_in .ipt e').click(function () { $('.custom_pop .custom_pop_in .ipt input').val(usGold); $(".custom_pop h2 b").html(usGold * ratio); + $('.custom_pop .sure').attr('guildUsdNum',usGold); + $('.agent_pop .sure').attr('guildUsdNum',usGold); + $('.president_pop .sure').attr('guildUsdNum',usGold); }) // 跳转记录页面 $('.my_salary p').click(function () {