Merge branch 'develop' into uat

src/pages/BankModule/Recharge/Recharge.vue

@@ -1152,7 +1152,7 @@ export default {
           if (res1.code == "10000") {
             bankInfo.schoolId = res1.results.schoolid;
             bankInfo.userId = res1.results.id;
-            bankInfo.accountType = res.results.accounttype;
+            bankInfo.accountType = res1.results.accounttype;
             this_.PersonalInfo = res1.results;
             if (res1.results.usertype == 1) {
               $(".StudentCls").css("display", "block");

src/pages/TemperatureRecords/TemperatureStatistics/TemperatureStatistics.vue

@@ -62,24 +62,24 @@
 			</view>
 			<view class="timeSelectResults timeSelectResults_two">
 				<view class=" timeSelectResultsItem timeSelectResultsItem_three" @tap="temperatrue(3)">
-				<view class=" timeSelectResultsItemTheme">
-					<text>低温人数</text>
-				</view>
-				<view class="timeSelectResultsItemNumber">
-					<text class="specificNumber">{{numObj.lowTemperatureNum}}</text>人
-				</view>
-			</view>
-			<view class="timeSelectResultsItem timeSelectResultsItem_four" @tap="temperatrue(4)">
-				<view class="timeSelectResultsItemTheme">
-					<text>未检测人数</text>
+					<view class=" timeSelectResultsItemTheme">
+						<text>低温人数</text>
+					</view>
+					<view class="timeSelectResultsItemNumber">
+						<text class="specificNumber">{{numObj.lowTemperatureNum}}</text>人
+					</view>
 				</view>
-				<view class="timeSelectResultsItemNumber">
-					<text class="specificNumber">{{numObj.noTemperatureNum}}</text>人
+				<view class="timeSelectResultsItem timeSelectResultsItem_four" @tap="temperatrue(4)">
+					<view class="timeSelectResultsItemTheme">
+						<text>未检测人数</text>
+					</view>
+					<view class="timeSelectResultsItemNumber">
+						<text class="specificNumber">{{numObj.noTemperatureNum}}</text>人
+					</view>
 				</view>
 			</view>
 		</view>
 	</view>
-	</view>
 </template>
 
 <script>
@@ -108,7 +108,7 @@
 				dateShow: false,
 				selectDate: '',
 				minDate: new Date('1970/01/01'),
-				maxDate: new Date(new Date().getTime() - 24 * 60 * 60 * 1000),
+				maxDate: new Date(),
 				// 年级班级选择
 				classShow: false,
 				className: '',
@@ -119,7 +119,7 @@
 			}
 		},
 		mounted() {
-			this.selectDate = this.formatDate(new Date(new Date().getTime() - 24 * 60 * 60 * 1000));
+			this.selectDate = this.formatDate(new Date());
 			this.queryClassListByTeacher().then(
 				() => {
 					this.className = this.actions[0].name;
@@ -205,7 +205,8 @@
 					}, {
 						classId: this.selectClass.classId,
 						gradeId: this.selectClass.gradeId,
-						registDate: this.selectDate,
+						startTime: this.selectDate,
+						endTime: this.selectDate,
 						schoolId: getQueryParams('schoolId'),
 						temperatureInterval: this.timeSelect
 					})
@@ -273,7 +274,7 @@
 	.tainer {
 		.themeBox {
 			height: 221rpx;
-			background:  url(../../../static/images/temperatureRecords.png) center -152rpx no-repeat;
+			background: url(../../../static/images/temperatureRecords.png) center -152rpx no-repeat;
 			background-size: cover;
 			padding: 66rpx 32rpx 0;
 			box-sizing: border-box;