diff --git a/pages/rwa_package/dongjian/finance.vue b/pages/rwa_package/dongjian/finance.vue index bdcd833..bc7b22a 100644 --- a/pages/rwa_package/dongjian/finance.vue +++ b/pages/rwa_package/dongjian/finance.vue @@ -354,25 +354,30 @@ export default { if(this.curTwo == 0){ this.fiveTotal = this.curData.profitSharingTbcBonus.tbcTotal; let arr = this.curData.profitSharingTbcBonus.tbcList; - arr.forEach((item,index)=>{ - this.fiveData.categories.push(item.key); - this.fiveData.series[0].data.push(item.amount); - }) + if(arr){ + arr.forEach((item,index)=>{ + this.fiveData.categories.push(item.key); + this.fiveData.series[0].data.push(item.amount); + }) + } + }else{ this.fiveTotal = this.curData.profitSharingTbcBonus.bonusTotal; let arr = this.curData.profitSharingTbcBonus.bonusList; let max = 0; - arr.forEach((item,index)=>{ - if(max < item.amount){ - max = item.amount; - } - this.fiveData.categories.push(item.key); - this.fiveData.series[0].data.push(item.amount); - }) + if(arr){ + arr.forEach((item,index)=>{ + if(max < item.amount){ + max = item.amount; + } + this.fiveData.categories.push(item.key); + this.fiveData.series[0].data.push(item.amount); + }) + } + if(max != 0){ max = max / 1000; } - console.log('max',max.toFixed(0)) // this.fourOps.yAxis.data.max = } }, @@ -381,18 +386,24 @@ export default { this.fourData.series[0].data = []; this.fourData.series[0].name = ''; if(this.curOne == 0){ + console.log('dayList',this.curData.profitSharingStat.dayList) let arr = this.curData.profitSharingStat.dayList; - arr.forEach((item,index)=>{ - this.fourData.categories.push(item.key); - this.fourData.series[0].data.push(item.amount); - }) + if(arr){ + arr.forEach((item,index)=>{ + this.fourData.categories.push(item.key); + this.fourData.series[0].data.push(item.amount); + }) + } + }else{ let arr = this.curData.profitSharingStat.monthList; - arr.forEach((item,index)=>{ - this.fourData.categories.push(item.key); - this.fourData.series[0].data.push(item.amount); - - }) + if(arr){ + arr.forEach((item,index)=>{ + this.fourData.categories.push(item.key); + this.fourData.series[0].data.push(item.amount); + }) + } + } }, profitSharingData(){ @@ -401,31 +412,35 @@ export default { this.curData = res.data; if(this.curData){ this.threeData.series = []; - if(this.curTopTwo == 0){ - this.threeData.series.push(this.curData.profitSharingDetail.cost); + for(let key in this.curData.profitSharingDetail){ + this.curData.profitSharingDetail[key]['data'] = this.curData.profitSharingDetail[key]['percent']; + this.threeData.series.push(this.curData.profitSharingDetail[key]) } - this.threeData.series.push(this.curData.profitSharingDetail.bonus); - this.threeData.series.push(this.curData.profitSharingDetail.addedTax); - this.threeData.series.push(this.curData.profitSharingDetail.encourrage); - this.threeData.series.push(this.curData.profitSharingDetail.nextYearFund); - this.threeData.series.push(this.curData.profitSharingDetail.rwaMarketManage); - this.threeData.series.push(this.curData.profitSharingDetail.stockStabilizing); - this.threeData.series.push(this.curData.profitSharingDetail.tradeEncourrage); - this.threeData.series.push(this.curData.profitSharingDetail.yearEndShare); - this.threeData.series.forEach((item,index)=>{ - item.data = Number(item.percent); - if(index == 0)item.color = '#7934F6'; - if(index == 1)item.color = '#AF39C4'; - if(index == 2)item.color = '#0370FF'; - if(index == 3)item.color = '#00A6CC'; - if(index == 4)item.color = '#FFB322'; - if(index == 5)item.color = '#FF9035'; - if(index == 6)item.color = '#FF5369'; - if(index == 7)item.color = '#00A776'; - if(this.curTopTwo == 0){ - if(index == 8)item.color = '#5840FF'; - } - }) + // if(this.curTopTwo == 0){ + // this.threeData.series.push(this.curData.profitSharingDetail.cost); + // } + // this.threeData.series.push(this.curData.profitSharingDetail.bonus); + // this.threeData.series.push(this.curData.profitSharingDetail.addedTax); + // this.threeData.series.push(this.curData.profitSharingDetail.encourrage); + // this.threeData.series.push(this.curData.profitSharingDetail.nextYearFund); + // this.threeData.series.push(this.curData.profitSharingDetail.rwaMarketManage); + // this.threeData.series.push(this.curData.profitSharingDetail.stockStabilizing); + // this.threeData.series.push(this.curData.profitSharingDetail.tradeEncourrage); + // this.threeData.series.push(this.curData.profitSharingDetail.yearEndShare); + // this.threeData.series.forEach((item,index)=>{ + // item.data = Number(item.percent); + // if(index == 0)item.color = '#7934F6'; + // if(index == 1)item.color = '#AF39C4'; + // if(index == 2)item.color = '#0370FF'; + // if(index == 3)item.color = '#00A6CC'; + // if(index == 4)item.color = '#FFB322'; + // if(index == 5)item.color = '#FF9035'; + // if(index == 6)item.color = '#FF5369'; + // if(index == 7)item.color = '#00A776'; + // if(this.curTopTwo == 0){ + // if(index == 8)item.color = '#5840FF'; + // } + // }) this.getFour(); this.getFive(); diff --git a/utils/config.js b/utils/config.js index b72c9dd..d20d84b 100644 --- a/utils/config.js +++ b/utils/config.js @@ -2,11 +2,11 @@ // export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 测试环境 -export const BASE_URL = "https://api.tbmall.xin"; //生产 -export const MILD_BASE_URL = "https://agent.tbmall.xin/"; //中台生产 +// export const BASE_URL = "https://api.tbmall.xin"; //生产 +// export const MILD_BASE_URL = "https://agent.tbmall.xin/"; //中台生产 -// export const BASE_URL ='https://api.o.tbmall.xin'; // 本地测试 -// export const MILD_BASE_URL = "https://agent.o.tbmall.xin/"; //中台测试 +export const BASE_URL ='https://api.o.tbmall.xin'; // 本地测试 +export const MILD_BASE_URL = "https://agent.o.tbmall.xin/"; //中台测试 export const SHARE_URL = 'https://h.tbmall.xin';