From 20a26aa0c12c05c3f96afc163c6532c6b1b5cf8e Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 21 三月 2024 09:24:01 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageBookService/pages/bookServices/examination/examination.wxml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/packageBookService/pages/bookServices/examination/examination.wxml b/packageBookService/pages/bookServices/examination/examination.wxml
index 4c597a9..1f24f93 100644
--- a/packageBookService/pages/bookServices/examination/examination.wxml
+++ b/packageBookService/pages/bookServices/examination/examination.wxml
@@ -26,6 +26,7 @@
<question-schedule
wx:if="{{!loading}}"
id="countDownRef"
+ isNight="{{isNight}}"
answerType="{{answerType}}"
countdownTime="{{countdownTime}}"
currentIndex="{{currentIndex}}"
@@ -34,6 +35,7 @@
></question-schedule>
<question-list
wx:if="{{!loading}}"
+ isNight="{{isNight}}"
currentIndex="{{currentIndex}}"
questionList="{{questionDataList}}"
submitStatus="{{submitStatus}}"
@@ -41,7 +43,7 @@
bind:onChangeInput="onChangeInput"
bind:changeSwiper="changeSwiper"
></question-list>
- <view class="lodaing-box">
+ <view class="lodaing-box" wx:if="{{loading}}">
<t-loading
theme="circular"
size="80rpx"
@@ -55,6 +57,7 @@
<view class="page-bottom">
<question-options
id="question-options"
+ isNight="{{isNight}}"
submitStatus="{{submitStatus}}"
answerType="{{answerType}}"
countdownTime="{{countdownTime}}"
@@ -65,9 +68,11 @@
subjectiveNum="{{subjectiveNum}}"
subjectiveGrade="{{subjectiveGrade}}"
correctNum="{{correctNum}}"
+ mockSumTime="{{mock.sumTime}}"
bind:setCollect="setCollect"
bind:submitPaper="submitPaper"
bind:restart="restart"
bind:goQuestion="goQuestion"
+ bind:changeBGColor="changeBGColor"
></question-options>
</view>
--
Gitblit v1.9.1