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/questionSchedule/index.wxml | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pages/bookServices/examination/questionSchedule/index.wxml b/pages/bookServices/examination/questionSchedule/index.wxml index 59cd07d..c7cad08 100644 --- a/pages/bookServices/examination/questionSchedule/index.wxml +++ b/pages/bookServices/examination/questionSchedule/index.wxml @@ -1,11 +1,17 @@ <!--pages/bookServices/examination/questionSchedule/questionSchedule.wxml--> <view class="schedule"> <view class="schedule-top"> - <view class="question-schedule">绛旈杩涘害<text class="parimary-color question-num">1</text> <text>/18</text></view> - <view class="remainder">鍓╀綑鏃堕棿 <text class="parimary-color">{{showTime}}</text></view> + <view class="question-schedule" + >绛旈杩涘害<text class="parimary-color question-num">{{ready}}</text> + <text>/{{questionList.length}}</text></view + > + <view + class="remainder" + wx:if="{{!submitStatus && (answerType == 'option' || answerType == 'mock')}}" + >鍓╀綑鏃堕棿 <text class="parimary-color">{{showTime}}</text></view + > </view> <view class="schedule-progress"> - <t-progress percentage="80" color="#ff6c00" label="" /> + <t-progress percentage="{{percentage}}" color="#ff6c00" label="" /> </view> - -</view> \ No newline at end of file +</view> -- Gitblit v1.9.1