${item.exchangeGoldBean}
@@ -105,4 +114,53 @@ function getData() {
$('.shops_list').on('click', '.shop_box', function () {
$('.shops_list .shop_box').removeClass('shop_active')
$(this).addClass('shop_active');
-})
\ No newline at end of file
+ $('.Exchange_btn').attr('awardid',$(this).attr('awardid'))
+ $('.Exchange_btn').attr('exchangegoldbean',$(this).attr('exchangegoldbean'))
+ $('.Exchange_btn').attr('shopName',$(this).attr('shopName'))
+ targetIndex = $(this).attr('data-index')
+})
+
+$('.Exchange_btn').click(function () {
+let exchangegoldbean = $(this).attr('exchangegoldbean')
+let goldBean = $(this).attr('goldBean')
+let awardId = $(this).attr('awardid')
+let shopName = $(this).attr('shopName')
+if(Number(exchangegoldbean)>Number(goldBean)){
+ $('.popup_tip').show()
+}else{
+
+ showLoading();
+ networkRequest({
+ type: "POST",
+ url: urlPrefix + "/daily/shopBuy",
+ data: {
+ awardId,
+ num:1
+ },
+ success: function (res) {
+ if (res.code == 200) {
+ toastMsg(langReplace(localLang.demoModule.Exchange_successful))
+ getData()
+ $('.popup_content .title').text(langReplace(localLang.demoModule.Exchange_successful))
+ $('.popup_content .content').text(langReplace(localLang.demoModule.You_exchanged(shopName)))
+ $('.popup_tip').show()
+ } else {
+ toastMsg(res.message)
+ }
+ hideLoading(layerIndex);
+ },
+ error: function (res) {
+ console.log(res, "报错啦");
+ hideLoading(layerIndex);
+ },
+ })
+
+}
+})
+$('.tip_btn').click(function () {
+ $('.popup_tip').hide()
+})
+$('.top .info .right').click(function () {
+ window.location.href = `./pointsDetails.html`
+ return
+ })
\ No newline at end of file
diff --git a/view/molistar/modules/taskCenter/js/pointsDetails.js b/view/molistar/modules/taskCenter/js/pointsDetails.js
new file mode 100644
index 00000000..22e425fc
--- /dev/null
+++ b/view/molistar/modules/taskCenter/js/pointsDetails.js
@@ -0,0 +1,154 @@
+let urlPrefix = getUrlPrefix()
+let browser = checkVersion()
+let env = EnvCheck();
+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'
+ })
+}
+// 初始化函數
+$(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();
+ getData();
+ }, 100)
+
+})
+function translateFun() {
+ var langReplace = window.lang.replace;
+ var localLang = window.lang;
+ $('.page_title').html(langReplace(localLang.demoModule.pointsDetails));
+ $('.Increase').html(langReplace(localLang.demoModule.Increase));
+ $('.Consumption').html(langReplace(localLang.demoModule.Consumption));
+
+}
+var billType = 2;//账单类型1-支出， 2-收入
+var pageNo = 1;
+var pageSize = 10;
+var canNext = true;
+var AgencyList = [];
+var resPageLength;
+function getData() {
+ showLoading();
+ networkRequest({
+ type: "POST",
+ url: urlPrefix + "/daily/bill",
+ data: {
+ billType,
+ pageNo,
+ pageSize
+
+ },
+ success: function (res) {
+ if (res.code == 200) {
+ $('.data_list .data_box').remove()
+ resPageLength = res.data.length
+ AgencyList = [...AgencyList, ...res.data]
+ let str = '';
+ AgencyList.forEach((item, index) => {
+ str += `
+
+
+
${item.type == 2?`${langReplace(localLang.demoModule.Exchange)}${item.shopName}*${item.num}`:funTaskType(item.taskType, item.reachNum,item.standardValue)}
+
${item.createTime}
+
+
+
${item.type == 1 ? '+' : ''}${item.operateBean}
+
+
+
+ `
+ })
+ $('.data_list').append(str)
+ } else {
+ toastMsg(res.message)
+ }
+ canNext = true
+ hideLoading(layerIndex);
+ },
+ error: function (res) {
+ console.log(res, "报错啦");
+ hideLoading(layerIndex);
+ canNext = true
+ },
+ })
+}
+
+function funTaskType(type, num,standardValue) {
+ let obj = {
+ DAILY_SIGN: langReplace(localLang.demoModule.DAILY_SIGN),
+ UP_MIC: langReplace(localLang.demoModule.UP_MIC(num,standardValue)),
+ UP_MIC_120: langReplace(localLang.demoModule.UP_MIC_120(num,standardValue)),
+ PLAY_GAME: langReplace(localLang.demoModule.PLAY_GAME(num,standardValue)),
+ CHARGE_GOLD_NUM: langReplace(localLang.demoModule.CHARGE_GOLD_NUM(num,standardValue)),
+ CHARGE_GOLD_NUM_5: langReplace(localLang.demoModule.CHARGE_GOLD_NUM_5(num,standardValue)),
+ CHARGE_GOLD_NUM_10: langReplace(localLang.demoModule.CHARGE_GOLD_NUM_10(num,standardValue)),
+ ROOM_SEND_GIFT: langReplace(localLang.demoModule.ROOM_SEND_GIFT),
+ RECV_LUCKY_GIFT: langReplace(localLang.demoModule.RECV_LUCKY_GIFT),
+ RECV_NOMAL_GIFT: langReplace(localLang.demoModule.RECV_NOMAL_GIFT),
+ RECV_NOMAL_GIFT_GOLD: langReplace(localLang.demoModule.RECV_NOMAL_GIFT_GOLD),
+ }
+ return obj[type]
+}
+
+$('.tab_list .tab_box').click(function () {
+ billType = $(this).attr('billType')
+ $(this).addClass('tab_active').siblings().removeClass('tab_active')
+ pageNo = 1;
+ pageSize = 10;
+ canNext = true;
+ AgencyList = [];
+ getData();
+})
+// 页面触底 分页加载
+$(window).scroll(function () {
+ if ($(this).scrollTop() + $(this).height() >= $(document).height() - 5) {
+ console.log(canNext);
+ if (canNext && resPageLength == pageSize) {
+ canNext = false
+ pageNo++;
+ getData();
+ } else {
+ // toastMsg("No more~");
+ }
+ }
+});
\ No newline at end of file
diff --git a/view/molistar/modules/taskCenter/local/ar.js b/view/molistar/modules/taskCenter/local/ar.js
index 2b30acd1..c3627e61 100644
--- a/view/molistar/modules/taskCenter/local/ar.js
+++ b/view/molistar/modules/taskCenter/local/ar.js
@@ -12,23 +12,23 @@ langAr = {
Expired:'منتهي الصلاحية',
Daily_Tasks:'المهام اليومية',
DAILY_SIGN:'سجّل دخولك يوميًا',
- UP_MIC:function(num){
- return `دردشة عبر الميكروفون (${num}/60 دقيقة)`
+ UP_MIC:function(num,standardValue){
+ return `دردشة عبر الميكروفون (${num}/${standardValue} دقيقة)`
},
- UP_MIC_120:function(num){
- return `دردشة عبر الميكروفون (${num}/120 دقيقة)`
+ UP_MIC_120:function(num,standardValue){
+ return `دردشة عبر الميكروفون (${num}/${standardValue} دقيقة)`
},
- PLAY_GAME:function(num){
- return `شارك في ألعاب مصغرة (${num}/3)`
+ PLAY_GAME:function(num,standardValue){
+ return `شارك في ألعاب مصغرة (${num}/${standardValue})`
},
- CHARGE_GOLD_NUM:function(num){
- return `شحن (${num}/7000)`
+ CHARGE_GOLD_NUM:function(num,standardValue){
+ return `شحن (${num}/${standardValue})`
},
- CHARGE_GOLD_NUM_5:function(num){
- return `شحن (${num}/35000)`
+ CHARGE_GOLD_NUM_5:function(num,standardValue){
+ return `شحن (${num}/${standardValue})`
},
- CHARGE_GOLD_NUM_10:function(num){
- return `شحن (${num}/70000)`
+ CHARGE_GOLD_NUM_10:function(num,standardValue){
+ return `شحن (${num}/${standardValue})`
},
ROOM_SEND_GIFT:'إرسال هدايا في الغرفة',
RECV_LUCKY_GIFT:'استلام هدايا Lucky/Bravo',
@@ -40,6 +40,13 @@ langAr = {
Sign_arrived:'لم يحن وقت تسجيل الدخول',
Received:'تم الاستلام',
Exchange:'الاستبدال',
-
+ Exchange_successful:'تم الاستبدال بنجاح',
+ Understand:'مُتفهم',
+ You_exchanged:function(name){
+ return `لقد استبدلت${name},تم وضعها في حقيبتك بنجاح`
+ },
+ pointsDetails:'تفاصيل النقاط',
+ Increase:'زيادة',
+ Consumption:'الاستهلاك',
}
}
\ No newline at end of file
diff --git a/view/molistar/modules/taskCenter/local/en.js b/view/molistar/modules/taskCenter/local/en.js
index 798987b1..369e74f4 100644
--- a/view/molistar/modules/taskCenter/local/en.js
+++ b/view/molistar/modules/taskCenter/local/en.js
@@ -12,23 +12,23 @@ langEn = {
Expired:'Expired',
Daily_Tasks:'Daily Tasks',
DAILY_SIGN:'Sign in daily',
- UP_MIC:function(num){
- return `Chat on the mic (${num}/60mins)`
+ UP_MIC:function(num,standardValue){
+ return `Chat on the mic (${num}/${standardValue}mins)`
},
- UP_MIC_120:function(num){
- return `Chat on the mic (${num}/120mins)`
+ UP_MIC_120:function(num,standardValue){
+ return `Chat on the mic (${num}/${standardValue}mins)`
},
- UP_MIC_120:function(num){
- return `Play games (${num}/3)`
+ PLAY_GAME:function(num,standardValue){
+ return `Play games (${num}/${standardValue})`
},
- CHARGE_GOLD_NUM:function(num){
- return `Recharge (${num}/7000) Coins`
+ CHARGE_GOLD_NUM:function(num,standardValue){
+ return `Recharge (${num}/${standardValue}) Coins`
},
- CHARGE_GOLD_NUM_5:function(num){
- return `Recharge (${num}/35000) Coins`
+ CHARGE_GOLD_NUM_5:function(num,standardValue){
+ return `Recharge (${num}/${standardValue}) Coins`
},
- CHARGE_GOLD_NUM_10:function(num){
- return `Recharge (${num}/70000) Coins`
+ CHARGE_GOLD_NUM_10:function(num,standardValue){
+ return `Recharge (${num}/${standardValue}) Coins`
},
ROOM_SEND_GIFT:'Send Gifts in the room',
RECV_LUCKY_GIFT:'Received Lucky/Bravo gifts',
@@ -40,6 +40,13 @@ langEn = {
Sign_arrived:'Sign-in time has not arrived',
Received:'Received',
Exchange:'Exchange',
-
+ Exchange_successful:'Exchange successful',
+ Understand:'Understand',
+ You_exchanged:function(name){
+ return `You exchanged ${name}, It has been successfully put into your backpack`
+ },
+ pointsDetails:'Points Details',
+ Increase:'Increase',
+ Consumption:'Consumption',
}
}
\ No newline at end of file
diff --git a/view/molistar/modules/taskCenter/local/tr.js b/view/molistar/modules/taskCenter/local/tr.js
index e9f13b89..ff6dc62c 100644
--- a/view/molistar/modules/taskCenter/local/tr.js
+++ b/view/molistar/modules/taskCenter/local/tr.js
@@ -12,23 +12,23 @@ langTr = {
Expired:'Süresi doldu',
Daily_Tasks:'Günlük Görevler',
DAILY_SIGN:'Günlük oturum açın',
- UP_MIC:function(num){
- return `Mikrofonda sohbet edin (${num}/60dk)`
+ UP_MIC:function(num,standardValue){
+ return `Mikrofonda sohbet edin (${num}/${standardValue}dk)`
},
- UP_MIC_120:function(num){
- return `Mikrofonda sohbet edin (${num}/120dk)`
+ UP_MIC_120:function(num,standardValue){
+ return `Mikrofonda sohbet edin (${num}/${standardValue}dk)`
},
- PLAY_GAME:function(num){
- return `Mini oyunlara katılın (${num}/3)`
+ PLAY_GAME:function(num,standardValue){
+ return `Mini oyunlara katılın (${num}/${standardValue})`
},
- CHARGE_GOLD_NUM:function(num){
- return `(${num}/7000)'i yeniden yükleyin`
+ CHARGE_GOLD_NUM:function(num,standardValue){
+ return `(${num}/${standardValue})'i yeniden yükleyin`
},
- CHARGE_GOLD_NUM_5:function(num){
- return `(${num}/35000)'i yeniden yükleyin`
+ CHARGE_GOLD_NUM_5:function(num,standardValue){
+ return `(${num}/${standardValue})'i yeniden yükleyin`
},
- CHARGE_GOLD_NUM_10:function(num){
- return `(${num}/70000)'i yeniden yükleyin`
+ CHARGE_GOLD_NUM_10:function(num,standardValue){
+ return `(${num}/${standardValue})'i yeniden yükleyin`
},
ROOM_SEND_GIFT:'Odada hediye gönderin',
RECV_LUCKY_GIFT:'Şanslı/Bravo hediyeleri alındı',
@@ -40,5 +40,13 @@ langTr = {
Sign_arrived:'Giriş zamanı gelmedi',
Received:'Alındı',
Exchange:'Değişim',
+ Exchange_successful:'Değişim başarılı',
+ Understand:'Anlayın',
+ You_exchanged:function(name){
+ return `değiştirdiniz${name},Başarılı bir şekilde sırt çantanıza konuldu`
+ },
+ pointsDetails:'Puan ayrıntıları',
+ Increase:'Artır',
+ Consumption:'Tüketim',
}
}
\ No newline at end of file
diff --git a/view/molistar/modules/taskCenter/local/zh.js b/view/molistar/modules/taskCenter/local/zh.js
index 2db8f871..be930896 100644
--- a/view/molistar/modules/taskCenter/local/zh.js
+++ b/view/molistar/modules/taskCenter/local/zh.js
@@ -12,23 +12,23 @@ langZh = {
Expired:'已過期',
Daily_Tasks:'日常任務',
DAILY_SIGN:'每日簽到',
- UP_MIC:function(num){
- return `上麥聊天（${num}/60mins）`;
+ UP_MIC:function(num,standardValue){
+ return `上麥聊天（${num}/${standardValue}mins）`;
},
- UP_MIC_120:function(num){
- return `上麥聊天（${num}/120mins）`;
+ UP_MIC_120:function(num,standardValue){
+ return `上麥聊天（${num}/${standardValue}mins）`;
},
- PLAY_GAME:function(num){
- return `參與小遊戲（${num}/3）`;
+ PLAY_GAME:function(num,standardValue){
+ return `參與小遊戲（${num}/${standardValue}）`;
},
- CHARGE_GOLD_NUM:function(num){
- return `儲值(${num}/7000)`;
+ CHARGE_GOLD_NUM:function(num,standardValue){
+ return `儲值(${num}/${standardValue})`;
},
- CHARGE_GOLD_NUM_5:function(num){
- return `儲值(${num}/35000)`;
+ CHARGE_GOLD_NUM_5:function(num,standardValue){
+ return `儲值(${num}/${standardValue})`;
},
- CHARGE_GOLD_NUM_10:function(num){
- return `儲值(${num}/70000)`;
+ CHARGE_GOLD_NUM_10:function(num,standardValue){
+ return `儲值(${num}/${standardValue})`;
},
ROOM_SEND_GIFT:'房間送禮',
RECV_LUCKY_GIFT:'收到Lucky/Bravo禮物',
@@ -40,6 +40,13 @@ langZh = {
Sign_arrived:'未到簽到時間',
Received:'已收到',
Exchange:'兌換',
-
+ Exchange_successful:'兌換成功',
+ Understand:'我知道了',
+ You_exchanged:function(name){
+ return `你兌換${name},已經成功放入你的背包`
+ },
+ pointsDetails:'積分明細',
+ Increase:'增加',
+ Consumption:'消耗',
}
}
\ No newline at end of file
diff --git a/view/molistar/modules/taskCenter/mall.html b/view/molistar/modules/taskCenter/mall.html
index 2634c990..1498f95a 100644
--- a/view/molistar/modules/taskCenter/mall.html
+++ b/view/molistar/modules/taskCenter/mall.html
@@ -55,10 +55,19 @@