From 81b30e7fb0763bce403431f0c1f64d5a9e36dfb2 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期三, 20 三月 2024 15:42:13 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageBookService/pages/bookServices/examination/questionOptions/index.wxml | 108 +++++++++++++++++++++--------------------------------
1 files changed, 43 insertions(+), 65 deletions(-)
diff --git a/packageBookService/pages/bookServices/examination/questionOptions/index.wxml b/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
index 1130cc8..ee23b79 100644
--- a/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionOptions/index.wxml
@@ -1,48 +1,30 @@
<!--pages/bookServices/examination/questionOptions/index.wxml-->
<view class="page-bottom">
<view class="li-option" bind:tap="setCollect">
- <t-image
- src="{{ questionDataList[currentIndex].isCollect ? '/static/images/bookService/detail/collecting.png' : '/static/images/bookService/examination/collect.png'}}"
- >
+ <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">
- <t-image
- src="/static/images/bookService/examination/questionCard.png"
- ></t-image>
+ <t-image src="/static/images/bookService/examination/questionCard.png"></t-image>
绛旈鍗�
</view>
<view class="li-option" bind:tap="setUpBtn">
<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'}}">
<t-image src="/static/images/bookService/examination/reset.png"></t-image>
閲嶅仛
</view>
<view class="bottom-submit">
- <t-button
- theme="primary"
- size="large"
- style="{{btnStyle}}"
- bind:tap="submitBtn"
- >{{(answerType == 'option' || answerType == 'mock') ? '鎻愪氦' :
- '閫�鍑�'}}</t-button
- >
+ <t-button theme="primary" size="large" style="{{btnStyle}}" bind:tap="submitBtn">{{(answerType == 'option' || answerType == 'mock') && !submitStatus ? '鎻愪氦' :
+ '閫�鍑�'}}</t-button>
</view>
</view>
<!-- 绛旈鍗� -->
-<t-popup
- visible="{{questionCardState}}"
- bind:visible-change="onVisibleChange"
- placement="bottom"
->
+<t-popup visible="{{questionCardState}}" bind:visible-change="onVisibleChange" placement="bottom">
<view class="popup-block">
<view class="popup-header">
<view class="popup-title">绛旈鍗�</view>
@@ -65,14 +47,7 @@
<text class="title-text">{{item.catalogName}}</text>
</view>
<view class="question-list">
- <view
- bind:tap="goQuestion"
- data-id="{{citem.id}}"
- wx:for="{{item.infoList}}"
- wx:for-item="citem"
- wx:for-index="cindex"
- class="question-box {{citem.isComplete ? 'answered' : 'un-answered'}}"
- >
+ <view bind:tap="goQuestion" data-id="{{citem.id}}" wx:for="{{item.infoList}}" wx:for-item="citem" wx:for-index="cindex" class="question-box {{citem.isUserAnswer ? 'answered' : 'un-answered'}}">
{{citem.number}}
</view>
</view>
@@ -82,34 +57,47 @@
</t-popup>
<!-- 璁剧疆 -->
-<t-popup
- visible="{{setUpPopup}}"
- bind:visible-change="onSetUpChange"
- placement="bottom"
->
+<t-popup visible="{{setUpPopup}}" bind:visible-change="onSetUpChange" placement="bottom">
<view class="popup-block set-up-popup">
<view class="popup-header">
<view class="popup-title">璁剧疆</view>
</view>
<!-- 浜害 -->
- <view>
- <t-slider defaultValue="{{30}}" theme="capsule" />
+ <view class="brightness">
+ <text>A-</text>
+ <view class="brightness-slider">
+ <t-slider defaultValue="{{30}}" theme="capsule" />
+ </view>
+
+ <text>A+</text>
</view>
<!-- 妯″紡 -->
+ <view>
+ <t-radio-group class="test-radio" t-class="horizontal-box" value="{{radioItem}}" bind:change="onRadioChange" style="margin: 0px">
+ <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>
+ <text style="color: {{radioItem == 'daytime' ? '#fff':''}};">鏃ラ棿妯″紡</text>
+ </view>
+ </t-radio>
+ </view>
+ <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>
+ <text style="color: {{radioItem == 'night' ? '#fff':''}};">澶滈棿妯″紡</text>
+ </view>
+ </t-radio>
+ </view>
+ </t-radio-group>
+ </view>
</view>
</t-popup>
<!-- 娴嬭瘯鎶ュ憡 -->
-<t-dialog
- class="test-report"
- visible="{{testReportState}}"
- cancel-btn="{{null}}"
- confirm-btn="{{null}}"
- close-btn="{{true}}"
- title="娴嬭瘯鎶ュ憡"
- bind:close="closeTestReportDialog"
->
+<t-dialog class="test-report" visible="{{testReportState}}" cancel-btn="{{null}}" confirm-btn="{{null}}" close-btn="{{true}}" title="娴嬭瘯鎶ュ憡" bind:close="closeTestReportDialog">
<view slot="content" class="test-report">
<view class="report-content-top">
<view class="report-li">
@@ -122,34 +110,24 @@
</view>
<view class="report-li">
<view class="report-li-left">鍏朵腑瀹㈣棰橈細</view>
- <view class="report-li-right"
- >{{subjectiveTotal}}閬擄紝鍒嗗�納{subjectiveGrade}}鍒�</view
- >
+ <view class="report-li-right">{{subjectiveTotal}}閬擄紝鍒嗗�納{subjectiveGrade}}鍒�</view>
</view>
<view class="report-li">
<view class="report-li-left">绛斿锛�</view>
- <view class="report-li-right"
- ><text class="correct-color">{{correctNum}}</text> 閬�</view
- >
+ <view class="report-li-right"><text class="correct-color">{{correctNum}}</text> 閬�</view>
</view>
<view class="report-li">
<view class="report-li-left">绛旈敊锛�</view>
- <view class="report-li-right"
- ><text class="error-color">{{subjectiveTotal - correctNum}}</text>
- 閬�</view
- >
+ <view class="report-li-right"><text class="error-color">{{subjectiveTotal - correctNum}}</text>
+ 閬�</view>
</view>
<view class="report-li">
<view class="report-li-left">瀹㈣棰樺緱鍒嗭細</view>
- <view class="report-li-right"
- ><text class="score-color">{{subjectiveNum}}</text> 鍒�</view
- >
+ <view class="report-li-right"><text class="score-color">{{subjectiveNum}}</text> 鍒�</view>
</view>
</view>
<view class="report-content-bottom">
- <t-button theme="primary" bind:tap="viewAnswer" style="width: 560rpx"
- >鏌ョ湅绛旀涓庤В鏋�</t-button
- >
+ <t-button theme="primary" bind:tap="viewAnswer" style="width: 560rpx">鏌ョ湅绛旀涓庤В鏋�</t-button>
</view>
</view>
-</t-dialog>
+</t-dialog>
\ No newline at end of file
--
Gitblit v1.9.1