diff --git a/view/molistar/modules/guild-ar/css/index.css b/view/molistar/modules/guild-ar/css/index.css index b83378f6..5f69c31a 100644 --- a/view/molistar/modules/guild-ar/css/index.css +++ b/view/molistar/modules/guild-ar/css/index.css @@ -102,6 +102,36 @@ body { display: none; } +.header .inveMember { + min-width: 1.57333rem; + height: 0.72rem; + border-radius: 0.72rem; + line-height: 0.72rem; + text-align: center; + background: linear-gradient(90deg, #7CDD9B, #62D0A8); + color: #fff; + font-size: 0.37333rem; + position: absolute; + top: 3.54667rem; + right: 0.42667rem; + z-index: 5; + padding: 0 0.13333rem; +} + +.header .inveMember img { + display: inline-block; + width: 0.50667rem; + height: 0.56rem; + vertical-align: middle; + margin-top: -0.1rem; + display: none; +} + +.header .inveMember span { + display: inline-block; + vertical-align: middle; +} + .headerBox { width: 10rem; border-radius: 0.26667rem; @@ -511,35 +541,6 @@ body { color: #fff; } -.inveMember { - width: 4.08rem; - height: 1.28rem; - border-radius: 1.28rem; - line-height: 1.22667rem; - text-align: center; - background: linear-gradient(90deg, #7CDD9B, #62D0A8); - color: #fff; - font-size: 0.45333rem; - position: fixed; - left: 50%; - transform: translateX(-50%); - z-index: 5; - bottom: 1.06667rem; -} - -.inveMember img { - display: inline-block; - width: 0.50667rem; - height: 0.56rem; - vertical-align: middle; - margin-top: -0.1rem; -} - -.inveMember span { - display: inline-block; - vertical-align: middle; -} - .arabic .back img { left: auto; right: 0.24rem; @@ -618,6 +619,11 @@ body { font-size: 0.26667rem; } +.arabic .header .inveMember { + right: auto; + left: 0.42667rem; +} + .arabic .header .headerBox { width: 8rem; } diff --git a/view/molistar/modules/guild-ar/css/index.scss b/view/molistar/modules/guild-ar/css/index.scss index 3d03642a..e33ae42f 100644 --- a/view/molistar/modules/guild-ar/css/index.scss +++ b/view/molistar/modules/guild-ar/css/index.scss @@ -108,7 +108,35 @@ body { display: none; } + .inveMember { + min-width: px2rem(118); + height: px2rem(54); + border-radius: px2rem(54); + line-height: px2rem(54); + text-align: center; + background: linear-gradient(90deg, #7CDD9B, #62D0A8); + color: #fff; + font-size: px2rem(28); + position: absolute; + top: px2rem(266); + right: px2rem(32); + z-index: 5; + padding: 0 px2rem(10); + img { + display: inline-block; + width: px2rem(38); + height: px2rem(42); + vertical-align: middle; + margin-top: -0.1rem; + display: none; + } + + span { + display: inline-block; + vertical-align: middle; + } + } } .headerBox { @@ -528,34 +556,6 @@ body { } } -.inveMember { - width: px2rem(306); - height: px2rem(96); - border-radius: px2rem(96); - line-height: px2rem(92); - text-align: center; - background: linear-gradient(90deg, #7CDD9B, #62D0A8); - color: #fff; - font-size: px2rem(34); - position: fixed; - left: 50%; - transform: translateX(-50%); - z-index: 5; - bottom: px2rem(80); - - img { - display: inline-block; - width: px2rem(38); - height: px2rem(42); - vertical-align: middle; - margin-top: -0.1rem; - } - - span { - display: inline-block; - vertical-align: middle; - } -} .arabic { .back img { @@ -641,6 +641,11 @@ body { } .arabic { + .header .inveMember { + right: auto; + left: px2rem(32); + } + .header .headerBox { width: 8rem; diff --git a/view/molistar/modules/guild-ar/index.html b/view/molistar/modules/guild-ar/index.html index 0087cf77..7d3cc3aa 100644 --- a/view/molistar/modules/guild-ar/index.html +++ b/view/molistar/modules/guild-ar/index.html @@ -23,6 +23,11 @@
+ +
+ + 邀请成员 +
@@ -135,11 +140,6 @@ - -
- - 邀请成员 -
diff --git a/view/molistar/modules/guild-ar/js/bill.js b/view/molistar/modules/guild-ar/js/bill.js index 8604fad2..0a9d7e32 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, page: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:${item.me.erbanNo} ${langReplace(localLang.bill.text8)} ID: ${item.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:${type == 1 ? item.target.erbanNo : item.me.erbanNo} ${langReplace(localLang.bill.text8)} ID: ${type == 1 ? item.me.erbanNo : 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 644c9fc6..1ad7196a 100644 --- a/view/molistar/modules/guild-ar/js/index.js +++ b/view/molistar/modules/guild-ar/js/index.js @@ -144,7 +144,7 @@ function get() { $('.agencylevel .agencylevelInfo .bottom div').eq(0).text(`${cycleDiamondWageLevel.curLevel}(${unitProcessingAr(cycleDiamondWageLevel.curLevelWage, 0)})`); 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 + '%') + $('.agencylevel .agencylevelInfo .line .line_in').css('width', (cycleDiamondWageLevel.curDiamond - cycleDiamondWageLevel.curLevelWage) / (cycleDiamondWageLevel.nextLevelWage - cycleDiamondWageLevel.curLevelWage) * 100 + '%') }else{ $('.agencylevel .agencylevelInfo .bottom div').eq(1).hide(); $('.agencylevel .agencylevelInfo .line .line_in').css('width', '100%')