From 986d4798a9dad75b6ae617e52ea2918dfacd3708 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 22 三月 2024 11:19:34 +0800
Subject: [PATCH] 图书详情、答题器bug修改

---
 packageBookService/pages/bookServices/examination/questionSchedule/index.wxml |   36 ++++++++++++++++++++++++++++++++----
 1 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/packageBookService/pages/bookServices/examination/questionSchedule/index.wxml b/packageBookService/pages/bookServices/examination/questionSchedule/index.wxml
index ac5ebbf..b95c893 100644
--- a/packageBookService/pages/bookServices/examination/questionSchedule/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionSchedule/index.wxml
@@ -1,12 +1,40 @@
 <!--pages/bookServices/examination/questionSchedule/questionSchedule.wxml-->
-<view class="schedule" id="schedule" style="background-color:{{isNight ? '#000' : '#fff'}}">
+<view
+  wx:if="{{((answerType == 'option' || answerType == 'mock') && !submitStatus) || answerType == 'collectQuestion' || answerType =='errorQuestion'}}"
+  class="schedule"
+  id="schedule"
+  style="background-color:{{isNight ? '#000' : '#fff'}}"
+>
   <view class="schedule-top">
-    <view class="question-schedule" style="color: {{isNight ? '#fff' : '#000'}};">绛旈杩涘害<text class="parimary-color question-num">{{ready}}</text>
+    <!-- 绛旈杩涘害 -->
+    <view
+      class="question-schedule"
+      style="color: {{isNight ? '#fff' : '#000'}};"
+      >{{(answerType == 'option' || answerType == 'mock') ? '绛旈杩涘害' :
+      answerType == 'collectQuestion' ? '鏀惰棌鏁伴噺' : '閿欓鏁伴噺' }}<text
+        class="parimary-color question-num"
+        >{{ready}}</text
+      >
       <text>/{{questionList.length}}</text>
     </view>
-    <view class="remainder" wx:if="{{!submitStatus && (answerType == 'option' || answerType == 'mock')}}" style="color:  {{isNight ? '#fff' : '#000'}};">鍓╀綑鏃堕棿 <text class="parimary-color">{{showTime}}</text></view>
+    <view
+      class="remainder"
+      wx:if="{{!submitStatus && (answerType == 'option' || answerType == 'mock')}}"
+      style="color:  {{isNight ? '#fff' : '#000'}};"
+      >鍓╀綑鏃堕棿 <text class="parimary-color">{{showTime}}</text></view
+    >
   </view>
+  <!-- 杩涘害鏉� -->
   <view class="schedule-progress">
     <t-progress percentage="{{percentage}}" color="#ff6c00" label="" />
   </view>
-</view>
\ No newline at end of file
+</view>
+
+<!--  缁冧範銆佺粍鍗� 鎻愪氦鍚� -->
+<view wx:else class="schedule submit-message">
+  <view>
+    瀹㈣棰樺緱鍒嗭細<text class="parimary-color">{{subjectiveNum}}鍒�</text> /
+    {{subjectiveGrade}}鍒�
+  </view>
+  <view> {{ready}} /{{questionList.length}} </view>
+</view>

--
Gitblit v1.9.1