From ecabd20b3dfbd956dad14ffb6ba3dc2efcfdd7c1 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期一, 25 三月 2024 16:23:32 +0800
Subject: [PATCH] 微信支付

---
 packageBookService/pages/bookServices/examination/questionList/index.wxml |  112 ++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 93 insertions(+), 19 deletions(-)

diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxml b/packageBookService/pages/bookServices/examination/questionList/index.wxml
index 2314bd1..73af0ce 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxml
@@ -1,15 +1,27 @@
 <!--pages/bookServices/examination/questionList/index.wxml-->
-<view class="question-list">
+<view
+  class="question-list"
+  style="background-color:{{isNight ? '#222' : '#fff'}}"
+>
   <!-- 棰樺瀷title -->
-  <view class="question-title" wx:if="{{questionList[showIndex].type}}">
+  <view
+    class="question-title"
+    wx:if="{{questionList[showIndex].type}}"
+    style="background-color:{{isNight ? '#222' : '#fff'}}"
+  >
     <text class="title-name">{{questionList[showIndex].type}}</text
-    ><text class="title-score">(姣忛{{questionList[showIndex].grade}}鍒�)</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="{{item.id}}">
+    <swiper-item wx:for="{{questionList}}" wx:key="{{id}}">
       <!-- 棰樺共 -->
-      <view class="question-stem title-score">
+      <view
+        class="question-stem title-score"
+        style="color: {{isNight ? '#fff' : '#000'}};"
+      >
         <!-- 棰樺彿 -->
         <text>{{item.number}}.</text>
         <!-- 浠呮枃瀛� -->
@@ -27,7 +39,7 @@
           class="title-TxtAndImage"
         >
           <text>{{item.stem.stemTxt}}</text>
-          <t-image src="{{item.stem.stemImage}}"></t-image>
+          <t-image src="{{item.stem.stemImage}}" />
         </view>
         <!-- 瀵屾枃鏈� -->
         <view
@@ -87,7 +99,7 @@
               borderless
             >
               <view
-                class="radio-item {{item.answer == contentItem.value && item.answer == item.userAnswer  ? 'radio-correct' : item.userAnswer == contentItem.value && item.userAnswer != item.answer ?'radio-error' :''}}"
+                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'}}"
@@ -96,7 +108,7 @@
                 <!-- 浠呭浘鐗� -->
                 <view wx:if="{{item.optionStyle == 'Image'}}" class="fl-center">
                   <text>{{contentItem.value}}銆�</text>
-                  <t-image src="{{contentItem.img}}"></t-image>
+                  <t-image src="{{contentItem.img}}" />
                 </view>
                 <!-- 鏂囧瓧鍔犲浘鐗� -->
                 <view
@@ -105,7 +117,7 @@
                 >
                   <text>{{contentItem.value}}銆�</text>
                   <text>{{contentItem.txt}}</text>
-                  <t-image src="{{contentItem.img}}"></t-image>
+                  <t-image src="{{contentItem.img}}" />
                 </view>
                 <!-- 瀵屾枃鏈� -->
                 <view wx:if="{{item.optionStyle == 'RichText'}}">
@@ -113,11 +125,11 @@
                   <rich-text nodes="{{contentItem.txt}}"></rich-text>
                 </view>
                 <text
-                  wx:if="{{item.answer == contentItem.value && item.answer == item.userAnswer}}"
+                  wx:if="{{submitStatus && (item.answer == contentItem.value && item.answer == item.userAnswer)}}"
                   >瀵�</text
                 >
                 <text
-                  wx:if="{{item.userAnswer == contentItem.value && item.userAnswer != item.answer}}"
+                  wx:if="{{ submitStatus && (item.userAnswer == contentItem.value && item.userAnswer != item.answer)}}"
                   >閿�</text
                 >
               </view>
@@ -150,7 +162,7 @@
               <!-- 浠呭浘鐗� -->
               <view wx:if="{{item.optionStyle == 'Image'}}" class="fl-center">
                 <text>{{contentItem.value}}銆�</text>
-                <t-image src="{{contentItem.img}}"></t-image>
+                <t-image src="{{contentItem.img}}" />
               </view>
               <!-- 鏂囧瓧鍔犲浘鐗� -->
               <view
@@ -159,7 +171,7 @@
               >
                 <text>{{contentItem.value}}銆�</text>
                 <text>{{contentItem.txt}}</text>
-                <t-image src="{{contentItem.img}}"></t-image>
+                <t-image src="{{contentItem.img}}" />
               </view>
               <!-- 瀵屾枃鏈� -->
               <view wx:if="{{item.optionStyle == 'RichText'}}">
@@ -187,30 +199,92 @@
           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">
+          <view class="answer-correct answer-center">
             <text class="analysis-title-box">姝g‘绛旀锛�</text>
             <rich-text
               nodes="{{item.answer}}"
               style="font-size: 40rpx"
             ></rich-text>
           </view>
-          <view class="answer-error">
+          <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}}">
+        <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>

--
Gitblit v1.9.1