Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/user/report.vue

@@ -18,10 +18,10 @@
 			</view>
 			<view class="row3">
 				<view class="title">
-					总收入
+					{{moneyList[typeSelect].name}}
 				</view>
 				<view class="number">
-					核算中
+					{{moneyList[typeSelect].count}}元
 				</view>
 			</view>
 		</view>
@@ -326,10 +326,7 @@
 					percentage: ''
 				},
 				dateList: [
-					[{
-							value: '1',
-							label: '2021年'
-						},
+					[
 						{
 							value: '2',
 							label: '2022年'
@@ -785,7 +782,11 @@
 								obj.endName = obj.name.split('→')[1]
 							}
 							this.ztList = res.data.data[i].biViewInfoList
-							// this.prizeScroll();
+						}
+						else if (i == 10) {
+							uni.hideLoading()
+							this.moneyList = res.data.data[i].biViewInfoList
+							console.log('收入',this.moneyList)
 						}
 					}
 					this.chartlist = _list
@@ -824,6 +825,10 @@
 				}, 10)
 			},
 			confirm(e) {
+				uni.showLoading({
+					title:"加载中",
+					mask:true
+				})
 				console.log(e)
 				this.nowDate = e[0].label + e[1].label
 				let _year = e[0].label.substring(0, 4)
@@ -845,6 +850,7 @@
 			htClick(index) {
 				// this.itemSelect = index
 				this.contractSelect = index
+				
 			}
 		}
 	}