From 20a26aa0c12c05c3f96afc163c6532c6b1b5cf8e Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 21 三月 2024 09:24:01 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageBookService/pages/bookServices/examination/questionOptions/index.wxml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/packageBookService/pages/bookServices/examination/questionOptions/index.wxml b/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
index ee23b79..7057d37 100644
--- a/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
@@ -1,19 +1,19 @@
<!--pages/bookServices/examination/questionOptions/index.wxml-->
-<view class="page-bottom">
- <view class="li-option" bind:tap="setCollect">
+<view class="page-bottom" style="color: {{isNight ? '#fff' : '#000'}}; background-color:{{isNight ? '#000' : '#fff'}}">
+ <view class="li-option" bind:tap="setCollect" style="color: {{isNight ? '#fff' : '#000'}};">
<t-image src="{{ questionDataList[currentIndex].isCollect ? '/static/images/bookService/detail/collecting.png' : '/static/images/bookService/examination/collect.png'}}">
</t-image>
鏀惰棌
</view>
- <view class="li-option" bind:tap="handlePopup">
+ <view class="li-option" bind:tap="handlePopup" style="color: {{isNight ? '#fff' : '#000'}};">
<t-image src="/static/images/bookService/examination/questionCard.png"></t-image>
绛旈鍗�
</view>
- <view class="li-option" bind:tap="setUpBtn">
+ <view class="li-option" bind:tap="setUpBtn" style="color: {{isNight ? '#fff' : '#000'}};">
<t-image src="/static/images/bookService/examination/setting.png"></t-image>
璁剧疆
</view>
- <view class="li-option" bind:tap="resterBtn" wx:if="{{answerType == 'option' || answerType == 'mock'}}">
+ <view class="li-option" bind:tap="resterBtn" wx:if="{{answerType == 'option' || (answerType == 'mock' && !submitStatus)}}" style="color: {{isNight ? '#fff' : '#000'}};">
<t-image src="/static/images/bookService/examination/reset.png"></t-image>
閲嶅仛
</view>
@@ -66,7 +66,7 @@
<view class="brightness">
<text>A-</text>
<view class="brightness-slider">
- <t-slider defaultValue="{{30}}" theme="capsule" />
+ <t-slider value="{{sliderValue}}" theme="capsule" step="{{10}}" bind:change="onChangeSlider" />
</view>
<text>A+</text>
@@ -77,7 +77,7 @@
<view class="card {{radioItem == 'daytime' ? 'card--active' : ''}}">
<t-radio value="daytime" icon="none" borderless>
<view class="radio-content" slot="content">
- <t-image src="{{ radioItem == 'daytime' ? '/static/images/bookService/detail/practice-icon.png' : '/static/images/bookService/detail/notest.png'}}"></t-image>
+ <t-image src="{{ radioItem == 'daytime' ? '/static/images/bookService/examination/rijian.png' : '/static/images/bookService/detail/notest.png'}}"></t-image>
<text style="color: {{radioItem == 'daytime' ? '#fff':''}};">鏃ラ棿妯″紡</text>
</view>
</t-radio>
@@ -85,7 +85,7 @@
<view class="card {{radioItem == 'night' ? 'card--active' : ''}}">
<t-radio value="night" icon="none" borderless>
<view class="radio-content" slot="content">
- <t-image src="{{ radioItem == 'night' ? '/static/images/bookService/detail/practice-icon.png' : '/static/images/bookService/detail/notest.png'}}"></t-image>
+ <t-image src="{{ radioItem == 'night' ? '/static/images/bookService/detail/practice-icon.png' : '/static/images/bookService/examination/yejian.png'}}"></t-image>
<text style="color: {{radioItem == 'night' ? '#fff':''}};">澶滈棿妯″紡</text>
</view>
</t-radio>
--
Gitblit v1.9.1