diff --git a/view/molistar/vue-project/myincome/src/i18n/langs/ar.js b/view/molistar/vue-project/myincome/src/i18n/langs/ar.js index 481d3d2..d2ff6a4 100644 --- a/view/molistar/vue-project/myincome/src/i18n/langs/ar.js +++ b/view/molistar/vue-project/myincome/src/i18n/langs/ar.js @@ -1,5 +1,6 @@ const ar = { diamondLog: { + 餘額: "الرصيد", 全部: "الكل", 公会周期结算会长钻石收入: "إيرادات الماس لرئيس النقابة عند التسوية الدورية", 购买房间背景: "شراء خلفية الغرفة", diff --git a/view/molistar/vue-project/myincome/src/i18n/langs/en.js b/view/molistar/vue-project/myincome/src/i18n/langs/en.js index 9151d4f..fd73bb9 100644 --- a/view/molistar/vue-project/myincome/src/i18n/langs/en.js +++ b/view/molistar/vue-project/myincome/src/i18n/langs/en.js @@ -1,5 +1,6 @@ const en = { diamondLog: { + 全部: "Balance", 全部: "All", 公会周期结算会长钻石收入: "Guild Leader Diamond Income for Periodic Settlement", 购买房间背景: "Purchase Room Background", diff --git a/view/molistar/vue-project/myincome/src/i18n/langs/zh.js b/view/molistar/vue-project/myincome/src/i18n/langs/zh.js index 1773821..efbb568 100644 --- a/view/molistar/vue-project/myincome/src/i18n/langs/zh.js +++ b/view/molistar/vue-project/myincome/src/i18n/langs/zh.js @@ -1,5 +1,6 @@ const zh = { diamondLog: { + 餘額: "餘額", 全部: "全部", 公会周期结算会长钻石收入: "公會週期結算會長鑽石收入", 购买房间背景: "購買房間背景", diff --git a/view/molistar/vue-project/myincome/src/utils/request.js b/view/molistar/vue-project/myincome/src/utils/request.js index d766d25..15d3584 100644 --- a/view/molistar/vue-project/myincome/src/utils/request.js +++ b/view/molistar/vue-project/myincome/src/utils/request.js @@ -24,7 +24,7 @@ const service = axios.create({ service.interceptors.request.use(config => { if (router.apps[0]._route.name === 'Login') { config.headers = {} - } else if (!checkVersion().app) {//false + } else if (false) {//!checkVersion().app if (router.apps[0]._route.name === 'WithDrawInfoBind' && config.url == `/sms/verify` || config.url == `/sms/getCode`) { config.headers = { 'h5_token': window.sessionStorage.getItem('ticket'), diff --git a/view/molistar/vue-project/myincome/src/view/myincome/DiamondLog.vue b/view/molistar/vue-project/myincome/src/view/myincome/DiamondLog.vue index 60c2a70..a25c2fc 100644 --- a/view/molistar/vue-project/myincome/src/view/myincome/DiamondLog.vue +++ b/view/molistar/vue-project/myincome/src/view/myincome/DiamondLog.vue @@ -5,366 +5,63 @@ :title="this.$t(`diamondLog.金幣記錄`)" rightTitle > -
-
- {{ $t("diamondLog.全部") }} - + +
+
+ {{ $t("diamondLog.全部") }} +
-
- {{ $t("diamondLog.收入記錄") }} - +
+ {{ $t("diamondLog.收入記錄") }} +
-
- {{ $t("diamondLog.支出記錄") }} - +
+ {{ $t("diamondLog.支出記錄") }} +
-
- {{ $t("diamondLog.禮物獲得") }} - +
+ {{ $t("diamondLog.禮物獲得") }} +
+
- 2024-11-23 + {{ formatDate(new Date().getTime()) }}
- - - - - + +
+
+
+ Total income: + {{ res.totalAmount }} + +
+
{{ res.date }}
+
+
-
- -
-
- - {{ - tab === 11 - ? $t("diamondLog.共收入") - : tab == 1 - ? $t("diamondLog.共獲得價值") - : $t("diamondLog.共支出") - }} - - - {{ tab === 1 ? item.totalGiftGoldNumDailySum : item.total }} - - -
-
- {{ relDate(item.date) }} -
-
- - -
-
-

- {{ $t("diamondLog.房間紅包_來自") }}{{ item1.roomTitle }} -

-

- {{ $t("diamondLog.全服紅包_來自") }}{{ item1.roomTitle }} -

-

- {{ $t("diamondLog.邀请活动") }} -

-

- {{ $t("diamondLog.房間紅包退款_來自") }}{{ item1.roomTitle }} -

-

- {{ $t("diamondLog.全服紅包退款_來自") }}{{ item1.roomTitle }} -

-

- {{ $t("diamondLog.水晶兌換金幣") }} -

-

- {{ $t("diamondLog.金幣兌換金幣") }} -

-

- {{ $t("diamondLog.活動贈送金幣") }} -

-

- {{ $t("diamondLog.充值") }} -

-

- {{ $t("diamondLog.塔羅佔蔔") }} -

-

- {{ $t("diamondLog.集福氣瓜分金幣") }} -

-

- {{ $t("diamondLog.CP邀請退還") }} -

-

- {{ - item1.targetNick.length > 7 - ? item1.targetNick.slice(0, 7) + "..." - : item1.targetNick - }}{{ $t("diamondLog.贈送金幣") }} -

-

- {{ $t("diamondLog.首充禮包獲得金幣") }} -

-

- {{ $t("diamondLog.星級廚房獎勵") }} -

-

- {{ $t("diamondLog.幸運塔羅收入") }} -

-

- {{ $t("diamondLog.中秋活動瓜分金幣") }} -

-

- {{ $t("diamondLog.公會usd兌換給代儲收入") }} -

-

- {{ $t("diamondLog.公會usd兌換金幣收入") }} -

-

- {{ $t("diamondLog.官方贈送金幣") }} -

-

- {{ $t("diamondLog.守護星球獲得") }} -

-

- {{ $t("diamondLog.LUDO匹配收入") }} -

-

- {{ $t("diamondLog.LUDO匹配退還") }} -

-

- {{ $t("diamondLog.邀請好友註冊獎勵") }} -

-

- {{ $t("diamondLog.被邀請註冊獎勵") }} -

-

- {{ $t("diamondLog.直接邀請儲值返點") }} -

-

- {{ $t("diamondLog.間接邀請儲值返點") }} -

-

- {{ $t("diamondLog.超級幸運禮物價值分成") }} -

-

- {{ $t("diamondLog.超級幸運禮物金幣返點") }} -

-

- {{ $t("diamondLog.貴族等級獎勵") }} -

-

- {{ $t("diamondLog.小遊戲收入") }} -

-

- {{ $t("diamondLog.小遊戲收入") }} -

-

- {{ $t("diamondLog.SS公会活动奖励") }} -

-

- {{ $t("diamondLog.主播周奖励") }} -

-

- {{ $t("diamondLog.主播周奖励") }} -

-

- {{ $t("diamondLog.自定义房间背景驳回") }} -

-

- {{ $t("diamondLog.公会周期结算会长钻石收入") }} -

-

- {{ $t("diamondLog.全服紅包_發生在") }}{{ item1.roomTitle }} -

-

- {{ $t("diamondLog.房間紅包_發生在") }}{{ item1.roomTitle }} -

-

- {{ $t("diamondLog.LUDO匹配消耗") }} -

-

- {{ $t("diamondLog.鉆石兌換金幣支出") }} -

-

- {{ $t("diamondLog.活動禮包支出") }} -

-

- {{ $t("diamondLog.購買門票") }} -

-

- {{ $t("diamondLog.守護星球支出") }} -

-

- {{ $t("diamondLog.CP邀請支出") }} -

-

- {{ $t("diamondLog.幸運塔羅支出") }} -

-

- {{ $t("diamondLog.贈送頭飾支出") }} -

-

- {{ $t("diamondLog.購買頭飾支出") }} -

-

- {{ $t("diamondLog.購買銘牌支出") }} -

-

- {{ $t("diamondLog.贈送銘牌支出") }} -

-

- {{ $t("diamondLog.購買資料卡支出") }} -

-

- {{ $t("diamondLog.贈送資料卡支出") }} -

-

- {{ $t("diamondLog.購買聊天氣泡支出") }} -

-

- {{ $t("diamondLog.贈送聊天氣泡支出") }} -

-

- {{ $t("diamondLog.航海冒險禮包支出") }} -

-

- {{ $t("diamondLog.購買座駕支出") }} -

-

- {{ $t("diamondLog.贈送座駕支出") }} -

-

- {{ $t("diamondLog.小遊戲支出") }} -

-

- {{ $t("diamondLog.小遊戲支出") }} -

-

- {{ $t("diamondLog.星級廚房抽獎") }} -

-

- {{ $t("diamondLog.新年煙花抽獎") }} -

-

- {{ $t("diamondLog.奪寶精靈禮包購買支出") }} -

-

- {{ $t("diamondLog.歡樂砸蛋抽獎") }} -

-

- {{ $t("diamondLog.歡樂砸蛋抽獎") }} -

-

- {{ $t("diamondLog.金幣開通貴族") }} -

-

- {{ $t("diamondLog.購買頭條消耗") }} -

-

- {{ $t("diamondLog.遊戲開黑支出") }} -

-

- {{ $t("diamondLog.解除CP手续费") }} -

-

- {{ $t("diamondLog.购买房间背景") }} -

-

- {{ $t("diamondLog.自定义房间背景") }} -

-

- {{ $t("diamondLog.轉贈金幣給") }} - {{ - item1.targetNick.length > 7 - ? item1.targetNick.slice(0, 7) + "..." - : item1.targetNick - }} - {{ item1.sendDiamondAmount }}{{ $t("diamondLog.金幣") }} -

- -

- {{ item1.srcNick }} {{ $t("diamondLog.贈送") }} - {{ - item1.targetNick.length > 7 - ? item1.targetNick.slice(0, 7) + "..." - : item1.targetNick - }} -

- -

- {{ - item1.targetNick == item1.srcNick && - item1.targetAvatar == item1.srcAvatar - ? $t("diamondLog.自己") - : item1.targetNick.length > 7 - ? item1.targetNick.slice(0, 7) + "..." - : item1.targetNick - }}{{ $t("diamondLog.贈送") }}{{ item1.giftName - }}{{ $t("diamondLog.禮物") }}*{{ item1.giftNum }} -

-

- {{ - item1.targetNick == item1.srcNick && - item1.targetAvatar == item1.srcAvatar - ? $t("diamondLog.自己") - : item1.targetNick.length > 7 - ? item1.targetNick.slice(0, 7) + "..." - : item1.targetNick - }}{{ $t("diamondLog.贈送") }}{{ item1.giftName - }}{{ $t("diamondLog.禮物") }}*{{ item1.giftNum }} -

-

- {{ - item1.targetNick == item1.srcNick && - item1.targetAvatar == item1.srcAvatar - ? $t("diamondLog.自己") - : item1.targetNick.length > 7 - ? item1.targetNick.slice(0, 7) + "..." - : item1.targetNick - }}{{ $t("diamondLog.贈送") }}{{ item1.giftName - }}{{ $t("diamondLog.禮物") }}*{{ item1.giftNum }} -

- -
- {{ - tab == 1 ? item1.giftTotalGoldNum : item1.amount - }} - -
-
-

- Balance:12300->30073 - {{ - relDate(item1.recordTime, 1) - }} -

+
+
{{ describeMap[item.objType] }}
+
+ {{ item.amount }} +
- - - -
加载中...
+
+
+ {{ $t("diamondLog.餘額") }}{{ item.beforeAmount }}->{{ + item.afterAmount + }} +
+
{{ formatDate(item.date, 1) }}
+
+
+
@@ -376,14 +73,9 @@ import { formatDate } from "@/utils/relDate.js"; export default { data() { return { - list: [], //數據列錶 - page: 0, //分頁 - loading: false, //加載中 - finished: true, //是否加載完 - indexList: [], //不清楚應該沒啥用 - //點擊tab類型 - tab: 11, - //底部提示 + tabAct: 1, + describeMap: {}, + list: [], }; }, components: { navigation }, @@ -393,6 +85,79 @@ export default { created() { this.$i18n.locale = window.sessionStorage.getItem("language"); document.title = this.$route.meta.title; + this.describeMap = { + 43: this.$t("diamondLog.房間紅包_來自"), + 44: this.$t("diamondLog.全服紅包_來自"), + 41: this.$t("diamondLog.房間紅包退款_來自"), + 42: this.$t("diamondLog.全服紅包退款_來自"), + 13: this.$t("diamondLog.水晶兌換金幣"), + 15: this.$t("diamondLog.金幣兌換金幣"), + 23: this.$t("diamondLog.活動贈送金幣"), + 1: this.$t("diamondLog.充值"), + 59: this.$t("diamondLog.塔羅佔蔔"), + 60: this.$t("diamondLog.集福氣瓜分金幣"), + 71: this.$t("diamondLog.CP邀請退還"), + 89: this.$t("diamondLog.贈送金幣"), + 62: this.$t("diamondLog.首充禮包獲得金幣"), + 88: this.$t("diamondLog.星級廚房獎勵"), + 96: this.$t("diamondLog.幸運塔羅收入"), + 102: this.$t("diamondLog.中秋活動瓜分金幣"), + 122: this.$t("diamondLog.公會usd兌換給代儲收入"), + 120: this.$t("diamondLog.公會usd兌換金幣收入"), + 35: this.$t("diamondLog.官方贈送金幣"), + 67: this.$t("diamondLog.守護星球獲得"), + 114: this.$t("diamondLog.LUDO匹配收入"), + 115: this.$t("diamondLog.LUDO匹配退還"), + 103: this.$t("diamondLog.邀請好友註冊獎勵"), + 104: this.$t("diamondLog.被邀請註冊獎勵"), + 105: this.$t("diamondLog.直接邀請儲值返點"), + 106: this.$t("diamondLog.間接邀請儲值返點"), + 107: this.$t("diamondLog.超級幸運禮物價值分成"), + 108: this.$t("diamondLog.超級幸運禮物金幣返點"), + 109: this.$t("diamondLog.貴族等級獎勵"), + 110: this.$t("diamondLog.小遊戲收入"), + 132: this.$t("diamondLog.小遊戲收入"), + 125: this.$t("diamondLog.SS公会活动奖励"), + 134: this.$t("diamondLog.主播周奖励"), + 135: this.$t("diamondLog.主播周奖励"), + 140: this.$t("diamondLog.自定义房间背景驳回"), + 141: this.$t("diamondLog.公会周期结算会长钻石收入"), + 40: this.$t("diamondLog.全服紅包_發生在"), + 39: this.$t("diamondLog.房間紅包_發生在"), + 113: this.$t("diamondLog.LUDO匹配消耗"), + 14: this.$t("diamondLog.鉆石兌換金幣支出"), + 27: this.$t("diamondLog.活動禮包支出"), + 61: this.$t("diamondLog.購買門票"), + 66: this.$t("diamondLog.守護星球支出"), + 70: this.$t("diamondLog.CP邀請支出"), + 74: this.$t("diamondLog.幸運塔羅支出"), + 79: this.$t("diamondLog.贈送頭飾支出"), + 78: this.$t("diamondLog.購買頭飾支出"), + 80: this.$t("diamondLog.購買銘牌支出"), + 81: this.$t("diamondLog.贈送銘牌支出"), + 82: this.$t("diamondLog.購買資料卡支出"), + 83: this.$t("diamondLog.贈送資料卡支出"), + 84: this.$t("diamondLog.購買聊天氣泡支出"), + 85: this.$t("diamondLog.贈送聊天氣泡支出"), + 86: this.$t("diamondLog.航海冒險禮包支出"), + 31: this.$t("diamondLog.購買座駕支出"), + 32: this.$t("diamondLog.贈送座駕支出"), + 111: this.$t("diamondLog.小遊戲支出"), + 133: this.$t("diamondLog.小遊戲支出"), + 87: this.$t("diamondLog.星級廚房抽獎"), + 95: this.$t("diamondLog.新年煙花抽獎"), + 98: this.$t("diamondLog.奪寶精靈禮包購買支出"), + 99: this.$t("diamondLog.歡樂砸蛋抽獎"), + 30: this.$t("diamondLog.歡樂砸蛋抽獎"), + 101: this.$t("diamondLog.金幣開通貴族"), + 112: this.$t("diamondLog.購買頭條消耗"), + 117: this.$t("diamondLog.遊戲開黑支出"), + 126: this.$t("diamondLog.解除CP手续费"), + 138: this.$t("diamondLog.购买房间背景"), + 139: this.$t("diamondLog.自定义房间背景"), + 90: this.$t("diamondLog.轉贈金幣給"), + }; + this.getDate(); }, computed: { isApp() { @@ -409,77 +174,29 @@ export default { }, }, methods: { - cutTab(tab) { - this.tab = tab; - this.page = 0; - this.list = []; - this.loading = false; - this.finished = true; - this.onLoad(); + formatDate, + // tab切换按钮 + cutTab(type) { + console.log(type); + this.tabAct = type; + this.getDate(); }, - onLoad() { - this.page++; + // 查询接口 + getDate() { diamondLog({ uid: window.sessionStorage.getItem("uid"), - // uid: 935006, - type: this.tab, + type: this.tabAct, date: new Date().getTime(), - pageNo: this.page, + pageNo: 1, pageSize: 100, }).then((res) => { if (res.data.code === 200) { - if (this.page === 1) { - this.list = res.data.data.billList; - } else { - this.list.push(...res.data.data.billList); - } - if (res.data.data.billList.length <= 0) { - this.finished = false; - } - this.loading = false; + this.list = res.data; } else { Toast(res.data.message); - this.finished = false; } }); }, - //這個應該是計算函數裏的一個邏輯 - filterTotal(total) { - let tot = 0; - let are = this.list.filter((item, index) => { - return item.date === total; - }); - - are.forEach((item, index) => { - tot += Number(item.total); - }); - return tot; - }, - //計算 - // countTotal(index, item) { - // let { list } = this; - // if (!index) return item.total; - // if (!list[index + 1]) return item.total; - // if (list[index].date === list[index + 1].date) { - // let total = this.filterTotal(list[index].date); - // return total; - // } else { - // return item.total; - // } - // }, - //判斷是否相同時間 - thinkTime(index, item) { - let { list } = this; - if (!index) return true; - if (list[index].date === list[index - 1].date) { - return false; - } - // return index == 0 ? true : false; - }, - relDate(value, think) { - return formatDate(value, think); - // return MM + "-" + d + " " + h + ":" + m; - }, }, mounted() { let htmlCss = document.getElementsByTagName("html")[0]; @@ -489,19 +206,59 @@ export default { +.box { + width: 343px; + // overflow-y: scroll; + margin: 0 auto 0; + .titleNum { + width: 100%; + height: 38px; + background: #f4f4f4; + display: flex; + justify-content: space-between; + box-sizing: border-box; + padding: 0 16px; + border-bottom: none; + margin: 0 auto 0; + .left { + height: 100%; + line-height: 38px; + font-size: 14px; + font-weight: 500; + span { + color: #313131; + display: inline-block; + vertical-align: middle; + } + b { + color: #ff8c03; + display: inline-block; + vertical-align: middle; + } + img { + display: inline-block; + width: 22px; + height: 22px; + vertical-align: middle; + margin-top: -6px; + } + } + .right { + height: 100%; + line-height: 38px; + color: #313131; + font-size: 14px; + font-weight: 500; + } + } + .titleNumF { + margin: 1.72rem auto 0; + } + .recordList { + width: 100%; + height: 72px; + box-sizing: border-box; + overflow: hidden; + border-bottom: 0.5px solid #e4e4e4; + .t { + width: 100%; + height: 22px; + line-height: 22px; + display: flex; + justify-content: space-between; + margin-top: 12px; + margin-bottom: 8px; + .l { + color: #313131; + font-size: 16px; + font-weight: 600; + } + .r { + b { + display: inline-block; + vertical-align: middle; + color: #ff8c03; + font-size: 16px; + font-weight: 600; + } + img { + display: inline-block; + vertical-align: middle; + width: 22px; + height: 22px; + margin-top: -6px; + } + } + } + .b { + display: flex; + justify-content: space-between; + color: #7b7b7d; + font-size: 13px; + font-weight: 400; + } + } +} + \ No newline at end of file diff --git a/view/molistar/vue-project/myincome/src/view/myincome/DiamondLog2.vue b/view/molistar/vue-project/myincome/src/view/myincome/DiamondLog2.vue new file mode 100644 index 0000000..2b7a627 --- /dev/null +++ b/view/molistar/vue-project/myincome/src/view/myincome/DiamondLog2.vue @@ -0,0 +1,650 @@ + + + + +