From 3d73fb33c46aada16a6060adcd4ea14bb33b6b2a Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 09 四月 2024 10:39:11 +0800
Subject: [PATCH] 详情页tabs样式优化，答题添加页面退出拦截，合并代码
---
packageBookService/pages/bookServices/examination/examination.wxml | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/packageBookService/pages/bookServices/examination/examination.wxml b/packageBookService/pages/bookServices/examination/examination.wxml
index 4c597a9..588d13e 100644
--- a/packageBookService/pages/bookServices/examination/examination.wxml
+++ b/packageBookService/pages/bookServices/examination/examination.wxml
@@ -1,16 +1,24 @@
<!--pages/examination/examination.wxml-->
<!--瀵艰埅鍖哄煙 -->
-<view style="width: 100%; height: {{barHeight}}px; "></view>
-<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
+<view
+ style="width: 100%; height: {{barHeight}}px;background-color: {{isNight ? '#191919' : '#fff'}} "
+></view>
+<view
+ class="nacigationBar"
+ style="width: 100%; height: {{navBarHeight}}px; background-color: {{isNight ? '#191919' : '#fff'}}"
+>
<view>
<t-icon
name="chevron-left"
size="30"
data-name="{{item}}"
bind:click="goBack"
+ color="{{isNight ? '#fff' : '#000'}}"
/>
</view>
- <view class="navbar-title">{{answerTitle}}</view>
+ <view class="navbar-title" style="color: {{isNight ? '#fff' : '#000'}};"
+ >{{answerTitle}}</view
+ >
</view>
<!--
<view class="lodaing-box" wx:if="{{loaidng}}">
@@ -22,26 +30,33 @@
/>
</view> -->
-<view class="page-content">
+<view class="page-content" style="background-color:{{isNight ? '#222' : ''}}">
<question-schedule
wx:if="{{!loading}}"
id="countDownRef"
+ isNight="{{isNight}}"
answerType="{{answerType}}"
countdownTime="{{countdownTime}}"
currentIndex="{{currentIndex}}"
questionList="{{questionDataList}}"
submitStatus="{{submitStatus}}"
+ subjectiveGrade="{{subjectiveGrade}}"
+ subjectiveNum="{{subjectiveNum}}"
></question-schedule>
<question-list
wx:if="{{!loading}}"
+ sliderValue="{{sliderValue}}"
+ isNight="{{isNight}}"
+ answerType="{{answerType}}"
currentIndex="{{currentIndex}}"
questionList="{{questionDataList}}"
submitStatus="{{submitStatus}}"
bind:onChangeRadio="onChangeRadio"
bind:onChangeInput="onChangeInput"
bind:changeSwiper="changeSwiper"
+ bind:viewParsing="viewParsing"
></question-list>
- <view class="lodaing-box">
+ <view class="lodaing-box" wx:if="{{loading}}">
<t-loading
theme="circular"
size="80rpx"
@@ -52,9 +67,10 @@
<!-- 搴曢儴鍖哄煙-->
-<view class="page-bottom">
+<view class="page-bottom" style="background-color:{{isNight ? '#202020' : ''}}">
<question-options
id="question-options"
+ isNight="{{isNight}}"
submitStatus="{{submitStatus}}"
answerType="{{answerType}}"
countdownTime="{{countdownTime}}"
@@ -65,9 +81,20 @@
subjectiveNum="{{subjectiveNum}}"
subjectiveGrade="{{subjectiveGrade}}"
correctNum="{{correctNum}}"
+ mockSumTime="{{mock.sumTime}}"
bind:setCollect="setCollect"
bind:submitPaper="submitPaper"
bind:restart="restart"
bind:goQuestion="goQuestion"
+ bind:changeBGColor="changeBGColor"
+ bind:onChangeSlider="onChangeSlider"
></question-options>
</view>
+
+<page-container
+ wx:if="{{(answerType == 'mock' || answerType == 'option') && !submitStatus}}"
+ show="{{true}}"
+ duration="{{false}}"
+ overlay="{{false}}"
+ bind:beforeleave="beforeleave"
+></page-container>
--
Gitblit v1.9.1