Merge branch 'develop'

src/pages.json

@@ -460,6 +460,16 @@
             }
             
         }
+        ,{
+            "path" : "pages/h520221116/h520221116",
+            "style" :                                                                                    
+            {
+				"navigationStyle": "custom",
+                "navigationBarTitleText": "亲子沟通，由你定义",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

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>
@@ -2588,15 +2590,14 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
 										if (item != 'calculateType') {
 											if (e[item] > 0) {
 												tmpColorList.push('#FA2B00');
-											} else if (e[item] > 0) {
+											} else if (e[item] < 0) {
 												tmpColorList.push('#00A367');
 											} 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) + '%↓' :
-													'-');
+													'-'));
 										}
 									}
 								}

src/pages/h520221116/h520221116.vue

+<template>
+	<view class="container">
+		<image :src="ImgUrl+'xzf/h5.jpg'"></image>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				ImgUrl2: this.$ImgUrl + 'social_front/',
+				ImgUrl: this.$ImgUrl,
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+	.container image {
+		position: relative;
+		width: 100%;
+		height: 190vh;
+	}
+</style>