From 1fa2461678d7f93b88f5666c4898e5b6c72080f3 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 16 十二月 2024 10:21:06 +0800
Subject: [PATCH] 个人中心,班级、课程模块

---
 packageBookService/pages/bookServices/examination/questionOptions/index.wxml |   69 ++++++++++++++++++++++++----------
 1 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/packageBookService/pages/bookServices/examination/questionOptions/index.wxml b/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
index 6262100..70bf3e4 100644
--- a/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
@@ -7,6 +7,7 @@
     class="li-option"
     bind:tap="setCollect"
     style="color: {{isNight ? '#fff' : '#000'}};"
+    wx:if="{{answerType !== 'interaction'}}"
   >
     <image
       src="{{ questionDataList[currentIndex].isCollect ? '/static/images/bookService/detail/collecting.png' : isNight ? '/static/images/bookService/examination/wodeshoucang-w.png' : '/static/images/bookService/examination/collect.png'}}"
@@ -50,8 +51,8 @@
       size="large"
       style="{{btnStyle}}"
       bind:tap="submitBtn"
-      >{{(answerType == 'option' || answerType == 'mock') && !submitStatus ?
-      '鎻愪氦' : '閫�鍑�'}}</t-button
+      >{{(answerType == 'option' || answerType == 'mock' || answerType ==
+      'interaction') && !submitStatus ? '鎻愪氦' : '閫�鍑�'}}</t-button
     >
   </view>
 </view>
@@ -67,19 +68,45 @@
       <view class="popup-title">绛旈鍗�</view>
     </view>
     <view class="question-explain">
-      <view class="explain-answered">
+      <view
+        class="explain-answered"
+        wx:if="{{answerType == 'collectQuestion' || answerType == 'errorQuestion' || (answerType == 'option' && !submitStatus) || (answerType == 'mock' && !submitStatus)}}"
+      >
         <text class="answered explain-color-box"></text>
         <text>宸茬瓟</text>
       </view>
-      <view class="explain-un-answered">
+      <view
+        class="explain-un-answered"
+        wx:if="{{answerType == 'collectQuestion' || answerType == 'errorQuestion' || (answerType == 'option' && !submitStatus) || (answerType == 'mock' && !submitStatus)}}"
+      >
         <text class="un-answered explain-color-box"></text>
         <text>鏈瓟</text>
       </view>
+      <view
+        class="error-box"
+        wx:if="{{((answerType == 'option' || answerType == 'mock') && submitStatus) || answerType == 'collectQuestion' || answerType == 'errorQuestion'}}"
+      >
+        <text
+          class="explain-color-box"
+          style="background-color: #ee1818"
+        ></text>
+        <text>閿欒</text>
+      </view>
+      <view
+        class="correct-box"
+        wx:if="{{((answerType == 'option' || answerType == 'mock') && submitStatus) || answerType == 'collectQuestion' || answerType == 'errorQuestion'}}"
+      >
+        <text
+          class="explain-color-box"
+          style="background-color: #1fbc1f"
+        ></text>
+        <text>姝g‘</text>
+      </view>
     </view>
-    <view class="question-card-list">
+    <scroll-view scroll-y="{{true}}" class="question-card-list">
       <view wx:for="{{cardList}}" wx:key="index" class="card-box">
         <!-- 棰樺瀷 -->
-        <view class="question-title">
+        <view class="question-title" wx:if="{{item.infoList.length}}">
           <text class="color-box"></text>
           <text class="title-text">{{item.catalogName}}</text>
         </view>
@@ -91,13 +118,14 @@
             wx:for-item="citem"
             wx:for-index="cindex"
             wx:key="cindex"
-            class="question-box {{citem.isUserAnswer ? 'answered' : 'un-answered'}}"
+            style="border: {{showId == citem.id ? '1px solid #ff6c00' : ''}}"
+            class="question-box {{ citem.isUserAnswer ? 'answered' : 'un-answered' }} {{ ( ((answerType == 'option' || answerType == 'mock') && submitStatus || answerType == 'collectQuestion' || answerType == 'errorQuestion')  && citem.questionType !== 'shortAnswer' )  ? citem.isRight && citem.isComplete ? 'correct-box-color' : citem.isComplete && !citem.isRight ?  'error-box-color' : '' :''}} "
           >
             {{citem.number}}
           </view>
         </view>
       </view>
-    </view>
+    </scroll-view>
   </view>
 </t-popup>
 
@@ -115,21 +143,22 @@
     <view class="brightness">
       <text>A-</text>
       <view class="brightness-slider">
-        <t-slider
+        <!-- <t-slider
           value="{{sliderValue}}"
           theme="capsule"
-          min="{{14}}"
+          min="{{24}}"
           max="{{100}}"
           step="{{7}}"
           bind:change="onChangeSlider"
-        />
-        <!-- <slider
-          value="{{sliderValue}}"
-          min="{{10}}"
-          step="{{10}}"
-          activeColor="#ff6c00"
-          bind:chang="onChangeSlider"
         /> -->
+        <slider
+          value="{{sliderValue}}"
+          min="{{28}}"
+          max="{{48}}"
+          step="{{7}}"
+          activeColor="#ff6c00"
+          bind:change="onChangeSlider"
+        />
       </view>
 
       <text>A+</text>
@@ -144,7 +173,7 @@
         style="margin: 0px"
       >
         <view class="card {{radioItem == 'daytime' ? 'card--active' : ''}}">
-          <t-radio value="daytime" icon="none" borderless>
+          <t-radio value="daytime" icon="none" borderless style="height: 100%">
             <view class="radio-content" slot="content">
               <image
                 src="{{ radioItem == 'daytime' ? '/static/images/bookService/examination/rijian-click.png' : '/static/images/bookService/examination/rijian.png'}}"
@@ -156,7 +185,7 @@
           </t-radio>
         </view>
         <view class="card {{radioItem == 'night' ? 'card--active' : ''}}">
-          <t-radio value="night" icon="none" borderless>
+          <t-radio value="night" icon="none" borderless style="height: 100%">
             <view class="radio-content" slot="content">
               <image
                 src="{{ radioItem == 'night' ? '/static/images/bookService/examination/yejian-click.png' : '/static/images/bookService/examination/yejian.png'}}"
@@ -177,9 +206,7 @@
 <t-dialog
   class="test-report"
   visible="{{testReportState}}"
-  cancel-btn="{{null}}"
   confirm-btn="{{null}}"
-  close-btn="{{true}}"
   title="娴嬭瘯鎶ュ憡"
   bind:close="closeTestReportDialog"
 >

--
Gitblit v1.9.1