diff --git a/manifest.json b/manifest.json index eee7cea..e8462d2 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "appid" : "__UNI__4910728", "description" : "信任桥优品是一款集线上商城、线下联盟商家的DAO聚合商城;通过“有趣”“有利”“有希望”的卖货玩法,吸引消费者、推广者、商家、投资人参与生态,共同打造共创共享的全球产业生态。", "versionName" : "1.0.1", - "versionCode" : 148, + "versionCode" : 150, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/rwa_package/dongjian/finance.vue b/pages/rwa_package/dongjian/finance.vue index 7935f2b..a136013 100644 --- a/pages/rwa_package/dongjian/finance.vue +++ b/pages/rwa_package/dongjian/finance.vue @@ -142,7 +142,18 @@ - + + @@ -154,7 +165,8 @@ 已分配总额:{{fiveTotal}} - + @@ -213,6 +225,7 @@ export default { legend:{show:false}, title:{name: '100%',fontSize:16,color:'#333',}, subtitle: {name: '五期分配比例',fontSize:12,color:'#666',}, + extra: { ring: { ringWidth: 60, @@ -237,6 +250,7 @@ export default { legend:{show:false}, title:{name: '100%',fontSize:16,color:'#333',}, subtitle: {name: '分配分布',fontSize:12,color:'#666',}, + extra: { ring: { ringWidth: 60, @@ -244,11 +258,11 @@ export default { } }, fourData:{ - categories: [1,2,3,4], + categories: [1,2,3,4,2,3,4,2,3,4,2,3,4,2,3,4,2,3,4,2,3,4,2,3,4], series: [{ name: "", - data:[] + data:['1','2','3','4','5','2','3','4','5','2','3','4','5','2','3','4','5','2','3','4','5','2','3','4','5'] }] }, fiveData:{ @@ -262,11 +276,16 @@ export default { fourOps:{ color: ["#7632FF","#7632FF","#B039C2"], padding: [15,15,0,15], - enableScroll: false, + enableScroll: true, + legend: {show:false}, + xAxis: { + scrollShow:true, + itemCount:4, disableGrid: true }, + yAxis: { gridType: "dash", dashLength: 2 @@ -323,7 +342,7 @@ export default { this.fiveData.series[0].name = ''; if(this.curTwo == 0){ this.fiveTotal = this.curData.profitSharingTbcBonus.tbcTotal; - let arr = this.curData.profitSharingTbcBonus.tbcList.slice(-5); + let arr = this.curData.profitSharingTbcBonus.tbcList; arr.forEach((item,index)=>{ this.fiveData.categories.push(item.key); this.fiveData.series[0].data.push(item.amount); @@ -331,7 +350,7 @@ export default { }) }else{ this.fiveTotal = this.curData.profitSharingTbcBonus.bonusTotal; - let arr = this.curData.profitSharingTbcBonus.bonusList.slice(-5); + let arr = this.curData.profitSharingTbcBonus.bonusList; arr.forEach((item,index)=>{ this.fiveData.categories.push(item.key); this.fiveData.series[0].data.push(item.amount); @@ -343,13 +362,13 @@ export default { this.fourData.series[0].data = []; this.fourData.series[0].name = ''; if(this.curOne == 0){ - let arr = this.curData.profitSharingStat.dayList.slice(-5); + let arr = this.curData.profitSharingStat.dayList; 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.slice(-5); + let arr = this.curData.profitSharingStat.monthList; arr.forEach((item,index)=>{ this.fourData.categories.push(item.key); this.fourData.series[0].data.push(item.amount); diff --git a/utils/config.js b/utils/config.js index d20d84b..b72c9dd 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';