From cd98c69ff835643f518337ee9ab532885c647efb Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 15 三月 2024 18:48:39 +0800
Subject: [PATCH] 合并代码
---
pages/bookServices/examination/examination.wxml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/pages/bookServices/examination/examination.wxml b/pages/bookServices/examination/examination.wxml
index 25d54f3..4c597a9 100644
--- a/pages/bookServices/examination/examination.wxml
+++ b/pages/bookServices/examination/examination.wxml
@@ -12,13 +12,62 @@
</view>
<view class="navbar-title">{{answerTitle}}</view>
</view>
+<!--
+<view class="lodaing-box" wx:if="{{loaidng}}">
+ <t-loading
+ theme="circular"
+ size="80rpx"
+ class="wrapper"
+ loading="{{loading}}"
+ />
+</view> -->
+
<view class="page-content">
- <question-schedule></question-schedule>
- <question-list questionList="{{questionDataList}}"></question-list>
+ <question-schedule
+ wx:if="{{!loading}}"
+ id="countDownRef"
+ answerType="{{answerType}}"
+ countdownTime="{{countdownTime}}"
+ currentIndex="{{currentIndex}}"
+ questionList="{{questionDataList}}"
+ submitStatus="{{submitStatus}}"
+ ></question-schedule>
+ <question-list
+ wx:if="{{!loading}}"
+ currentIndex="{{currentIndex}}"
+ questionList="{{questionDataList}}"
+ submitStatus="{{submitStatus}}"
+ bind:onChangeRadio="onChangeRadio"
+ bind:onChangeInput="onChangeInput"
+ bind:changeSwiper="changeSwiper"
+ ></question-list>
+ <view class="lodaing-box">
+ <t-loading
+ theme="circular"
+ size="80rpx"
+ class="wrapper"
+ loading="{{loading}}"
+ /></view>
</view>
<!-- 搴曢儴鍖哄煙-->
<view class="page-bottom">
- <question-options></question-options>
+ <question-options
+ id="question-options"
+ submitStatus="{{submitStatus}}"
+ answerType="{{answerType}}"
+ countdownTime="{{countdownTime}}"
+ currentIndex="{{currentIndex}}"
+ questionDataList="{{questionDataList}}"
+ cardList="{{cardList}}"
+ subjectiveTotal="{{subjectiveTotal}}"
+ subjectiveNum="{{subjectiveNum}}"
+ subjectiveGrade="{{subjectiveGrade}}"
+ correctNum="{{correctNum}}"
+ bind:setCollect="setCollect"
+ bind:submitPaper="submitPaper"
+ bind:restart="restart"
+ bind:goQuestion="goQuestion"
+ ></question-options>
</view>
--
Gitblit v1.9.1