diff --git a/view/molistar/modules/guild-ar/css/weeklyRewards.css b/view/molistar/modules/guild-ar/css/weeklyRewards.css index 9094605..5d96b96 100644 --- a/view/molistar/modules/guild-ar/css/weeklyRewards.css +++ b/view/molistar/modules/guild-ar/css/weeklyRewards.css @@ -52,10 +52,10 @@ body { line-height: 0.58667rem; margin: 2.64rem auto 0.29333rem; display: flex; + justify-content: space-between; } .tab div { - margin-right: 0.66667rem; color: #7B7B7D; font-size: 0.37333rem; font-weight: 400; @@ -234,8 +234,3 @@ body { left: auto; right: 0; } - -.arabic .tab div { - margin-right: 0; - margin-left: 0.66667rem; -} diff --git a/view/molistar/modules/guild-ar/css/weeklyRewards.scss b/view/molistar/modules/guild-ar/css/weeklyRewards.scss index 1d4247f..09ed775 100644 --- a/view/molistar/modules/guild-ar/css/weeklyRewards.scss +++ b/view/molistar/modules/guild-ar/css/weeklyRewards.scss @@ -57,9 +57,10 @@ body { line-height: px2rem(44); margin: px2rem(198) auto px2rem(22); display: flex; + justify-content: space-between; div { - margin-right: px2rem(50); + // margin-right: px2rem(50); color: #7B7B7D; font-size: px2rem(28); font-weight: 400; @@ -237,8 +238,4 @@ body { left: auto; right: 0; } - .tab div{ - margin-right: 0; - margin-left: px2rem(50); - } } \ No newline at end of file diff --git a/view/molistar/modules/guild-ar/js/weeklyRewards.js b/view/molistar/modules/guild-ar/js/weeklyRewards.js index bcac902..7083789 100644 --- a/view/molistar/modules/guild-ar/js/weeklyRewards.js +++ b/view/molistar/modules/guild-ar/js/weeklyRewards.js @@ -114,7 +114,7 @@ function ulFun(index) {
${unitProcessingAr(res.rewardNum, 2)} -
${langReplace(localLang.weeklyRewards.text3)}
+
${langReplace(localLang.weeklyRewards.text3)}
@@ -142,7 +142,7 @@ function getReward(id) { }, success(res) { if (res.code === 200) { - get(); + getConfig(); } else { toastMsg(res.message) } @@ -155,7 +155,7 @@ function getReward(id) { }) } // 领取按钮 -$('.box ul li .left .get').click(function () { +$('.box ul').on('click', ' li .left .get', function () { var status = $(this).attr('status'); var id = $(this).attr('id'); if (status == 1) { diff --git a/view/molistar/modules/guild-ar/local/ar.js b/view/molistar/modules/guild-ar/local/ar.js index 0a0d0c7..d8dbf48 100644 --- a/view/molistar/modules/guild-ar/local/ar.js +++ b/view/molistar/modules/guild-ar/local/ar.js @@ -37,7 +37,7 @@ langAr = { transfer_salary: "تحويل الراتب:", audit: 'قيد المراجعة', weeklyRewardsText1: 'مكافآت المضيف الأسبوعية', - weeklyRewardsText2: 'يمكنك الحصول على 560000 عملة بالمجموع.', + weeklyRewardsText2: 'يمكنك الحصول على 2240000 عملة بالمجموع.', weeklyRewardsText3: 'احصل على', weeklyRewardsText4: 'مستوى المضيف', weeklyRewardsText5: 'وقت إعادة التعيين: الاثنين 0:00 (GMT+3)', @@ -323,7 +323,7 @@ langAr = { }, weeklyRewards: { text1: `مكافآت المضيف الأسبوعية`, - text2: `يمكنك الحصول على 560000 عملة بالمجموع.`, + text2: `يمكنك الحصول على 2240000 عملة بالمجموع.`, text3: `احصل على`, text4: `مستوى المضيف`, text5: ``, diff --git a/view/molistar/modules/guild-ar/local/en.js b/view/molistar/modules/guild-ar/local/en.js index 7854cbb..d97756e 100644 --- a/view/molistar/modules/guild-ar/local/en.js +++ b/view/molistar/modules/guild-ar/local/en.js @@ -35,7 +35,7 @@ langEn = { transfer_salary: "Salary Transfer:", audit: 'In Audit', weeklyRewardsText1: 'Host weekly rewards', - weeklyRewardsText2: 'You can get 560000 coins totally.', + weeklyRewardsText2: 'You can get 2240000 coins totally.', weeklyRewardsText3: 'Get', weeklyRewardsText4: 'Host Lv', weeklyRewardsText5: 'Reset time: Monday 0:00 (GMT+3)', @@ -322,7 +322,7 @@ langEn = { }, weeklyRewards: { text1: `Host weekly rewards`, - text2: `You can get 560000 coins totally.`, + text2: `You can get 2240000 coins totally.`, text3: `Get`, text4: `Host Lv`, text5: ``, diff --git a/view/molistar/modules/guild-ar/local/zh.js b/view/molistar/modules/guild-ar/local/zh.js index c3cbacc..28c2058 100644 --- a/view/molistar/modules/guild-ar/local/zh.js +++ b/view/molistar/modules/guild-ar/local/zh.js @@ -37,7 +37,7 @@ langZh = { transfer_salary: "薪资转账:", audit: '審核中', weeklyRewardsText1: '主播每週獎勵', - weeklyRewardsText2: '您可以總共獲得 560000 金幣。', + weeklyRewardsText2: '您可以總共獲得 2240000 金幣。', weeklyRewardsText3: '領取', weeklyRewardsText4: '主播等級', weeklyRewardsText5: '重置時間:週一 0:00(GMT+3)', @@ -324,7 +324,7 @@ langZh = { }, weeklyRewards: { text1: `主播每週獎勵`, - text2: `您可以總共獲得 560000 金幣。`, + text2: `您可以總共獲得 2240000 金幣。`, text3: `領取`, text4: `主播等級`, text5: ``, diff --git a/view/molistar/modules/guildAr/css/weeklyRewards.css b/view/molistar/modules/guildAr/css/weeklyRewards.css index 9094605..5d96b96 100644 --- a/view/molistar/modules/guildAr/css/weeklyRewards.css +++ b/view/molistar/modules/guildAr/css/weeklyRewards.css @@ -52,10 +52,10 @@ body { line-height: 0.58667rem; margin: 2.64rem auto 0.29333rem; display: flex; + justify-content: space-between; } .tab div { - margin-right: 0.66667rem; color: #7B7B7D; font-size: 0.37333rem; font-weight: 400; @@ -234,8 +234,3 @@ body { left: auto; right: 0; } - -.arabic .tab div { - margin-right: 0; - margin-left: 0.66667rem; -} diff --git a/view/molistar/modules/guildAr/css/weeklyRewards.scss b/view/molistar/modules/guildAr/css/weeklyRewards.scss index 1d4247f..b1d146b 100644 --- a/view/molistar/modules/guildAr/css/weeklyRewards.scss +++ b/view/molistar/modules/guildAr/css/weeklyRewards.scss @@ -57,9 +57,9 @@ body { line-height: px2rem(44); margin: px2rem(198) auto px2rem(22); display: flex; + justify-content: space-between; div { - margin-right: px2rem(50); color: #7B7B7D; font-size: px2rem(28); font-weight: 400; @@ -237,8 +237,4 @@ body { left: auto; right: 0; } - .tab div{ - margin-right: 0; - margin-left: px2rem(50); - } } \ No newline at end of file diff --git a/view/molistar/modules/guildAr/js/weeklyRewards.js b/view/molistar/modules/guildAr/js/weeklyRewards.js index 94254f7..7083789 100644 --- a/view/molistar/modules/guildAr/js/weeklyRewards.js +++ b/view/molistar/modules/guildAr/js/weeklyRewards.js @@ -75,7 +75,7 @@ function getConfig() { showLoading() networkRequest({ type: 'get', - url: urlPrefix + '/familyMemberWeekLevelReward/get', + url: urlPrefix + '/guildMemberWeekLevelReward/get', success(res) { if (res.code === 200) { data = res.data; @@ -114,7 +114,7 @@ function ulFun(index) {
${unitProcessingAr(res.rewardNum, 2)} -
${langReplace(localLang.weeklyRewards.text3)}
+
${langReplace(localLang.weeklyRewards.text3)}
@@ -136,13 +136,13 @@ function getReward(id) { showLoading() networkRequest({ type: 'post', - url: urlPrefix + '/familyMemberWeekLevelReward/getReward', + url: urlPrefix + '/guildMemberWeekLevelReward/getReward', data: { id, }, success(res) { if (res.code === 200) { - get(); + getConfig(); } else { toastMsg(res.message) } @@ -155,7 +155,7 @@ function getReward(id) { }) } // 领取按钮 -$('.box ul li .left .get').click(function () { +$('.box ul').on('click', ' li .left .get', function () { var status = $(this).attr('status'); var id = $(this).attr('id'); if (status == 1) { diff --git a/view/molistar/modules/guildAr/local/ar.js b/view/molistar/modules/guildAr/local/ar.js index d4d058c..c2f02e9 100644 --- a/view/molistar/modules/guildAr/local/ar.js +++ b/view/molistar/modules/guildAr/local/ar.js @@ -31,7 +31,7 @@ langAr = { newText3: `المسؤول`, audit: 'قيد المراجعة', weeklyRewardsText1: 'مكافآت المضيف الأسبوعية', - weeklyRewardsText2: 'يمكنك الحصول على 93000 عملة بالمجموع.', + weeklyRewardsText2: 'يمكنك الحصول على 185000 عملة بالمجموع.', weeklyRewardsText3: 'احصل على', weeklyRewardsText4: 'مستوى المضيف', weeklyRewardsText5: 'وقت إعادة التعيين: الاثنين 0:00 (GMT+8)', @@ -190,7 +190,7 @@ langAr = { }, weeklyRewards: { text1: `مكافآت المضيف الأسبوعية`, - text2: `يمكنك الحصول على 93000 عملة بالمجموع.`, + text2: `يمكنك الحصول على 185000 عملة بالمجموع.`, text3: `احصل على`, text4: `مستوى المضيف`, text5: ``, diff --git a/view/molistar/modules/guildAr/local/en.js b/view/molistar/modules/guildAr/local/en.js index 1869692..38ebce0 100644 --- a/view/molistar/modules/guildAr/local/en.js +++ b/view/molistar/modules/guildAr/local/en.js @@ -29,7 +29,7 @@ langEn = { newText3: `Administrator`, audit:'In Audit', weeklyRewardsText1: 'Host weekly rewards', - weeklyRewardsText2: 'You can get 93000 coins totally.', + weeklyRewardsText2: 'You can get 185000 coins totally.', weeklyRewardsText3: 'Get', weeklyRewardsText4: 'Host Lv', weeklyRewardsText5: 'Reset time: Monday 0:00 (GMT+8)', @@ -188,7 +188,7 @@ langEn = { }, weeklyRewards: { text1: `Host weekly rewards`, - text2: `You can get 93000 coins totally.`, + text2: `You can get 185000 coins totally.`, text3: `Get`, text4: `Host Lv`, text5: ``, diff --git a/view/molistar/modules/guildAr/local/zh.js b/view/molistar/modules/guildAr/local/zh.js index 76b1d04..7b18b04 100644 --- a/view/molistar/modules/guildAr/local/zh.js +++ b/view/molistar/modules/guildAr/local/zh.js @@ -31,7 +31,7 @@ langZh = { newText3: `管理員`, audit: '審核中', weeklyRewardsText1: '主播每週獎勵', - weeklyRewardsText2: '您可以總共獲得 93000 金幣。', + weeklyRewardsText2: '您可以總共獲得 185000 金幣。', weeklyRewardsText3: '領取', weeklyRewardsText4: '主播等級', weeklyRewardsText5: '重置時間:週一 0:00(GMT+8)', @@ -191,7 +191,7 @@ langZh = { }, weeklyRewards: { text1: `主播每週獎勵`, - text2: `您可以總共獲得 93000 金幣。`, + text2: `您可以總共獲得 185000 金幣。`, text3: `領取`, text4: `主播等級`, text5: ``,