From 5eef1fe919c48d117d1a0907c7b4fad0a4320bd9 Mon Sep 17 00:00:00 2001 From: dragon <3013557874@qq.com> Date: Wed, 11 Dec 2024 10:49:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/molistar/modules/guild-ar/css/guild.css | 13 +++++++++++-- view/molistar/modules/guild-ar/css/guild.scss | 13 ++++++++++--- view/molistar/modules/guild-ar/js/createGuild.js | 14 +++++++------- view/molistar/modules/guild-ar/js/guild.js | 4 +++- view/molistar/modules/guild-ar/local/ar.js | 4 ++-- view/molistar/modules/guild-ar/local/en.js | 5 +++-- view/molistar/modules/guild-ar/local/tr.js | 3 ++- view/molistar/modules/guild-ar/local/zh.js | 3 ++- 8 files changed, 40 insertions(+), 19 deletions(-) diff --git a/view/molistar/modules/guild-ar/css/guild.css b/view/molistar/modules/guild-ar/css/guild.css index 890cb60..3fad843 100644 --- a/view/molistar/modules/guild-ar/css/guild.css +++ b/view/molistar/modules/guild-ar/css/guild.css @@ -112,7 +112,7 @@ ul li .tx { ul li p { width: 4rem; position: absolute; - top: 0.42667rem; + top: 0.26667rem; left: 2.8rem; color: #FFDD7A; font-size: 0.42667rem; @@ -127,7 +127,7 @@ ul li span { height: 0.42667rem; line-height: 0.42667rem; position: absolute; - top: 1.28rem; + top: 1.33333rem; left: 2.8rem; } @@ -144,6 +144,15 @@ ul li span b { font-weight: 400; } +ul li strong { + position: absolute; + color: #FFDD7A; + font-weight: 400; + position: absolute; + left: 2.8rem; + top: 0.86667rem; +} + ul li .level { width: 0.8rem; height: 0.8rem; diff --git a/view/molistar/modules/guild-ar/css/guild.scss b/view/molistar/modules/guild-ar/css/guild.scss index bd2aeda..9ecd4e3 100644 --- a/view/molistar/modules/guild-ar/css/guild.scss +++ b/view/molistar/modules/guild-ar/css/guild.scss @@ -117,7 +117,7 @@ ul { p { width: 4rem; position: absolute; - top: px2rem(32); + top: px2rem(20); left: px2rem(210); color: #FFDD7A; font-size: px2rem(32); @@ -132,7 +132,7 @@ ul { height: px2rem(32); line-height: px2rem(32); position: absolute; - top: px2rem(96); + top: px2rem(100); left: px2rem(210); img { @@ -148,7 +148,14 @@ ul { font-weight: 400; } } - + strong{ + position: absolute; + color: #FFDD7A; + font-weight: 400; + position: absolute; + left: 2.8rem; + top: px2rem(65); + } .level { width: px2rem(60); height: px2rem(60); diff --git a/view/molistar/modules/guild-ar/js/createGuild.js b/view/molistar/modules/guild-ar/js/createGuild.js index da25230..146651d 100644 --- a/view/molistar/modules/guild-ar/js/createGuild.js +++ b/view/molistar/modules/guild-ar/js/createGuild.js @@ -43,11 +43,7 @@ $(function () { }; // 頂部返回事件 $('.back img').click(() => { - if (browser.android) { - window.androidJsObj.closeWebView() - } else { - window.webkit.messageHandlers.closeWebView.postMessage(null) - } + window.history.back(); }) fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言 langReplace = window.lang.replace; @@ -70,11 +66,15 @@ function translateFun() { $('.text8').text(langReplace(localLang.createGuild.text8)); $('.text9').text(langReplace(localLang.createGuild.text9)); $('.text10').text(langReplace(localLang.createGuild.text10)); - $('.placeholder').attr('placeholder',langReplace(localLang.createGuild.placeholder)); + $('.placeholder').attr('placeholder', langReplace(localLang.createGuild.placeholder)); } $('.submitSuccessfully .submitSuccessfully_in .but').click(function () { $('.submitSuccessfully').hide(); - window.history.back(); + if (browser.android) { + window.androidJsObj.closeWebView() + } else { + window.webkit.messageHandlers.closeWebView.postMessage(null) + } }) function fileChangeF(e) { var file = document.querySelector('#backImageUpload').files[0]; diff --git a/view/molistar/modules/guild-ar/js/guild.js b/view/molistar/modules/guild-ar/js/guild.js index e33abc7..5e0f125 100644 --- a/view/molistar/modules/guild-ar/js/guild.js +++ b/view/molistar/modules/guild-ar/js/guild.js @@ -92,8 +92,9 @@ function listRank() {

  • ${val.guildName}

    + ${langReplace(localLang.guild.newText5)} ${val.owner.erbanNo} ${val.memberNum ? val.memberNum : 0}/${val.memberNumLimit} - +
    ${langReplace(localLang.guild.newText4)}
    • ` @@ -225,6 +226,7 @@ function searchFamily(erbanNo) {

  • ${res.data.guildName}

    + ${langReplace(localLang.guild.newText5)} ${res.data.erbanNo} ${res.data.memberNum}/${res.data.memberNumLimit}
    Join
    diff --git a/view/molistar/modules/guild-ar/local/ar.js b/view/molistar/modules/guild-ar/local/ar.js index b4c126f..acb5c84 100644 --- a/view/molistar/modules/guild-ar/local/ar.js +++ b/view/molistar/modules/guild-ar/local/ar.js @@ -80,8 +80,8 @@ langAr = { newText2: 'قيد المراجعة', newText3: 'يرجى الانتظار بصبر~', newText4: `انضمام`, - placeholder: `يرجى إدخال معرّف الوكالة/معرّف الوكيل للبحث`, - + newText5: 'معرّف الوكيل:', + placeholder: 'يرجى إدخال معرّف الوكيل للبحث', }, createGuild: { text1: `طلب تسجيل الوكالة`, diff --git a/view/molistar/modules/guild-ar/local/en.js b/view/molistar/modules/guild-ar/local/en.js index 35c79cc..0f7a8e9 100644 --- a/view/molistar/modules/guild-ar/local/en.js +++ b/view/molistar/modules/guild-ar/local/en.js @@ -74,11 +74,12 @@ langEn = { text6: `Confirm`, text7: `Add`, text8: 'Submitted', - newText1: 'Create a Guild', + newText1: 'Create a Agency', newText2: 'Under review', newText3: 'Please wait patiently~', newText4: 'Join', - placeholder: 'Please enter the Agency ID/Agent ID to search', + newText5: 'Agent ID:', + placeholder: 'Please enter the Agent ID to search', }, createGuild: { text1: `Agency Registration Application`, diff --git a/view/molistar/modules/guild-ar/local/tr.js b/view/molistar/modules/guild-ar/local/tr.js index b05fd56..4b344e1 100644 --- a/view/molistar/modules/guild-ar/local/tr.js +++ b/view/molistar/modules/guild-ar/local/tr.js @@ -78,7 +78,8 @@ langTr = { newText2: 'İncelemede', newText3: 'Lütfen sabırla bekleyin~', newText4: `Katıl`, - placeholder: `Ajans Kimliği/Ajan Kimliğini aramak için girin`, + newText5: 'Temsilci Kimliği:', + placeholder: 'Aramak için Temsilci Kimliğini giriniz', }, createGuild: { diff --git a/view/molistar/modules/guild-ar/local/zh.js b/view/molistar/modules/guild-ar/local/zh.js index c71f42f..b8d74c0 100644 --- a/view/molistar/modules/guild-ar/local/zh.js +++ b/view/molistar/modules/guild-ar/local/zh.js @@ -80,7 +80,8 @@ langZh = { newText2: '審核中', newText3: '請耐心等待~', newText4: `加入`, - placeholder: `請輸入代理機構ID/代理ID以搜尋`, + newText5: '代理人ID:', + placeholder: '請輸入代理人ID進行搜尋', }, createGuild: {