|  |  | @@ -3,6 +3,7 @@ var app = getApp(); | 
		
	
		
			
			|  |  |  | const Http = require("../../../utils/HttpBasics"); | 
		
	
		
			
			|  |  |  | let util = require("../../../utils/util"); | 
		
	
		
			
			|  |  |  | const imgurl = require("../../../utils/imgurl"); | 
		
	
		
			
			|  |  |  | const {creditType} = require("../../../utils/creditType"); | 
		
	
		
			
			|  |  |  | Page({ | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | /** | 
		
	
	
		
			
				|  |  | @@ -15,7 +16,8 @@ Page({ | 
		
	
		
			
			|  |  |  | showcontent: false, | 
		
	
		
			
			|  |  |  | loadingUrl: imgurl.loading.url, | 
		
	
		
			
			|  |  |  | bgg: imgurl.bgg.url, | 
		
	
		
			
			|  |  |  | allow_load: true | 
		
	
		
			
			|  |  |  | allow_load: true, | 
		
	
		
			
			|  |  |  | creditAmount:0 | 
		
	
		
			
			|  |  |  | }, | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | /** | 
		
	
	
		
			
				|  |  | @@ -41,13 +43,18 @@ Page({ | 
		
	
		
			
			|  |  |  | var that = this; | 
		
	
		
			
			|  |  |  | if (that.data.allow_load) { | 
		
	
		
			
			|  |  |  | Http.get({ | 
		
	
		
			
			|  |  |  | url: config.api.scoreHistory, | 
		
	
		
			
			|  |  |  | url: config.api.integralList, | 
		
	
		
			
			|  |  |  | data: { | 
		
	
		
			
			|  |  |  | pageNum: pageNum, | 
		
	
		
			
			|  |  |  | pageSize: 20, | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | }).then(res => { | 
		
	
		
			
			|  |  |  | res.data.list.map(file => { | 
		
	
		
			
			|  |  |  | creditType.map((item,index)=>{ | 
		
	
		
			
			|  |  |  | if (file.creditType==item.value){ | 
		
	
		
			
			|  |  |  | file.creditTypeName = item.name; | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | }) | 
		
	
		
			
			|  |  |  | file.createDate = util.formatTime( | 
		
	
		
			
			|  |  |  | file.createDate, | 
		
	
		
			
			|  |  |  | "yyyy-MM-dd hh:mm:ss" | 
		
	
	
		
			
				|  |  | @@ -59,8 +66,10 @@ Page({ | 
		
	
		
			
			|  |  |  | }); | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | that.data.list = that.data.list.concat(res.data.list); | 
		
	
		
			
			|  |  |  | console.log(that.data.list,22222222222) | 
		
	
		
			
			|  |  |  | that.setData({ | 
		
	
		
			
			|  |  |  | list: that.data.list | 
		
	
		
			
			|  |  |  | list: that.data.list, | 
		
	
		
			
			|  |  |  | creditAmount: that.data.list[0].creditAmount | 
		
	
		
			
			|  |  |  | }); | 
		
	
		
			
			|  |  |  | }) | 
		
	
		
			
			|  |  |  | .catch(err => { | 
		
	
	
		
			
				|  |  | 
 |