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/questionList/index.wxml |  237 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 206 insertions(+), 31 deletions(-)

diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxml b/packageBookService/pages/bookServices/examination/questionList/index.wxml
index 66a3bbf..08c85f6 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxml
@@ -1,35 +1,75 @@
 <!--pages/bookServices/examination/questionList/index.wxml-->
-<view class="question-list" style="background-color:{{isNight ? '#000' : '#fff'}}">
+<view
+  class="question-list"
+  style="background-color:{{isNight ? '#000' : '#fff'}}"
+>
   <!-- 棰樺瀷title -->
-  <view class="question-title" wx:if="{{questionList[showIndex].type}}" style="background-color:{{isNight ? '#000' : '#fff'}}">
-    <text class="title-name">{{questionList[showIndex].type}}</text><text class="title-score" style="color: {{isNight ? '#fff' : '#000'}};">(姣忛{{questionList[showIndex].score}}鍒�)</text>
+  <view
+    class="question-title"
+    wx:if="{{questionList[showIndex].type}}"
+    style="background-color:{{isNight ? '#000' : '#fff'}}"
+  >
+    <text class="title-name">{{questionList[showIndex].type}}</text
+    ><text class="title-score" style="color: {{isNight ? '#fff' : '#000'}};"
+      >(姣忛{{questionList[showIndex].score}}鍒�)</text
+    >
   </view>
   <!-- 棰樼洰鍒楄〃 -->
   <swiper class="swiper" bind:change="changeSwiper" current="{{currentIndex}}">
     <swiper-item wx:for="{{questionList}}" wx:key="{{id}}">
       <!-- 棰樺共 -->
-      <view class="question-stem title-score" style="color: {{isNight ? '#fff' : '#000'}};">
+      <view
+        class="question-stem title-score"
+        style="color: {{isNight ? '#fff' : '#000'}};"
+      >
         <!-- 棰樺彿 -->
         <text>{{item.number}}.</text>
         <!-- 浠呮枃瀛� -->
-        <view wx:if="{{item.stemStyle == 'Txt' && item.questionType != 'completion'}}">{{item.stem.stemTxt}}</view>
+        <view
+          wx:if="{{item.stemStyle == 'Txt' && item.questionType != 'completion'}}"
+          >{{item.stem.stemTxt}}</view
+        >
         <!-- 浠呭浘鐗� -->
         <view wx:elif="{{item.stemStyle == 'Image'}}">
           <t-image src="{{item.stem.stemImage}}" />
         </view>
         <!-- 鍥剧墖鍔犳枃瀛� -->
-        <view wx:elif="{{item.stemStyle == 'TxtAndImage'}}" class="title-TxtAndImage">
+        <view
+          wx:elif="{{item.stemStyle == 'TxtAndImage'}}"
+          class="title-TxtAndImage"
+        >
           <text>{{item.stem.stemTxt}}</text>
           <t-image src="{{item.stem.stemImage}}"></t-image>
         </view>
         <!-- 瀵屾枃鏈� -->
-        <view wx:elif="{{item.stemStyle == 'RichText'}} " class="title-RichText">
+        <view
+          wx:elif="{{item.stemStyle == 'RichText'}} "
+          class="title-RichText"
+        >
           <rich-text nodes="{{item.stem.stemTxt}}"></rich-text>
         </view>
         <!-- 濉┖棰� -->
         <view wx:if="{{item.questionType == 'completion'}}">
-          <view class="completion-box" wx:for="{{item.stem}}" wx:for-item="inputItem" wx:for-index="inputIndex" wx:key="inputIndex">
-            <t-input disabled="{{item.isComplete}}" bind:change="onChangeInput" data-value="{{item.option}}" data-id="{{item.id}}" data-index="{{inputItem.num}}" class="title-input" style="{{inputstyle}}" placeholder-style="{{placeholderstyle}}" wx:if="{{inputItem.data == 'input'}}" placeholder="璇疯緭鍏ユ枃瀛�" value="{{item.userAnswer[inputItem.num]}}"></t-input>
+          <view
+            class="completion-box"
+            wx:for="{{item.stem}}"
+            wx:for-item="inputItem"
+            wx:for-index="inputIndex"
+            wx:key="inputIndex"
+          >
+            <t-input
+              disabled="{{item.isComplete}}"
+              bind:change="onChangeInput"
+              data-value="{{item.option}}"
+              data-id="{{item.id}}"
+              data-index="{{inputItem.num}}"
+              class="title-input"
+              style="{{inputstyle}}"
+              placeholder-style="{{placeholderstyle}}"
+              wx:if="{{inputItem.data == 'input'}}"
+              placeholder="璇疯緭鍏ユ枃瀛�"
+              value="{{item.userAnswer[inputItem.num]}}"
+            ></t-input>
             <text wx:else>{{inputItem}}</text>
           </view>
         </view>
@@ -37,19 +77,44 @@
       <!-- 绛旈鍖哄煙 -->
       <view class="question-answer">
         <!-- 鍗曢�夐 -->
-        <t-radio-group wx:if="{{item.questionType == 'singleChoice' || item.questionType == 'judge'}}" defaultValue="{{item.userAnswer}}" disabled="{{item.isComplete}}" bind:change="onChangeRadio" class="radio-group" data-value="{{item.option}}" data-id="{{item.id}}">
-          <view wx:for="{{item.option}}" wx:for-item="contentItem" wx:for-index="contentIndex" wx:key="contentIndex">
-            <t-radio value="{{contentItem.value}}" icon="none" placement="right" borderless>
-              <view class="radio-item {{item.userAnswer == contentItem.value ? 'radio-active' : ''}} {{(answerType == 'collectQuestion' || answerType == 'errorQuestion') && (item.answer == contentItem.value && item.answer == item.userAnswer  ? 'radio-correct' : item.userAnswer == contentItem.value && item.userAnswer != item.answer ?'radio-error' :'')}}">
+        <t-radio-group
+          wx:if="{{item.questionType == 'singleChoice' || item.questionType == 'judge'}}"
+          defaultValue="{{item.userAnswer}}"
+          disabled="{{item.isComplete}}"
+          bind:change="onChangeRadio"
+          class="radio-group"
+          data-value="{{item.option}}"
+          data-id="{{item.id}}"
+        >
+          <view
+            wx:for="{{item.option}}"
+            wx:for-item="contentItem"
+            wx:for-index="contentIndex"
+            wx:key="contentIndex"
+          >
+            <t-radio
+              value="{{contentItem.value}}"
+              icon="none"
+              placement="right"
+              borderless
+            >
+              <view
+                class="radio-item {{(answerType == 'option' || answerType == 'mock' ) && !submitStatus && item.userAnswer == contentItem.value ? 'radio-active' : ''}} {{ (item.answer == contentItem.value && item.answer == item.userAnswer &&  submitStatus) ? 'radio-correct' :  (item.userAnswer == contentItem.value && item.userAnswer != item.answer && submitStatus) ?'radio-error' :'' }}"
+              >
                 <!-- 浠呮枃瀛� -->
-                <text wx:if="{{item.optionStyle == 'Txt'}}">{{contentItem.value}}銆亄{contentItem.txt}}</text>
+                <text wx:if="{{item.optionStyle == 'Txt'}}"
+                  >{{contentItem.value}}銆亄{contentItem.txt}}</text
+                >
                 <!-- 浠呭浘鐗� -->
                 <view wx:if="{{item.optionStyle == 'Image'}}" class="fl-center">
                   <text>{{contentItem.value}}銆�</text>
                   <t-image src="{{contentItem.img}}"></t-image>
                 </view>
                 <!-- 鏂囧瓧鍔犲浘鐗� -->
-                <view wx:if="{{item.optionStyle == 'TxtAndImage'}}" class="fl-center">
+                <view
+                  wx:if="{{item.optionStyle == 'TxtAndImage'}}"
+                  class="fl-center"
+                >
                   <text>{{contentItem.value}}銆�</text>
                   <text>{{contentItem.txt}}</text>
                   <t-image src="{{contentItem.img}}"></t-image>
@@ -59,25 +124,51 @@
                   <text>{{contentItem.value}}銆�</text>
                   <rich-text nodes="{{contentItem.txt}}"></rich-text>
                 </view>
-                <text wx:if="{{(answerType == 'collectQuestion' || answerType == 'errorQuestion') && (item.answer == contentItem.value && item.answer == item.userAnswer)}}">瀵�</text>
-                <text wx:if="{{(answerType == 'collectQuestion' || answerType == 'errorQuestion') && (item.userAnswer == contentItem.value && item.userAnswer != item.answer)}}">閿�</text>
+                <text
+                  wx:if="{{submitStatus && (item.answer == contentItem.value && item.answer == item.userAnswer)}}"
+                  >瀵�</text
+                >
+                <text
+                  wx:if="{{ submitStatus && (item.userAnswer == contentItem.value && item.userAnswer != item.answer)}}"
+                  >閿�</text
+                >
               </view>
             </t-radio>
           </view>
         </t-radio-group>
         <!-- 澶氶�夐 -->
-        <t-checkbox-group disabled="{{item.isComplete}}" class="checkbox-group" wx:elif="{{item.questionType == 'multipleChoice'}}" t-class="box" borderless bind:change="onChangeRadio" data-value="{{item.option}}" data-id="{{item.id}}" defaultValue="{{item.userAnswer}}">
-          <view wx:for="{{item.option}}" wx:for-item="contentItem" wx:for-index="contentIndex" wx:key="contentIndex">
+        <t-checkbox-group
+          disabled="{{item.isComplete}}"
+          class="checkbox-group"
+          wx:elif="{{item.questionType == 'multipleChoice'}}"
+          t-class="box"
+          borderless
+          bind:change="onChangeRadio"
+          data-value="{{item.option}}"
+          data-id="{{item.id}}"
+          defaultValue="{{item.userAnswer}}"
+        >
+          <view
+            wx:for="{{item.option}}"
+            wx:for-item="contentItem"
+            wx:for-index="contentIndex"
+            wx:key="contentIndex"
+          >
             <t-checkbox block="{{false}}" value="{{contentItem.value}}">
               <!-- 浠呮枃瀛� -->
-              <text wx:if="{{item.optionStyle == 'Txt'}}">{{contentItem.value}}銆亄{contentItem.txt}}</text>
+              <text wx:if="{{item.optionStyle == 'Txt'}}"
+                >{{contentItem.value}}銆亄{contentItem.txt}}</text
+              >
               <!-- 浠呭浘鐗� -->
               <view wx:if="{{item.optionStyle == 'Image'}}" class="fl-center">
                 <text>{{contentItem.value}}銆�</text>
                 <t-image src="{{contentItem.img}}"></t-image>
               </view>
               <!-- 鏂囧瓧鍔犲浘鐗� -->
-              <view wx:if="{{item.optionStyle == 'TxtAndImage'}}" class="fl-center">
+              <view
+                wx:if="{{item.optionStyle == 'TxtAndImage'}}"
+                class="fl-center"
+              >
                 <text>{{contentItem.value}}銆�</text>
                 <text>{{contentItem.txt}}</text>
                 <t-image src="{{contentItem.img}}"></t-image>
@@ -91,26 +182,110 @@
           </view>
         </t-checkbox-group>
         <!-- 绠�绛� 缈昏瘧 -->
-        <t-textarea disabled="{{item.isComplete}}" value="{{item.userAnswer}}" bind:change="onChangeRadio" data-value="{{item.option}}" data-id="{{item.id}}" class="option-textarea" wx:elif="{{item.questionType == 'shortAnswer'}}" t-class="external-class" placeholder="璇疯緭鍏ユ枃瀛�" bordered maxlength="500" disableDefaultPadding="{{true}}" indicator style="{{style}}" />
+        <t-textarea
+          disabled="{{item.isComplete}}"
+          value="{{item.userAnswer}}"
+          bind:change="onChangeRadio"
+          data-value="{{item.option}}"
+          data-id="{{item.id}}"
+          class="option-textarea"
+          wx:elif="{{item.questionType == 'shortAnswer'}}"
+          t-class="external-class"
+          placeholder="璇疯緭鍏ユ枃瀛�"
+          bordered
+          maxlength="500"
+          disableDefaultPadding="{{true}}"
+          indicator
+          style="{{style}}"
+        />
       </view>
-      <!-- 瑙f瀽 -->
-      <view class="analysis" wx:if="{{item.isComplete}}">
+      <!-- 鍗曢�夈�佸閫夎В鏋� -->
+      <view
+        class="analysis"
+        wx:if="{{item.isComplete && (item.questionType == 'singleChoice' || item.questionType == 'judge' || item.questionType == 'multipleChoice')}}"
+      >
         <view class="analysis-answer">
           <view class="answer-correct answer-center">
             <text class="analysis-title-box">姝g‘绛旀锛�</text>
-            <rich-text nodes="{{item.answer}}" style="font-size: 40rpx"></rich-text>
+            <rich-text
+              nodes="{{item.answer}}"
+              style="font-size: 40rpx"
+            ></rich-text>
           </view>
-          <view class="answer-center marginL {{item.isRight ? 'answer-correct' : 'answer-error'}}" wx:if="{{item.questionType !== 'shortAnswer'}}">
-            <text class="analysis-title-box">鎮ㄧ殑绛旀锛�</text><text class="answer-text">{{item.userAnswer}}</text>
+          <view
+            class="answer-center marginL {{item.isRight ? 'answer-correct' : 'answer-error'}}"
+            wx:if="{{item.questionType !== 'shortAnswer'}}"
+          >
+            <text class="analysis-title-box">鎮ㄧ殑绛旀锛�</text
+            ><text class="answer-text">{{item.userAnswer}}</text>
           </view>
         </view>
-        <view class="analysis-text" wx:if="{{item.analysisCon}}" style="color: {{isNight ? '#fff' : '#000'}};">
-          绛旀瑙f瀽锛�<rich-text nodes="{{item.analysisCon}}" class="analysis-content"></rich-text>
+        <view
+          class="analysis-text"
+          wx:if="{{item.analysisCon}}"
+          style="color: {{isNight ? '#fff' : '#000'}};"
+        >
+          绛旀瑙f瀽锛�<rich-text
+            nodes="{{item.analysisCon}}"
+            class="analysis-content"
+          ></rich-text>
+        </view>
+      </view>
+      <!-- 濉┖銆佺畝绛旇В鏋� -->
+      <view
+        class="analysis"
+        wx:if="{{(item.questionType == 'shortAnswer' || item.questionType == 'completion') && item.isComplete}}"
+      >
+        <view
+          style="display: {{item.questionType == 'completion' ? 'flex' : 'block'}}"
+        >
+          <text
+            wx:if="{{item.questionType == 'completion'}}"
+            class="short-answer-fz answer-correct"
+            >姝g‘绛旀:</text
+          >
+          <text
+            wx:if="{{item.questionType == 'shortAnswer'}}"
+            class="short-answer-fz"
+          >
+            鍙傝�冪瓟妗堬細
+          </text>
+          <rich-text
+            wx:if="{{item.questionType == 'shortAnswer'}}"
+            nodes="{{item.answer}}"
+            style="font-size: 28rpx; color:{{item.questionType == 'completion' ? '#1FBC1F' : '#000'}}"
+          ></rich-text>
+          <view
+            wx:if="{{item.questionType == 'completion'}}"
+            class="short-answer-fz answer-correct"
+            >{{item.answer}}</view
+          >
+        </view>
+        <view
+          wx:if="{{item.questionType == 'completion'}}"
+          class="short-answer-mr"
+          style="display: {{item.questionType == 'completion' ? 'flex' : 'block'}}"
+        >
+          <text
+            class="short-answer-fz {{item.isRight ? 'answer-correct' : 'answer-error'}}"
+            >鎮ㄧ殑绛旀锛�</text
+          >
+          <view
+            class="short-answer-fz {{item.isRight ? 'answer-correct' : 'answer-error'}}"
+            >{{item.userAnswer}}</view
+          >
+        </view>
+        <view class="short-answer-mr">
+          <text class="short-answer-fz">绛旀瑙f瀽锛�</text>
+          <rich-text
+            nodes="{{item.analysisCon}}"
+            style="font-size: 28rpx"
+          ></rich-text>
         </view>
       </view>
     </swiper-item>
-    <swiper-item>
+    <swiper-item wx:if="{{answerType !== 'collectQuestion'}}">
       <text>娌℃湁鏇村浜嗐�傘�傘��</text>
     </swiper-item>
   </swiper>
-</view>
\ No newline at end of file
+</view>

--
Gitblit v1.9.1