Merge branch 'develop' of https://git.xiaopay.net/lizhishu/xzf_uniapp-wechat-web into develop

src/pages/SchoolReport/SchoolReport.vue

@@ -318,7 +318,9 @@
 								:key="index" class="consumer-details-sum">
 								<view v-for="(e,i) in item.consumerDetailsSumArr" class="consumer-details-sum-item"
 									:key="i" :class="i?'':'consumer-details-sum-type'">
-									<text :style="{color:item.calculateType=='较上'?trendColorList[i]:''}"> {{e}} </text>
+									<text
+										:style="{color:item.calculateType=='较上'?trendColorList[i]:'','font-size':item.calculateType=='较上'&&i!=0?'20rpx':''}">
+										{{e}} </text>
 									<template v-if="item.calculateType=='较上'&&i == 0">
 										<span>{{['月','周'][reportTypeIndex]}}</span>
 									</template>
@@ -2593,10 +2595,9 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 											} else {
 												tmpColorList.push('');
 											}
-
-											e[item] = e[item] > 0 ? e[item] +
+											e[item] = e[item] >= 1000 ? '-' : (e[item] > 0 ? e[item] +
 												'%↑' : (e[item] < 0 ? e[item].toString().slice(1) + '%↓' :
-													'-');
+													'-'));
 										}
 									}
 								}