diff --git a/App.vue b/App.vue index 4005d7d..dfb0925 100644 --- a/App.vue +++ b/App.vue @@ -92,6 +92,9 @@ display: flex; flex-direction: column; } +.text-w-400{ + font-weight: 400; +} .text-white{ color:#fff; } @@ -164,6 +167,9 @@ .text-52{ font-size:52rpx; } +.text-64{ + font-size:64rpx; +} .text-88{ font-size:88rpx; } diff --git a/api/finance.js b/api/finance.js index a7fcf95..ab81d93 100644 --- a/api/finance.js +++ b/api/finance.js @@ -223,5 +223,25 @@ export function getBonusStat() { }); } +// 分红统计 +export function getVcoinLocked() { + return request({ + url: "/finance/getVcoinLocked", + method: "get", + }); +} - +// 分红统计 +export function getVcoinReleaseLog(data) { + return request({ + url: "/finance/getVcoinReleaseLog", + method: "get", + data, + }); +} +export function getProfitSharingData() { + return request({ + url: "/finance/getProfitSharingData", + method: "get", + }); +} diff --git a/pages/home/home.vue b/pages/home/home.vue index d7120e5..cd80625 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -41,7 +41,7 @@ TB聚合商城 - MALL+RWA+DAO的共创共享全球产业生态 + 全民共创共享的电商平台 @@ -302,7 +302,6 @@ export default { }, onClipboard(){ let _this = this; - console.log('11111') uni.getClipboardData({ success: function(res) { // http://localhost:5173/#/pages/other_package/productInfo/productInfo?id=1038 diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index 375ddc7..2399818 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -398,7 +398,7 @@ export default { }, { id: 5, - title: "加速次数", + title: "数字积分", url: "https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine/tool_js.png", path: "/pages/rwa_package/dongjian/jia", }, diff --git a/pages/mine_package/mine_my_team/mine_my_team.vue b/pages/mine_package/mine_my_team/mine_my_team.vue index eba5a44..6b3c1b9 100644 --- a/pages/mine_package/mine_my_team/mine_my_team.vue +++ b/pages/mine_package/mine_my_team/mine_my_team.vue @@ -77,7 +77,7 @@ - 提成货币 + 贡献值奖励 @@ -90,7 +90,7 @@ - 提成统计 + 奖励统计 @@ -113,7 +113,7 @@ - 提成来源 + 奖励来源 @@ -147,14 +147,15 @@ - + + 温馨提示 - 1、订单金额：团队下的总业绩 - 2、订单数量：团队下的总订单数 - 3、直购订单金额：直推的总订单金额 - 4、直购订单数：直推的总订单数 + 1、订单金额：邀请的所有人总消费金额 + 2、订单数量：邀请的所有人下单总订单数 + 3、直购订单金额：直接邀请的总订单金额 + 4、直购订单数：直接邀请的总订单数 确定 @@ -165,14 +166,15 @@ - + + 温馨提示 - 1、今日：今日0点到当前时间的数据 - 2、当前未结算：当前所有收货后未结算的数据 - 3、直购订单金额：直推的总订单金额 - 4、已结算：所有已结算的数据 + 1、今日：今日0点到当前时间的数据 + 2、当前未结算：当前所有收货后未结算的数据 + 3、直购订单金额：直推的总订单金额 + 4、已结算：所有已结算的数据 确定 diff --git a/pages/mine_package/mine_my_team_list/mine_my_team_list.vue b/pages/mine_package/mine_my_team_list/mine_my_team_list.vue index 6cabef4..b476b41 100644 --- a/pages/mine_package/mine_my_team_list/mine_my_team_list.vue +++ b/pages/mine_package/mine_my_team_list/mine_my_team_list.vue @@ -1,415 +1,190 @@ diff --git a/pages/mine_package/mine_my_team_list/mine_my_team_list1.vue b/pages/mine_package/mine_my_team_list/mine_my_team_list1.vue new file mode 100644 index 0000000..fe5757b --- /dev/null +++ b/pages/mine_package/mine_my_team_list/mine_my_team_list1.vue @@ -0,0 +1,415 @@ + + + + + diff --git a/pages/mine_package/mine_purse_log/mine_purse_log.vue b/pages/mine_package/mine_purse_log/mine_purse_log.vue index 5e8ba57..8f51bd1 100644 --- a/pages/mine_package/mine_purse_log/mine_purse_log.vue +++ b/pages/mine_package/mine_purse_log/mine_purse_log.vue @@ -4,7 +4,7 @@ left-path="/pages/mine_package/mine_purse/mine_purse" /> - + @@ -16,9 +16,7 @@ - - + @@ -29,6 +27,36 @@ + + + + + {{headerData[source[0].key]}} + {{source[0].name}} + {{headerData[source[2].key]}} + {{source[2].name}} + + + {{headerData[source[1].key]}} + {{source[1].name}} + {{headerData[source[3].key]}} + {{source[3].name}} + + + + + + + {{headerData[source[0].key]}} + {{source[0].name}} + + + {{headerData[source[1].key]}} + {{source[1].name}} + + + + @@ -119,28 +147,30 @@ export default { name: "活期账户", key: "cur" }, - { - name: "预存款账户", - key: "pre" - }, + // { + // name: "预存款账户", + // key: "pre" + // }, ] this.source = [ { - name: "今日分红数量", - key: "todayBonus" + name: "共享资金池余额", + key: "poolBonus" }, { - name: "总分红数量", - key: "totalBonus" - }, - { - name: "平台总分红", + name: "平台已分享金额", key: "totalMallBonus" }, { - name: "共享资金池剩余", - key: "poolBonus" + name: "今日分享金额", + key: "todayBonus" }, + { + name: "总分享金额", + key: "totalBonus" + }, + + ]; } @@ -157,18 +187,18 @@ export default { key: "lockAmount" }, - { - name: "预存款账户", - key: "pre" - }, + // { + // name: "预存款账户", + // key: "pre" + // }, ] this.source = [ { - name: "商城总挖矿数量", + name: "商城积分总量", key: "mallTotalMiningSum" }, { - name: "已兑换数量", + name: "已解锁数量", key: "exchangeNumber" }, ]; @@ -183,10 +213,10 @@ export default { name: "活期账户", key: "cur" }, - { - name: "预存款账户", - key: "pre" - }, + // { + // name: "预存款账户", + // key: "pre" + // }, ] this.source = [ @@ -199,7 +229,7 @@ export default { key: "totalValue" }, { - name: "商城日贡献", + name: "今日商城日贡献", key: "todayMallValue" }, { @@ -223,24 +253,24 @@ export default { key: "lockAmount" }, - { - name: "预存款账户", - key: "pre" - }, + // { + // name: "预存款账户", + // key: "pre" + // }, ]; this.source = [ - { - name: "可用次数", - key: "curAmount" - }, - { - name: "锁定次数", - key: "lockAmount" - }, - { - name: "预发放次数", - key: "preAmount" - } + // { + // name: "可用次数", + // key: "curAmount" + // }, + // { + // name: "锁定次数", + // key: "lockAmount" + // }, + // { + // name: "预发放次数", + // key: "preAmount" + // } ]; } @@ -339,11 +369,15 @@ export default { - selectInfo(item) { + selectInfo(item = null) { + // if(item == null){ + // item.key = 'cur' + // } this.orderList = []; this.form.page = 1; this.selInfo = item.key; let id = 0; + if (item.key === "cur") { id = this.curId; } @@ -412,6 +446,33 @@ export default {