1

pages/user/newReport.vue

@@ -80,10 +80,15 @@
 						@getIndex="getIndex" />
 				</view>
 			</uni-transition>
-			<view class="zd flex" @click="foldClcik('fade',1)">
+			<view class="zd flex alc" @click="foldClcik('fade',1)">
 				{{this.isSHowContent1?'点击收起':'点击展开'}}
+				<image v-if="this.isSHowContent1" src="../../static/sq.png" mode="widthFix"
+					style="width: 30rpx;margin-left: 10rpx;"></image>
+				<image v-else src="../../static/zk.png" mode="widthFix" style="width: 30rpx;margin-left: 10rpx;">
+				</image>
+				<!-- 
 				<u-icon :name="iconName1" size="30" style="margin-left: 10rpx;">
-				</u-icon>
+				</u-icon> -->
 			</view>
 
 		</view>
@@ -98,7 +103,7 @@
 					<view class="left title-lv2">
 						数量统计
 					</view>
-					<view @click='godetail(0)' class="right-btn">
+					<view @click='godetail(0)' class="right-btn" style="position: relative;z-index: 999;">
 						合同明细
 					</view>
 				</view>
@@ -152,8 +157,10 @@
 			</uni-transition>
 			<view class="zd flex" @click="foldClcik('fade',2)">
 				{{this.isSHowContent2?'点击收起':'点击展开'}}
-				<u-icon :name="iconName2" size="30" style="margin-left: 10rpx;">
-				</u-icon>
+				<image v-if="this.isSHowContent2" src="../../static/sq.png" mode="widthFix"
+					style="width: 30rpx;margin-left: 10rpx;"></image>
+				<image v-else src="../../static/zk.png" mode="widthFix" style="width: 30rpx;margin-left: 10rpx;">
+				</image>
 			</view>
 		</view>
 		<view class="content3 content-item">
@@ -235,8 +242,10 @@
 			</uni-transition>
 			<view class="zd flex" @click="foldClcik('fade',3)">
 				{{this.isSHowContent3?'点击收起':'点击展开'}}
-				<u-icon :name="iconName3" size="30" style="margin-left: 10rpx;">
-				</u-icon>
+				<image v-if="this.isSHowContent3" src="../../static/sq.png" mode="widthFix"
+					style="width: 30rpx;margin-left: 10rpx;"></image>
+				<image v-else src="../../static/zk.png" mode="widthFix" style="width: 30rpx;margin-left: 10rpx;">
+				</image>
 			</view>
 		</view>
 		<view class="content4 content-item">
@@ -273,8 +282,10 @@
 			</uni-transition>
 			<view class="zd flex" @click="foldClcik('fade',4)">
 				{{this.isSHowContent4?'点击收起':'点击展开'}}
-				<u-icon :name="iconName4" size="30" style="margin-left: 10rpx;">
-				</u-icon>
+				<image v-if="this.isSHowContent4" src="../../static/sq.png" mode="widthFix"
+					style="width: 30rpx;margin-left: 10rpx;"></image>
+				<image v-else src="../../static/zk.png" mode="widthFix" style="width: 30rpx;margin-left: 10rpx;">
+				</image>
 			</view>
 		</view>
 		<view class="content5 content-item">
@@ -311,8 +322,10 @@
 			</uni-transition>
 			<view class="zd flex" @click="foldClcik('fade',5)">
 				{{this.isSHowContent5?'点击收起':'点击展开'}}
-				<u-icon :name="iconName5" size="30" style="margin-left: 10rpx;">
-				</u-icon>
+				<image v-if="this.isSHowContent5" src="../../static/sq.png" mode="widthFix"
+					style="width: 30rpx;margin-left: 10rpx;"></image>
+				<image v-else src="../../static/zk.png" mode="widthFix" style="width: 30rpx;margin-left: 10rpx;">
+				</image>
 			</view>
 		</view>
 		<view class="content6 content-item">
@@ -352,8 +365,10 @@
 			</uni-transition>
 			<view class="zd flex" @click="foldClcik('fade',6)">
 				{{this.isSHowContent6?'点击收起':'点击展开'}}
-				<u-icon :name="iconName6" size="30" style="margin-left: 10rpx;">
-				</u-icon>
+				<image v-if="this.isSHowContent6" src="../../static/sq.png" mode="widthFix"
+					style="width: 30rpx;margin-left: 10rpx;"></image>
+				<image v-else src="../../static/zk.png" mode="widthFix" style="width: 30rpx;margin-left: 10rpx;">
+				</image>
 			</view>
 		</view>
 		<u-picker v-model="showYear" mode="selector" :range="selector" :default-selector="[2]"></u-picker>
@@ -480,6 +495,7 @@
 							// disabled: true,
 							axisLine: false,
 							fontColor: "#BEBEBE",
+							textAlign: 'right'
 						}],
 
 					},
@@ -521,8 +537,8 @@
 					legend: {
 						fontSize: 12,
 						position: 'top',
-						itemGap: 10,
-						margin: 30
+						itemGap: 20,
+						padding: 20
 					},
 					xAxis: {
 						boundaryGap: "justify",
@@ -532,9 +548,7 @@
 						dashLength: 10,
 
 					},
-					yAxis: {
 
-					},
 					extra: {
 						// tooltip: {
 						// 	showBox: false,
@@ -566,7 +580,9 @@
 					yAxis: {
 						gridType: "dash",
 						data: [{
-							min: 0
+							min: 0,
+							fontColor: '#BEBEBE',
+							textAlign: 'right'
 						}]
 					},
 					extra: {
@@ -1908,10 +1924,16 @@
 			}
 		}
 
+		.row3 {
+			position: relative;
+			top: -40rpx;
+		}
+
 		.row5 {
 			display: flex;
 			justify-content: space-between;
 			color: #9E9E9E;
+			margin-bottom: 20rpx;
 
 			.left {}
 		}