From 6df96b3e7a7da1985ee875e84711e9f15c5fbff0 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 24 十二月 2024 18:25:02 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageBookService/pages/psychologyAnswer/questionOptions/index.wxml | 55 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/packageBookService/pages/psychologyAnswer/questionOptions/index.wxml b/packageBookService/pages/psychologyAnswer/questionOptions/index.wxml
index 5706ba2..5098630 100644
--- a/packageBookService/pages/psychologyAnswer/questionOptions/index.wxml
+++ b/packageBookService/pages/psychologyAnswer/questionOptions/index.wxml
@@ -23,13 +23,23 @@
/>
璁剧疆
</view>
+ <view
+ class="li-option"
+ bind:tap="resterBtn"
+ style="color: {{isNight ? '#fff' : '#000'}};"
+ >
+ <image
+ src="{{isNight ? '/static/images/bookService/examination/chongzuo-w.png' : '/static/images/bookService/examination/reset.png'}}"
+ />
+ 閲嶅仛
+ </view>
<view class="bottom-submit">
<t-button
theme="primary"
size="large"
style="{{btnStyle}}"
bind:tap="submitBtn"
- >{{!submitStatus ? '鎻愪氦' : '閫�鍑�'}}</t-button
+ >{{!submitStatus ? '鎻愪氦' : '鏌ョ湅缁撴灉'}}</t-button
>
</view>
</view>
@@ -64,7 +74,7 @@
wx:for-index="cindex"
wx:key="cindex"
style="border: {{showId == citem.id ? '1px solid #ff6c00' : ''}}"
- class="question-box {{ citem.isUserAnswer ? 'answered' : 'un-answered' }}"
+ class="question-box {{ citem.userAnswer ? 'answered' : 'un-answered' }}"
>
{{cindex+1}}
</view>
@@ -151,34 +161,37 @@
class="test-report"
visible="{{testReportState}}"
confirm-btn="{{null}}"
+ close-btn
title="娴嬭瘯鎶ュ憡"
bind:close="closeTestReportDialog"
>
<view slot="content" class="test-report">
<view class="report-content-top">
- <view class="report-li">
- <view class="report-li-left">棰樼洰鎬绘暟锛�</view>
- <view class="report-li-right">{{questionDataList.length}}閬�</view>
- </view>
- <view
- wx:for="{{scoreData}}"
- wx:for-item="ditem"
- wx:for-index="dindex"
- wx:key="dindex"
- >
+ <scroll-view scroll-y style="height: 30vh; overflow-y: auto">
<view class="report-li">
- <view class="report-li-left">{{ditem.name}}:</view>
- <view class="report-li-right"
- ><text class="score-color">{{ditem.score}}</text> 鍒�</view
+ <view class="report-li-left" style="white-space: nowrap"
+ >棰樼洰鎬绘暟锛�</view
>
+ <view class="report-li-right">{{questionDataList.length}}閬�</view>
</view>
- <view class="report-li">
- <view class="report-li-left" style="white-space: nowrap">缁撴灉:</view>
- <view class="report-li-right"
- ><text class="score-color">{{ditem.dispatch}}</text></view
- >
+ <view
+ wx:for="{{scoreData}}"
+ wx:for-item="ditem"
+ wx:for-index="dindex"
+ wx:key="dindex"
+ >
+ <view class="report-li">
+ <view class="report-li-left">{{ditem.name}}:</view>
+ <view class="report-li-right"><text>{{ditem.score}}</text> 鍒�</view>
+ </view>
+ <view class="report-li" wx:if="{{ditem.dispatch}}">
+ <view class="report-li-left" style="white-space: nowrap"
+ >缁撴灉:</view
+ >
+ <view class="report-li-right"><text>{{ditem.dispatch}}</text></view>
+ </view>
</view>
- </view>
+ </scroll-view>
</view>
</view>
</t-dialog>
--
Gitblit v1.9.1