1

pages/user/member/member.vue

@@ -76,9 +76,9 @@
 								<img src="../../../assets/img/member/00.png" alt="">
 							</view>
 							<view class="vipText1" :style="'color:'+item.color1">{{item.name}}</view>
-							<view class="vipText2"  :style="'color:'+item.color2">{{item.num==0?'注册成功，并完善个人信息':'上个月累计充电量达'+item.num+'度'}}</view>
+							<view class="vipText2"  :style="'color:'+item.color2">{{item.num==0?'注册成功，并完善个人信息':'上个月累计充电量达'+carImg3span3+'度'}}</view>
 							<view class="vipText3"  :style="'color:'+item.color3">
-							{{personInfo.memberLevel>=(i+1)?'会员有效期至：'+(item.num==0?'永久':startDate+'01'):'暂未达标'}}
+							{{personInfo.memberLevel>=(i+1)?'会员有效期至：'+(item.num==0?'永久':startDate):'暂未达标'}}
 							</view>
 						</view>
 						<view class="vipTextImg" >
@@ -221,7 +221,9 @@
 					memberLevel:1
 				},
 				carImg3span1: 0,
-				carImg3span2: 0,
+				carImg3span2: 0,
+				carImg3span3: 0,
+				carImg3span4: 0,
 				startDate:'',
 				uCurrent:0,
 			}
@@ -229,15 +231,65 @@
 		onReady() {
 			this.personInfo = this.carhelp.getPersonInfo()
 			this.uCurrent=this.personInfo.memberLevel-1
-			this.getChargeList()
+			this.getChargeList()//本月
+			
 		},
 		methods: {
 			changeCurrent(e){
 				
 				this.uCurrent=e;
 			},
+			getChargeList2(endDate) {
+				//查上个月
+				var date = new Date();
+				var monthN = date.getMonth() ;
+			
+				var year = date.getFullYear();
+				if (monthN==0) {
+					monthN = 12 ;
+					year=year-1
+				}
+				if (monthN >= 1 && monthN <= 9) {
+					monthN = "0" + monthN;
+				}
+			
+				var startDate = year + '-' + monthN + '-' + '01';
+				
+				
+				
+				
+			
+				API_index.chargingRecordData({
+					pageIndex: 1,
+					pageSize: 999,
+					startDate: startDate,
+					 endDate: endDate
+				}).then((res) => {
+			
+			
+					var chargeList = res.data.data;
+					var num1 = 0;
+					var num2 = 0;
+					for (var i in chargeList) {
+						var obj = chargeList[i]
+						if (obj.status == 2&&obj.entAccountId==null ) {
+							num1 += obj.electricQuantity
+							num2 += obj.totalServiceMoney
+						}
+					}
+					this.carImg3span3 = parseInt(num1 / 10000);
+					this.carImg3span4 = parseInt(num2);
+			
+					
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
 			getChargeList() {
-
+				//查本月
 				var date = new Date();
 				var monthN = date.getMonth() + 1;
 
@@ -260,8 +312,8 @@
 					monthN2 = "0" + monthN2;
 				}
 				
-				this.startDate= year2 + '-' + monthN2 + '-' 
-
+				this.startDate= year2 + '-' + monthN2 + '-01' 
+				this.getChargeList2(startDate)//查上个月
 				API_index.chargingRecordData({
 					pageIndex: 1,
 					pageSize: 999,