Merge remote-tracking branch 'origin/master'

apps/exams/Tpl/default/Index/examsresult_w3g.html

@@ -30,8 +30,8 @@
 	    transition: all .3s ease-in-out;
 	    z-index: 8;
 	}
-	
-	
+
+
 	body{background-color: #fff;overflow: hidden;}
 	.reportPage{
 		padding: 0 0.75rem;box-sizing: border-box;
@@ -47,7 +47,7 @@
 	.reportContent_btn{
 		width: 10rem;height: 3rem;line-height: 3rem;text-align: center;border-radius:1.5rem;background-color: #A3E460;color: #fff;font-family:PingFangSC-Semibold,PingFang SC;font-weight:600;font-size: 1rem;margin: 0 auto;
 	}
-	
+
 	.reportLastBox{
 		position: fixed;width: 100%;bottom: 0;left: 0;z-index: 1;
 	}
@@ -72,7 +72,7 @@
 			<div class="reportPage">
 				<div class="reportTop">
 					<p class="reportTop_t">练习题目：{$paper.exams_paper_title}</p>
-					<p class="reportTop_t">耗时：{:floor($answerData['anser_time']/60)}h{:$answerData['anser_time'] % 60}m</p>
+					<p class="reportTop_t">耗时：{:floor($answerData['anser_time']/60)}m{:$answerData['anser_time'] % 60}s</p>
 				</div>
 				<div class="reportContent">
 					<p class="reportContent_de">得分</p>
@@ -102,10 +102,10 @@
 	new Vue({
 		el:"#app",
 		data:{
-			
+
 		},
 		created:function() {
-			
+
 		},
 		mounted:function(){
 			$("#preloader").hide();
@@ -118,4 +118,4 @@
 			}
 		}
 	})
-</script>
\ No newline at end of file
+</script>