From c99f9976a5ef9d8974105feb8fc0580a10adf98c Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期一, 23 十二月 2024 14:58:49 +0800
Subject: [PATCH] 111
---
packageBookService/pages/bookServices/examination/questionOptions/index.wxml | 103 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 71 insertions(+), 32 deletions(-)
diff --git a/packageBookService/pages/bookServices/examination/questionOptions/index.wxml b/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
index 69c72da..af4c963 100644
--- a/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
@@ -1,17 +1,17 @@
<!--pages/bookServices/examination/questionOptions/index.wxml-->
<view
class="page-bottom"
- style="color: {{isNight ? '#fff' : '#000'}}; background-color:{{isNight ? '#000' : '#fff'}}"
+ style="color: {{isNight ? '#fff' : '#000'}}; background-color:{{isNight ? '#202020' : '#fff'}}"
>
<view
class="li-option"
bind:tap="setCollect"
style="color: {{isNight ? '#fff' : '#000'}};"
+ wx:if="{{answerType !== 'interaction'}}"
>
- <t-image
- src="{{ questionDataList[currentIndex].isCollect ? '/static/images/bookService/detail/collecting.png' : '/static/images/bookService/examination/collect.png'}}"
- >
- </t-image>
+ <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'}}"
+ />
鏀惰棌
</view>
<view
@@ -19,9 +19,9 @@
bind:tap="handlePopup"
style="color: {{isNight ? '#fff' : '#000'}};"
>
- <t-image
- src="/static/images/bookService/examination/questionCard.png"
- ></t-image>
+ <image
+ src="{{isNight ? '/static/images/bookService/examination/datika-w.png' : '/static/images/bookService/examination/questionCard.png'}}"
+ />
绛旈鍗�
</view>
<view
@@ -29,16 +29,20 @@
bind:tap="setUpBtn"
style="color: {{isNight ? '#fff' : '#000'}};"
>
- <t-image src="/static/images/bookService/examination/setting.png"></t-image>
+ <image
+ src="{{isNight ? '/static/images/bookService/examination/setting-w.png' : '/static/images/bookService/examination/setting.png'}}"
+ />
璁剧疆
</view>
<view
class="li-option"
bind:tap="resterBtn"
- wx:if="{{answerType == 'option' || (answerType == 'mock' && !submitStatus)}}"
+ wx:if="{{answerType == 'option' || (answerType == 'mock' && !submitStatus) || (answerType == 'interaction' && !joinGroup)}}"
style="color: {{isNight ? '#fff' : '#000'}};"
>
- <t-image src="/static/images/bookService/examination/reset.png"></t-image>
+ <image
+ src="{{isNight ? '/static/images/bookService/examination/chongzuo-w.png' : '/static/images/bookService/examination/reset.png'}}"
+ />
閲嶅仛
</view>
<view class="bottom-submit">
@@ -47,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>
@@ -64,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>姝ｇ‘</text>
+ </view>
</view>
- <view class="question-card-list">
- <view wx:for="{{cardList}}" class="card-box">
+ <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>
@@ -88,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>
@@ -112,10 +143,20 @@
<view class="brightness">
<text>A-</text>
<view class="brightness-slider">
- <t-slider
+ <!-- <t-slider
value="{{sliderValue}}"
theme="capsule"
- step="{{10}}"
+ min="{{24}}"
+ max="{{100}}"
+ step="{{7}}"
+ bind:change="onChangeSlider"
+ /> -->
+ <slider
+ value="{{sliderValue}}"
+ min="{{28}}"
+ max="{{48}}"
+ step="{{7}}"
+ activeColor="#ff6c00"
bind:change="onChangeSlider"
/>
</view>
@@ -132,11 +173,11 @@
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">
- <t-image
- src="{{ radioItem == 'daytime' ? '/static/images/bookService/examination/rijian.png' : '/static/images/bookService/detail/notest.png'}}"
- ></t-image>
+ <image
+ src="{{ radioItem == 'daytime' ? '/static/images/bookService/examination/rijian-click.png' : '/static/images/bookService/examination/rijian.png'}}"
+ />
<text style="color: {{radioItem == 'daytime' ? '#fff':''}};"
>鏃ラ棿妯″紡</text
>
@@ -144,11 +185,11 @@
</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">
- <t-image
- src="{{ radioItem == 'night' ? '/static/images/bookService/detail/practice-icon.png' : '/static/images/bookService/examination/yejian.png'}}"
- ></t-image>
+ <image
+ src="{{ radioItem == 'night' ? '/static/images/bookService/examination/yejian-click.png' : '/static/images/bookService/examination/yejian.png'}}"
+ />
<text style="color: {{radioItem == 'night' ? '#fff':''}};"
>澶滈棿妯″紡</text
>
@@ -165,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