diff --git a/view/molistar/modules/guild-ar/agencyDiamondIncome.html b/view/molistar/modules/guild-ar/agencyDiamondIncome.html new file mode 100644 index 0000000..285ab80 --- /dev/null +++ b/view/molistar/modules/guild-ar/agencyDiamondIncome.html @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + +
+ +
+
+ +

+ + +
+

+

+
+

+ +
+
+ + +
+ +
+ + +
+
+
+ + +
+ + 0 +
+ +
+
+ +
+

Teeery

+ ID:1234567 +
+
+

0

+ Diamond income +
+
+
+ + +
+
+
+
GMT+3
+
+ +
+
+ + + + + + + + + + + + + + \ No newline at end of file diff --git a/view/molistar/modules/guild-ar/css/agencyDiamondIncome.css b/view/molistar/modules/guild-ar/css/agencyDiamondIncome.css new file mode 100644 index 0000000..5f81ff3 --- /dev/null +++ b/view/molistar/modules/guild-ar/css/agencyDiamondIncome.css @@ -0,0 +1,355 @@ +html, +body { + width: 100%; + height: 17.78667rem; + background: #fff; +} + +.back { + width: 100%; + height: 2.34667rem; + position: fixed; + left: 0; + top: 0rem; + text-align: center; + color: #FFFFFF; + font-size: 0.50667rem; + font-weight: bold; + z-index: 10; + background: #fff; +} + +.back img { + width: 0.58667rem; + height: 0.58667rem; + position: absolute; + left: 0.24rem; + top: 1.46667rem; + z-index: 2; +} + +.back div { + width: 100%; + height: 0.58667rem; + line-height: 0.58667rem; + color: #313131; + text-align: center; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: 1.46667rem; +} + +h3 { + width: 9.14667rem; + height: 0.48rem; + line-height: 0.48rem; + margin: 2.6rem auto 0.37333rem; + color: #313131; + font-size: 0.42667rem; + font-weight: 600; + position: relative; +} + +h3 b { + color: #313131; + font-size: 0.42667rem; + font-weight: 600; +} + +h3 img { + display: inline-block; + width: 0.48rem; + height: 0.48rem; + margin-top: 0.02667rem; +} + +h3 div { + width: 4.61333rem; + box-sizing: border-box; + padding: 0.21333rem; + position: absolute; + background: #F7F7F7; + border-radius: 0.21333rem; + right: -0.26667rem; + bottom: -2.93333rem; + display: none; +} + +h3 div p { + color: #313131; + font-weight: 400; + line-height: 0.45333rem; + font-size: 0.32rem; +} + +.time { + width: 9.14667rem; + height: 0.85333rem; + line-height: 0.85333rem; + margin: 0 auto 0.48rem; + display: flex; + justify-content: space-around; +} + +.time .start { + width: 3.04rem; + height: 0.85333rem; + display: flex; + justify-content: space-between; + box-sizing: border-box; + padding: 0 0.18667rem; + background: #F2F3F7; + border-radius: 0.21333rem; +} + +.time .start img { + width: 0.56rem; + height: 0.56rem; + display: block; + margin-top: 0.18667rem; +} + +.time span { + width: 0.45333rem; + color: #7B7B7D; + font-size: 0.37333rem; + font-weight: 400; +} + +.time .end { + width: 3.04rem; + height: 0.85333rem; + display: flex; + justify-content: space-between; + box-sizing: border-box; + padding: 0 0.18667rem; + background: #F2F3F7; + border-radius: 0.21333rem; +} + +.time .end img { + width: 0.56rem; + height: 0.56rem; + display: block; + margin-top: 0.18667rem; +} + +.time .search { + width: 1.89333rem; + height: 0.85333rem; + border-radius: 0.85333rem; + line-height: 0.8rem; + text-align: center; + background: #04D5C6; + color: #fff; + font-size: 0.37333rem; + font-weight: 400; +} + +.diamonds { + width: 9.14667rem; + height: 0.74667rem; + line-height: 0.64rem; + text-align: center; + margin: 0 auto 0.48rem; +} + +.diamonds img { + width: 0.74667rem; + height: 0.74667rem; + display: inline-block; + margin-right: 0.13333rem; +} + +.diamonds span { + color: #313131; + font-size: 0.53333rem; + font-weight: 600; +} + +.data { + width: 9.14667rem; + height: 13rem; + margin: 0 auto 0rem; + overflow-y: scroll; +} + +.data::-webkit-scrollbar { + display: none; +} + +.data .box { + width: 100%; + height: 1.94667rem; + border-radius: 0.21333rem; + background: #DBF6FF; + box-sizing: border-box; + padding: 0 0.24rem; + margin-bottom: 0.26667rem; +} + +.data .box .tx { + float: left; + width: 1.46667rem; + height: 1.46667rem; + border-radius: 50%; + display: block; + margin-top: 0.24rem; + margin-right: 0.21333rem; +} + +.data .box .user { + width: 3.33333rem; + float: left; +} + +.data .box .user p { + width: 100%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + color: #333333; + font-size: 0.42667rem; + font-weight: 600; + margin-top: 0.53333rem; + margin-bottom: 0.13333rem; +} + +.data .box .user b { + color: #7B7B7D; + font-size: 0.34667rem; + font-weight: 400; +} + +.data .box .right { + float: right; + text-align: right; +} + +.data .box .right p { + color: #313131; + font-size: 0.48rem; + font-weight: 600; + margin-top: 0.45333rem; + margin-bottom: 0.2rem; +} + +.data .box .right b { + color: #313131; + font-size: 0.34667rem; + font-weight: 400; +} + +.timeBox { + position: fixed; + left: 0; + top: 0; + right: 0; + bottom: 0; + background: rgba(0, 0, 0, 0.5); + z-index: 99; + display: none; +} + +.timeBox .timeBox_in { + width: 10rem; + height: 8.53333rem; + border-radius: 0.42667rem 0.42667rem 0 0; + background: #fff; + position: absolute; + bottom: 0; + left: 50%; + transform: translateX(-50%); +} + +.timeBox .timeBox_in .title { + width: 100%; + height: 0.58667rem; + line-height: 0.58667rem; + text-align: center; + color: #313131; + font-weight: 500; + font-size: 0.42667rem; + position: absolute; + top: 0.32rem; + left: 0; +} + +.timeBox .timeBox_in .but { + height: 0.58667rem; + line-height: 0.58667rem; + position: absolute; + right: 0.42667rem; + top: 0.32rem; + z-index: 2; + color: #24CF9E; + font-size: 0.42667rem; + font-weight: 500; +} + +.timeBox .timeBox_in h5 { + color: #AFB1B3; + width: 100%; + height: 0.45333rem; + line-height: 0.45333rem; + font-size: 0.32rem; + font-weight: 400; + text-align: center; + position: absolute; + left: 0; + top: 1.01333rem; +} + +.timeBox .timeBox_in ul { + width: 10rem; + height: 6rem; + margin-top: 1.6rem; + overflow-y: scroll; +} + +.timeBox .timeBox_in ul::-webkit-scrollbar { + display: none; +} + +.timeBox .timeBox_in ul li { + width: 100%; + text-align: center; + height: 0.85333rem; + line-height: 0.85333rem; + color: #7B7B7D; + font-size: 0.4rem; + font-weight: 400; +} + +.timeBox .timeBox_in ul .act { + background: #F4F4F4; + font-weight: 500; + color: #313131; +} + +.arabic .back img { + left: auto; + right: 0.24rem; + transform: rotate(180deg); +} + +.arabic h3 div { + right: auto; + left: -0.26667rem; +} + +.arabic .data .box .tx { + float: right; + margin-left: 0.2rem; + margin-right: 0; +} + +.arabic .data .box .user { + float: right; +} + +.arabic .data .box .right { + float: left; + text-align: left; +} diff --git a/view/molistar/modules/guild-ar/css/agencyDiamondIncome.scss b/view/molistar/modules/guild-ar/css/agencyDiamondIncome.scss new file mode 100644 index 0000000..559d518 --- /dev/null +++ b/view/molistar/modules/guild-ar/css/agencyDiamondIncome.scss @@ -0,0 +1,365 @@ +@function px2rem($px) { + @return $px / 75+rem; +} + +html, +body { + width: 100%; + height: px2rem(1334); + background: #fff; +} + +.back { + width: 100%; + height: px2rem(176); + position: fixed; + left: 0; + top: px2rem(0); + text-align: center; + color: #FFFFFF; + font-size: px2rem(38); + font-weight: bold; + z-index: 10; + background: #fff; + + img { + width: px2rem(44); + height: px2rem(44); + position: absolute; + left: px2rem(18); + top: px2rem(110); + z-index: 2; + } + + div { + width: 100%; + height: px2rem(44); + line-height: px2rem(44); + color: #313131; + text-align: center; + position: absolute; + left: 50%; + transform: translateX(-50%); + top: px2rem(110); + } +} + +h3 { + width: px2rem(686); + height: px2rem(36); + line-height: px2rem(36); + margin: 2.6rem auto px2rem(28); + color: #313131; + font-size: px2rem(32); + font-weight: 600; + position: relative; + + b { + color: #313131; + font-size: px2rem(32); + font-weight: 600; + } + + img { + display: inline-block; + width: px2rem(36); + height: px2rem(36); + margin-top: px2rem(2); + } + + div { + width: px2rem(346); + box-sizing: border-box; + padding: px2rem(16); + position: absolute; + background: #F7F7F7; + border-radius: px2rem(16); + right: px2rem(-20); + bottom: px2rem(-220); + display: none; + + p { + color: #313131; + font-weight: 400; + line-height: px2rem(34); + font-size: px2rem(24); + } + } +} + +.time { + width: px2rem(686); + height: px2rem(64); + line-height: px2rem(64); + margin: 0 auto px2rem(36); + display: flex; + justify-content: space-around; + + .start { + width: px2rem(228); + height: px2rem(64); + display: flex; + justify-content: space-between; + box-sizing: border-box; + padding: 0 px2rem(14); + background: #F2F3F7; + border-radius: px2rem(16); + + img { + width: px2rem(42); + height: px2rem(42); + display: block; + margin-top: px2rem(14); + } + } + + span { + width: px2rem(34); + color: #7B7B7D; + font-size: px2rem(28); + font-weight: 400; + } + + .end { + width: px2rem(228); + height: px2rem(64); + display: flex; + justify-content: space-between; + box-sizing: border-box; + padding: 0 px2rem(14); + background: #F2F3F7; + border-radius: px2rem(16); + + img { + width: px2rem(42); + height: px2rem(42); + display: block; + margin-top: px2rem(14); + } + } + + .search { + width: px2rem(142); + height: px2rem(64); + border-radius: px2rem(64); + line-height: px2rem(60); + text-align: center; + background: #04D5C6; + color: #fff; + font-size: px2rem(28); + font-weight: 400; + } +} + +.diamonds { + width: px2rem(686); + height: px2rem(56); + line-height: px2rem(48); + // display: flex; + text-align: center; + margin: 0 auto px2rem(36); + + img { + width: px2rem(56); + height: px2rem(56); + display: inline-block; + margin-right: px2rem(10); + } + + span { + color: #313131; + font-size: px2rem(40); + font-weight: 600; + } + +} + +.data { + width: px2rem(686); + height: 13rem; + margin: 0 auto px2rem(0); + overflow-y: scroll; + + &::-webkit-scrollbar { + display: none; + } + + .box { + width: 100%; + height: px2rem(146); + border-radius: px2rem(16); + background: #DBF6FF; + box-sizing: border-box; + padding: 0 px2rem(18); + margin-bottom: px2rem(20); + + .tx { + float: left; + width: px2rem(110); + height: px2rem(110); + border-radius: 50%; + display: block; + margin-top: px2rem(18); + margin-right: px2rem(16); + } + + .user { + width: px2rem(250); + float: left; + + p { + width: 100%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + color: #333333; + font-size: px2rem(32); + font-weight: 600; + margin-top: px2rem(40); + margin-bottom: px2rem(10); + } + + b { + color: #7B7B7D; + font-size: px2rem(26); + font-weight: 400; + } + } + + .right { + float: right; + text-align: right; + + p { + color: #313131; + font-size: px2rem(36); + font-weight: 600; + margin-top: px2rem(34); + margin-bottom: px2rem(15); + } + + b { + color: #313131; + font-size: px2rem(26); + font-weight: 400; + } + } + } +} + +.timeBox { + position: fixed; + left: 0; + top: 0; + right: 0; + bottom: 0; + background: rgba(0, 0, 0, .5); + z-index: 99; + display: none; + + .timeBox_in { + width: px2rem(750); + height: px2rem(640); + border-radius: px2rem(32) px2rem(32) 0 0; + background: #fff; + position: absolute; + bottom: 0; + left: 50%; + transform: translateX(-50%); + + .title { + width: 100%; + height: px2rem(44); + line-height: px2rem(44); + text-align: center; + color: #313131; + font-weight: 500; + font-size: px2rem(32); + position: absolute; + top: px2rem(24); + left: 0; + } + + .but { + height: px2rem(44); + line-height: px2rem(44); + position: absolute; + right: px2rem(32); + top: px2rem(24); + z-index: 2; + color: #24CF9E; + font-size: px2rem(32); + font-weight: 500; + } + + h5 { + color: #AFB1B3; + width: 100%; + height: px2rem(34); + line-height: px2rem(34); + font-size: px2rem(24); + font-weight: 400; + text-align: center; + position: absolute; + left: 0; + top: px2rem(76); + } + + ul { + width: px2rem(750); + height: 6rem; + margin-top: px2rem(120); + overflow-y: scroll; + + &::-webkit-scrollbar { + display: none; + } + + li { + width: 100%; + text-align: center; + height: px2rem(64); + line-height: px2rem(64); + color: #7B7B7D; + font-size: px2rem(30); + font-weight: 400; + } + + .act { + background: #F4F4F4; + font-weight: 500; + color: #313131; + } + } + } +} + +.arabic { + .back img { + left: auto; + right: 0.24rem; + transform: rotate(180deg); + } + + h3 div { + right: auto; + left: -0.26667rem; + } + + .data .box { + .tx { + float: right; + margin-left: 0.2rem; + margin-right: 0; + } + + .user { + float: right; + } + + .right { + float: left; + text-align: left; + } + } +} \ No newline at end of file diff --git a/view/molistar/modules/guild-ar/css/personal.css b/view/molistar/modules/guild-ar/css/personal.css index 61f238b..f929b81 100644 --- a/view/molistar/modules/guild-ar/css/personal.css +++ b/view/molistar/modules/guild-ar/css/personal.css @@ -533,6 +533,54 @@ body { margin-top: 0.10667rem; } +.page2 .agencyDiamondIncome { + width: 9.14667rem; + height: 0.66667rem; + line-height: 0.66667rem; + position: relative; + margin: 0 auto 0.33333rem; + display: none; +} + +.page2 .agencyDiamondIncome span { + position: absolute; + width: 0.10667rem; + height: 0.45333rem; + top: 50%; + transform: translateY(-50%); + left: -0.26667rem; + background: #04D5C6; +} + +.page2 .agencyDiamondIncome b { + display: block; + float: left; + color: #313131; + font-size: 0.48rem; + font-weight: 600; +} + +.page2 .agencyDiamondIncome i { + font-style: normal; + display: block; + float: left; + height: 0.45333rem; + border-radius: 0.45333rem; + line-height: 0.45333rem; + padding: 0.05333rem 0.21333rem; + background: #313131; + color: #fff; + margin: 0.10667rem 0.26667rem 0; +} + +.page2 .agencyDiamondIncome img { + float: right; + display: block; + width: 0.56rem; + height: 0.56rem; + margin-top: 0.10667rem; +} + .page2 .data { width: 9.14667rem; height: 13rem; @@ -735,3 +783,17 @@ body { right: 0.24rem; transform: rotate(180deg); } + +.arabic .page2 .agencyDiamondIncome span { + left: auto; + right: -0.26667rem; +} + +.arabic .page2 .agencyDiamondIncome b { + float: right; +} + +.arabic .page2 .agencyDiamondIncome img { + float: left; + transform: rotate(180deg); +} diff --git a/view/molistar/modules/guild-ar/css/personal.scss b/view/molistar/modules/guild-ar/css/personal.scss index 46f7f03..b1c2e46 100644 --- a/view/molistar/modules/guild-ar/css/personal.scss +++ b/view/molistar/modules/guild-ar/css/personal.scss @@ -445,7 +445,8 @@ body { color: #313131; font-size: px2rem(36); font-weight: 600; - img{ + + img { float: right; } } @@ -540,6 +541,54 @@ body { } } + .agencyDiamondIncome { + width: px2rem(686); + height: px2rem(50); + line-height: px2rem(50); + position: relative; + margin: 0 auto px2rem(25); + display: none; + + span { + position: absolute; + width: px2rem(8); + height: px2rem(34); + top: 50%; + transform: translateY(-50%); + left: px2rem(-20); + background: #04D5C6; + } + + b { + display: block; + float: left; + color: #313131; + font-size: px2rem(36); + font-weight: 600; + } + + i { + font-style: normal; + display: block; + float: left; + height: px2rem(34); + border-radius: px2rem(34); + line-height: px2rem(34); + padding: px2rem(4) px2rem(16); + background: #313131; + color: #fff; + margin: px2rem(8) px2rem(20) 0; + } + + img { + float: right; + display: block; + width: px2rem(42); + height: px2rem(42); + margin-top: px2rem(8); + } + } + .data { width: px2rem(686); height: 13rem; @@ -757,4 +806,21 @@ body { right: 0.24rem; transform: rotate(180deg); } + + .page2 .agencyDiamondIncome { + span { + left: auto; + right: -0.26667rem; + } + + b { + float: right; + + } + + img { + float: left; + transform: rotate(180deg); + } + } } \ No newline at end of file diff --git a/view/molistar/modules/guild-ar/images/agencyDiamondIncomeDom.png b/view/molistar/modules/guild-ar/images/agencyDiamondIncomeDom.png new file mode 100644 index 0000000..347ca99 Binary files /dev/null and b/view/molistar/modules/guild-ar/images/agencyDiamondIncomeDom.png differ diff --git a/view/molistar/modules/guild-ar/images/agencyDiamondIncomeWhy.png b/view/molistar/modules/guild-ar/images/agencyDiamondIncomeWhy.png new file mode 100644 index 0000000..7563cfd Binary files /dev/null and b/view/molistar/modules/guild-ar/images/agencyDiamondIncomeWhy.png differ diff --git a/view/molistar/modules/guild-ar/images/xia.png b/view/molistar/modules/guild-ar/images/xia.png new file mode 100644 index 0000000..96c38e3 Binary files /dev/null and b/view/molistar/modules/guild-ar/images/xia.png differ diff --git a/view/molistar/modules/guild-ar/js/agencyDiamondIncome.js b/view/molistar/modules/guild-ar/js/agencyDiamondIncome.js new file mode 100644 index 0000000..19b99eb --- /dev/null +++ b/view/molistar/modules/guild-ar/js/agencyDiamondIncome.js @@ -0,0 +1,187 @@ +let urlPrefix = getUrlPrefix() +let browser = checkVersion() +let env = EnvCheck(); +var url = getQueryString(); +if (env == 'test') { + new VConsole(); +} +// 封裝layer消息提醒框 +let layerIndex +var langReplace; +var localLang; +const showLoading = (content = langReplace(localLang.demoModule.layerIndex1)) => { + layer.open({ + type: 2, + shadeClose: false, + content, + success(e) { + layerIndex = $(e).attr('index') + } + }) +} +const hideLoading = (index) => { + layer.close(index) +} +const toastMsg = (content = langReplace(localLang.demoModule.layerIndex2), time = 2) => { + layer.open({ + content, + time, + skin: 'msg' + }) +} +var startDate = dateFormat(Number(url.timestamp), 'yyyy-MM-dd'); +var endDate = dateFormat(Number(url.timestamp), 'yyyy-MM-dd'); +var timeType; +// 初始化函數 +$(function () { + getInfoFromClient(); + fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言 + setTimeout(function () { + // 頁面全屏 + if (browser.app) { + if (browser.android) { + window.androidJsObj.initShowNav(false) + } else { + window.webkit.messageHandlers.initShowNav.postMessage(0) + } + }; + // 頂部返回事件 + $('.back img').click(() => { + window.history.back(); + }) + fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言 + langReplace = window.lang.replace; + localLang = window.lang; + translateFun(); + getDiamondIncome(); + $('.time .start b').text(startDate); + $('.time .end b').text(endDate); + }, 100) +}) +function translateFun() { + var langReplace = window.lang.replace; + var localLang = window.lang; + $('.text1').html(langReplace(localLang.agencyDiamondIncome.text1)); + $('.text2').html(langReplace(localLang.agencyDiamondIncome.text2)); + $('.text3').html(langReplace(localLang.agencyDiamondIncome.text3)); + $('.text4').html(langReplace(localLang.agencyDiamondIncome.text4)); + $('.text5').html(langReplace(localLang.agencyDiamondIncome.text5)); + $('.text6').html(langReplace(localLang.agencyDiamondIncome.text6)); + $('.text7').html(langReplace(localLang.agencyDiamondIncome.text7)); +} +// 查询按钮 +$('.time .search').click(function(){ + getDiamondIncome(); +}) +// 配置接口 +function getDiamondIncome() { + $('.data .box').remove(); + showLoading() + networkRequest({ + type: 'get', + url: urlPrefix + '/guild/income/getDiamondIncome', + data: { + startDate, + endDate, + }, + success(res) { + if (res.code === 200) { + $('.diamonds span').text(res.data.totalDiamondNum); + var str = ''; + res.data.memberIncomeList.forEach((res, i) => { + str += ` +
+ +
+

${res.nick}

+ ID:${res.erbanNo} +
+
+

${res.diamondNum}

+ ${langReplace(localLang.personal.text20)} +
+
+ ` + }); + $('.data').append(str); + } else { + toastMsg(res.message) + } + hideLoading(layerIndex) + }, + error(err) { + hideLoading(layerIndex) + toastMsg(langReplace(localLang.demoModule.layerIndex3)) + } + }) +} + +// 获取前8周时间 +function timestampToDate(timestamp) { + var date = new Date(timestamp); + return date.toString(); // 转换为字符串 +} +function getLastEightWeeksTimestamps(newTime) { + console.log(timestampToDate(newTime)); + const timestamps = []; + const now = newTime; + + // 计算从今天往前 8 周的起点（56 天） + const startDate = new Date(now.getTime() - 56 * 24 * 60 * 60 * 1000); + + // 从起点开始，每天增加到当前日期 + for (let i = 0; i <= 56; i++) { + const currentDay = new Date(startDate.getTime() + i * 24 * 60 * 60 * 1000); + timestamps.push(dateFormat(currentDay.getTime(), "yyyy-MM-dd")); + } + + return timestamps.reverse(); +} +var str = ''; +getLastEightWeeksTimestamps(new Date()).forEach(res => { + str += ` +
  • ${res}
    • + ` +}) +$('.timeBox .timeBox_in ul').append(str); +// 选择时间 +$('.timeBox .timeBox_in ul').on('click', 'li', function () { + var time = $(this).text(); + $(this).addClass('act').siblings().removeClass('act'); + if (timeType == 1) { + startDate = time; + } else { + endDate = time; + } +}) +var whyStatus = true; +$('h3 img').click(function () { + if (whyStatus) { + $('h3 div').show(); + } else { + $('h3 div').hide(); + } + whyStatus = !whyStatus; +}) +// 选择开始时间 +$('.time .start').click(function () { + timeType = 1; + bodyScroolFun(true); + $('.timeBox').show(); +}) +// 选择结束时间 +$('.time .end').click(function () { + timeType = 2; + bodyScroolFun(true); + $('.timeBox').show(); +}) +// 确认时间按钮 +$('.timeBox .timeBox_in .but').click(function () { + if (timeType == 1) { + $('.time .start b').text(startDate); + } else { + $('.time .end b').text(endDate); + } + bodyScroolFun(false); + $('.timeBox').hide(); +}) \ No newline at end of file diff --git a/view/molistar/modules/guild-ar/js/index.js b/view/molistar/modules/guild-ar/js/index.js index e99ef00..1e8c588 100644 --- a/view/molistar/modules/guild-ar/js/index.js +++ b/view/molistar/modules/guild-ar/js/index.js @@ -385,7 +385,7 @@ $('.guildInfoSet').click(function () { }) // 我的收入 $('.memberFlow').click(function (params) { - window.location.href = `./personal.html` + window.location.href = `./personal.html?roleTypes=${roleTypes}` }) // 薪资账户 $('.memberFlow2').click(function (params) { diff --git a/view/molistar/modules/guild-ar/js/personal.js b/view/molistar/modules/guild-ar/js/personal.js index 42067ca..a6111b0 100644 --- a/view/molistar/modules/guild-ar/js/personal.js +++ b/view/molistar/modules/guild-ar/js/personal.js @@ -28,6 +28,7 @@ const toastMsg = (content = langReplace(localLang.demoModule.layerIndex2), time skin: 'msg' }) } +var timestamp; var roleTypes; var searTime; var guildNick; @@ -56,6 +57,9 @@ $(function () { fuzzyMatchUpdateQueryStringParameterFun(); // 判断语言 langReplace = window.lang.replace; localLang = window.lang; + if(getQueryString().roleTypes == 1){ + $('.page2 .agencyDiamondIncome').show(); + } translateFun(); getAccount(); }, 100) @@ -82,6 +86,7 @@ function translateFun() { $('.text17').text(langReplace(localLang.personal.text17)); $('.text18').text(langReplace(localLang.personal.text18)); $('.text19').text(langReplace(localLang.personal.text19)); + $('.agencyDiamondIncometext1').text(langReplace(localLang.agencyDiamondIncome.text1)); } // 配置接口 function getAccount() { @@ -91,6 +96,7 @@ function getAccount() { url: urlPrefix + '/guild/income/getIncome', success(res) { if (res.code === 200) { + timestamp = res.timestamp; // 判断是否展示agency // person // 处理自己 @@ -167,4 +173,8 @@ $('.page1 .diamond .withdraw').click(function () { // 跳转薪资账户页面 $('.page1 .account').click(function () { window.location.href = `./salary_account.html` +}) +// 跳转钻石中心 +$('.agencyDiamondIncome').click(function () { + window.location.href = `./agencyDiamondIncome.html?timestamp=${timestamp}`; }) \ No newline at end of file diff --git a/view/molistar/modules/guild-ar/local/ar.js b/view/molistar/modules/guild-ar/local/ar.js index ac9d3a0..503fc98 100644 --- a/view/molistar/modules/guild-ar/local/ar.js +++ b/view/molistar/modules/guild-ar/local/ar.js @@ -336,4 +336,13 @@ langAr = {

    3 تدرج مكافآت العملات

    `, text3: `./images/weeklyRewardsRule2-ar.png`, }, + agencyDiamondIncome: { + text1: `إيرادات الألماس للوكالة`, // 阿拉伯文 + text2: `بناءً على الوكالة، يمكنك البحث عن إيرادات الألماس في أي وقت.`, // 阿拉伯文 + text3: `قد يؤدي خروج المستخدم من الوكالة إلى تغييرات في البيانات.`, // 阿拉伯文 + text4: `إلى`, // 阿拉伯文 + text5: `اختيار التاريخ`, // 阿拉伯文 + text6: `تأكيد`, // 阿拉伯文 + text7: `يبحث`, + } } \ No newline at end of file diff --git a/view/molistar/modules/guild-ar/local/en.js b/view/molistar/modules/guild-ar/local/en.js index 600a544..651472c 100644 --- a/view/molistar/modules/guild-ar/local/en.js +++ b/view/molistar/modules/guild-ar/local/en.js @@ -336,4 +336,13 @@ langEn = {

    3 Coin reward gradient

    `, text3: `./images/weeklyRewardsRule2.png`, }, + agencyDiamondIncome:{ + text1:`Agency Diamond Income`, + text2:`Building a guild, you can search for diamond income at any time.`, + text3:`User exit agency may result in data changes.`, + text4:`To`, + text5:`Date selection`, + text6:`Confirm`, + text7:`Search`, + } } diff --git a/view/molistar/modules/guild-ar/local/zh.js b/view/molistar/modules/guild-ar/local/zh.js index 2746c59..dff8ffd 100644 --- a/view/molistar/modules/guild-ar/local/zh.js +++ b/view/molistar/modules/guild-ar/local/zh.js @@ -328,7 +328,7 @@ langZh = { text2: `您可以總共獲得 2240000 金幣。`, text3: `領取`, text4: `主播等級`, - text5: `已獲得`, + text5: `已獲得`, }, weeklyRewardsRule: { text1: `規則`, @@ -337,4 +337,13 @@ langZh = {

    3 金幣獎勵梯度

    `, text3: `./images/weeklyRewardsRule2.png`, }, + agencyDiamondIncome: { + text1: `公會鑽石收入`, // 繁體中文 + text2: `建立公會，隨時可以查詢鑽石收入。`, // 繁體中文 + text3: `用戶退出公會可能導致數據變更。`, // 繁體中文 + text4: `至`, // 繁體中文 + text5: `日期選擇`, // 繁體中文 + text6: `確認`, // 繁體中文 + text7:`查詢`, + } } \ No newline at end of file diff --git a/view/molistar/modules/guild-ar/personal.html b/view/molistar/modules/guild-ar/personal.html index 502437b..a0c472c 100644 --- a/view/molistar/modules/guild-ar/personal.html +++ b/view/molistar/modules/guild-ar/personal.html @@ -7,7 +7,7 @@ Personal - + @@ -99,6 +99,7 @@ +
    0
    @@ -126,5 +127,5 @@ - + \ No newline at end of file