From 90f83bf13fd0d6b97897deadc4a9e6a204b530aa Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 26 三月 2024 10:50:11 +0800
Subject: [PATCH] 图书详情页、答题器bug修改
---
packageBookService/pages/bookServices/list/index.wxml | 2
packageBookService/pages/bookServices/examination/questionList/index.wxss | 9
packageBookService/pages/bookServices/examination/questionList/index.wxml | 274 ++++--------------------
packageBookService/pages/bookServices/list/index.wxss | 21 +
.vscode/settings.json | 2
packageBookService/pages/bookServices/detail/components/teachResource/index.wxml | 2
packageBookService/pages/bookServices/detail/index.wxml | 253 +++++++++++++++++++---
packageBookService/pages/bookServices/detail/components/tree/index.wxml | 16
packageBookService/pages/bookServices/examination/examination.js | 8
packageBookService/pages/bookServices/detail/index.js | 21 -
pages/bookServices/assort/index.wxss | 13
packageBookService/pages/bookServices/detail/components/teachResource/index.js | 7
packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss | 13
packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml | 10
14 files changed, 336 insertions(+), 315 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 8096c21..22d6d96 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -32,7 +32,7 @@
},
"editor.tabSize": 2,
"[wxml]": {
- "editor.defaultFormatter": "wechat.miniprogram.wxml-language-features"
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[css]": {
"editor.defaultFormatter": "HookyQR.beautify"
diff --git a/packageBookService/pages/bookServices/detail/components/teachResource/index.js b/packageBookService/pages/bookServices/detail/components/teachResource/index.js
index 6085f13..2d69877 100644
--- a/packageBookService/pages/bookServices/detail/components/teachResource/index.js
+++ b/packageBookService/pages/bookServices/detail/components/teachResource/index.js
@@ -11,6 +11,10 @@
applyResourceLoading: {
type: Boolean,
value: false,
+ },
+ deadline: {
+ type: String,
+ value: ''
}
},
data: {
@@ -19,8 +23,7 @@
},
methods: {
applyResource() {
- debugger
- var myEventDetail = {} // detail瀵硅薄锛屾彁渚涚粰浜嬩欢鐩戝惉鍑芥暟
+ var myEventDetail = {}
var myEventOption = {
bubbles: true,
composed: true,
diff --git a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
index 21c7786..a9cfb59 100644
--- a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
@@ -19,7 +19,7 @@
</view>
<view class="btn-box">
<t-button wx:if="{{applyState == 'Reject'}}" bind:tap="checkCause" style="height: 50rpx;" class="rejectBtn" bind:tap="showDialog">鏌ョ湅鍘熷洜</t-button>
- <t-button wx:if="{{applyState == 'none' || applyState == 'Reject'}}" theme="primary" bind:tap="applyResource" class="applyBtn" style="height: 50rpx;" loading="{{applyResourceLoading}}">鐢宠</t-button>
+ <t-button wx:if="{{applyState == 'none' || applyState == 'Reject'}}" theme="primary" bind:tap="applyResource" class="applyBtn" style="height: 50rpx;">鐢宠</t-button>
</view>
</view>
<!-- 鏈�氳繃鍘熷洜 -->
diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
index 1329559..0627766 100644
--- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
+++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
@@ -21,7 +21,7 @@
</t-radio>
</view>
<view class="card {{radioItem == 'mock' ? 'card--active' : ''}}">
- <t-radio value="mock" icon="none" borderless style="height: 74rpx">
+ <t-radio value="mock" icon="none" borderless style="height: 80rpx">
<view class="radio-content" slot="content">
<image
src="{{ radioItem == 'mock' ? '/static/images/bookService/detail/checkpaper.png' : '/static/images/bookService/detail/zujuan.png'}}"
@@ -41,9 +41,9 @@
bind:tap="goMycollect"
data-answerType="errorQuestion"
>
- <view slot="content">
+ <view slot="content" class="btn-content">
<image src="/static/images/bookService/detail/cuoti.png"></image>
- 鎴戠殑閿欓
+ <text>鎴戠殑閿欓</text>
</view>
</t-button>
<t-button
@@ -54,9 +54,9 @@
bind:tap="goMycollect"
data-answerType="collectQuestion"
>
- <view slot="content">
+ <view slot="content" class="btn-content">
<image src="/static/images/bookService/detail/wodeshoucang.png"></image>
- 鎴戠殑鏀惰棌
+ <text> 鎴戠殑鏀惰棌</text>
</view>
</t-button>
</view>
diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss
index d78e74a..de86a85 100644
--- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss
+++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss
@@ -41,8 +41,13 @@
border-bottom: 1px solid #EFF0F1;
}
+.btn-content {
+ display: flex;
+ align-items: center;
+}
+
.top-btn image {
- margin-top: 20rpx;
+ margin-right: 4rpx;
width: 36rpx;
height: 36rpx;
}
@@ -118,7 +123,7 @@
/* 妯悜甯冨眬 */
.horizontal-box {
- width: 350rpx;
+ width: 338rpx;
display: flex;
align-items: center;
margin: 32rpx;
@@ -145,10 +150,6 @@
justify-content: center;
width: 100%;
height: 68rpx;
-}
-
-.radio-content image {
- margin: 0 10rpx 10rpx 0;
}
.mock-data {
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index c415f21..ec8e69f 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -68,42 +68,42 @@
mode="aspectFill"
/>
<image
- wx:if="{{citem.selectType == 'video' || citem.learnSelectType == 'video'}}"
+ wx:elif="{{citem.selectType == 'video' || citem.learnSelectType == 'video'}}"
src="/static/images/bookService/detail/video.png"
mode="aspectFill"
/>
<image
- wx:if="{{citem.selectType == 'pdf'}}"
+ wx:elif="{{citem.selectType == 'pdf'}}"
src="/static/images/bookService/detail/pdf.png"
mode="aspectFill"
/>
<image
- wx:if="{{citem.selectType == 'webpage'}}"
+ wx:elif="{{citem.selectType == 'webpage'}}"
src="/static/images/bookService/detail/net.png"
mode="aspectFill"
/>
<image
- wx:if="{{citem.selectType == 'picture'}}"
+ wx:elif="{{citem.selectType == 'picture'}}"
src="/static/images/bookService/detail/picture.png"
mode="aspectFill"
/>
<image
- wx:if="{{citem.selectType == 'zip'}}"
+ wx:elif="{{citem.selectType == 'zip'}}"
src="/static/images/bookService/detail/zip.png"
mode="aspectFill"
/>
<image
- wx:if="{{ citem.fileMap[citem.file].extension == 'doc' || citem.fileMap[citem.file].extension == 'docx'}}"
+ wx:elif="{{ citem.fileMap[citem.file].extension == 'doc' || citem.fileMap[citem.file].extension == 'docx'}}"
src="/static/images/bookService/detail/word.png"
mode="aspectFill"
/>
<image
- wx:if="{{ citem.fileMap[citem.file].extension == 'xlsx' || citem.fileMap[citem.file].extension == 'xlsx'}}"
+ wx:elif="{{ citem.fileMap[citem.file].extension == 'xlsx' || citem.fileMap[citem.file].extension == 'xlsx'}}"
src="/static/images/bookService/detail/excel.png"
mode="aspectFill"
/>
<image
- wx:if="{{ citem.fileMap[citem.file].extension == 'ppt' || citem.fileMap[citem.file].extension == 'pptx'}}"
+ wx:elif="{{ citem.fileMap[citem.file].extension == 'ppt' || citem.fileMap[citem.file].extension == 'pptx'}}"
src="/static/images/bookService/detail/PPT.png"
mode="aspectFill"
/>
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index b538001..59b00c4 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -53,7 +53,6 @@
mockList: [] // 鐢ㄦ埛缁勫嵎鎻愪氦淇℃伅
},
flag: true,
- applyResourceLoading: false,
noResources: false,
selectedIds: "",//鍟嗗搧鎴栧瓙鍟嗗搧閿�鍞柟寮�
bookBuy: false, //鍟嗗搧鎴栧瓙鍟嗗搧鏄惁璐拱
@@ -180,7 +179,7 @@
// 鏍煎紡鍖栨棩鏈�
formatDate(dateString) {
if (!dateString) {
- return 'Invalid date';
+ return '';
}
const match = dateString.match(/^(\d{4})\/(\d{1,2})\/(\d{1,2}) (\d{1,2}):(\d{1,2}):(\d{1,2})$/);
if (!match) {
@@ -281,9 +280,12 @@
});
this.getSubTtem();
// 鑾峰彇鍥句功鍒嗙被
- const iconType = JSON.parse(res.datas.bookClassification)[0][0];
- const classType = JSON.parse(res.datas.bookClassification)[0][1];
- const className = await this.getBookClass(iconType, classType)
+ let className = ''
+ if (Array.isArray(res.datas.bookClassification) && res.datas.bookClassification.length) {
+ const iconType = JSON.parse(res.datas.bookClassification)[0][0];
+ const classType = JSON.parse(res.datas.bookClassification)[0][1];
+ className = await this.getBookClass(iconType, classType)
+ }
// 鑾峰彇缁勫嵎閿�鍞甶d
if (res.datas.saleMethod && res.datas.saleMethod.length) {
res.datas.saleMethod.forEach((item) => {
@@ -905,14 +907,12 @@
})
}
})
- this.setData({
- applyResourceLoading: false
- })
+ wx.hideLoading()
},
// 鐢宠鏁欏璧勬簮
applyResource() {
- this.setData({
- applyResourceLoading: true
+ wx.showLoading({
+ title: '鍔犺浇涓�',
})
// let role = userStore.userInfo ? userStore.userInfo.role : null
// if (role) {
@@ -1306,7 +1306,6 @@
keys: [this.data.bookId]
})
.then((res) => {
- console.log(JSON.parse(res[0].value));
if (res && res.length) {
const mock = JSON.parse(res[0].value)
mock.forEach(item => {
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index 5787248..723b7c7 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -3,7 +3,12 @@
<view style="width: 100%; height: {{barHeight}}px; "></view>
<view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;">
<view>
- <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" />
+ <t-icon
+ name="chevron-left"
+ size="30"
+ data-name="{{item}}"
+ bind:click="goBack"
+ />
</view>
<view class="navbar-title">{{options.name}}</view>
</view>
@@ -14,19 +19,35 @@
<view class="book-detail">
<view class="detail-left">
<view class="book-img">
- <image loading="" src="{{bookDetail.icon}}" mode="aspectFill" aria-label="{{bookDetail.name}}" />
+ <image
+ loading=""
+ src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}"
+ mode="aspectFill"
+ aria-label="{{bookDetail.name}}"
+ />
</view>
<view class="book-use">
<view class="collect" bind:tap="setCollect">
<view>
- <image loading="" src="/static/images/bookService/detail/collect.png" wx:if="{{!bookDetail.isFavourite}}" />
- <image loading="" src="/static/images/bookService/detail/collecting.png" wx:if="{{bookDetail.isFavourite}}" />
+ <image
+ loading=""
+ src="/static/images/bookService/detail/collect.png"
+ wx:if="{{!bookDetail.isFavourite}}"
+ />
+ <image
+ loading=""
+ src="/static/images/bookService/detail/collecting.png"
+ wx:if="{{bookDetail.isFavourite}}"
+ />
</view>
<view class="use-title">鏀惰棌</view>
</view>
<view class="suggest" bind:tap="suggestBtn">
<view>
- <image loading="" src="/static/images/bookService/detail/suggest.png" />
+ <image
+ loading=""
+ src="/static/images/bookService/detail/suggest.png"
+ />
</view>
<view class="use-title">鎴戣寤鸿</view>
</view>
@@ -48,15 +69,24 @@
<view class="li-content">{{bookDetail.isbn}}</view>
</view>
<view class="message-li">
- <view class="li-title" wx:if="{{bookDetail.publicationDate}}">鍑虹増鏃堕棿锛�</view>
+ <view class="li-title" wx:if="{{bookDetail.publicationDate}}"
+ >鍑虹増鏃堕棿锛�</view
+ >
<view class="li-content">{{bookDetail.publicationDate}}</view>
</view>
- <view class="message-li" wx:if="{{bookDetail.class}}" style="height: 80rpx">
+ <view
+ class="message-li"
+ wx:if="{{bookDetail.class}}"
+ style="height: 80rpx"
+ >
<view class="li-title">鍥句功鍒嗙被锛�</view>
<view class="class-name showTow">{{bookDetail.class}}</view>
</view>
</view>
- <image src="/static/images/bookService/detail/square.png" class="right-background" />
+ <image
+ src="/static/images/bookService/detail/square.png"
+ class="right-background"
+ />
</view>
</view>
<!-- 閿�鍞俊鎭� -->
@@ -68,63 +98,158 @@
<image src="/static/images/bookService/detail/electon-price.png" />
</view>
<view class="price">
- <view class="price-text">楼{{bookDetail.price == '0.00' ? '鍏嶈垂' :bookDetail.price}}</view>
- <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}">楼{{bookDetail.oldPrice}}
+ <view class="price-text"
+ >{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+
+ bookDetail.price}}</view
+ >
+ <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}"
+ >楼{{bookDetail.oldPrice}}
</view>
</view>
<view> </view>
</view>
<!-- 绾歌川涔﹀敭浠� -->
- <view class="paper-price">
+ <view class="paper-price" wx:if="{{bookDetail.paperPrice}}">
<view>
<image src="/static/images/bookService/detail/paper-price.png" />
</view>
- <view class="price">楼{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
- bookDetail.paperPrice}}</view>
+ <view class="price"
+ >{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' :
+ '楼'+bookDetail.paperPrice}}</view
+ >
</view>
</view>
<!-- 缃戝簵 -->
<view class="book-web">
- <image src="/static/images/bookService/detail/jd.png" wx:if="{{bookDetail.JDLink}}" bind:tap="goShop" data-link="{{bookDetail.JDLink}}" data-type="jd" />
- <image class="tmall-image" src="/static/images/bookService/detail/tmall.png" bind:tap="goShop" data-link="{{bookDetail.tmallLink}}" wx:if="{{bookDetail.tmallLink}}" />
- <image src="/static/images/bookService/detail/dangdang.png" bind:tap="goShop" data-link="{{bookDetail.dangdangLink}}" wx:if="{{bookDetail.dangdangLink}}" />
- <image src="/static/images/bookService/detail/weidian.png" bind:tap="goShop" data-link="{{bookDetail.weidianLink}}" wx:if="{{bookDetail.weidianLink}}" />
+ <image
+ src="/static/images/bookService/detail/jd.png"
+ wx:if="{{bookDetail.JDLink}}"
+ bind:tap="goShop"
+ data-link="{{bookDetail.JDLink}}"
+ data-type="jd"
+ />
+ <image
+ class="tmall-image"
+ src="/static/images/bookService/detail/tmall.png"
+ bind:tap="goShop"
+ data-link="{{bookDetail.tmallLink}}"
+ wx:if="{{bookDetail.tmallLink}}"
+ />
+ <image
+ src="/static/images/bookService/detail/dangdang.png"
+ bind:tap="goShop"
+ data-link="{{bookDetail.dangdangLink}}"
+ wx:if="{{bookDetail.dangdangLink}}"
+ />
+ <image
+ src="/static/images/bookService/detail/weidian.png"
+ bind:tap="goShop"
+ data-link="{{bookDetail.weidianLink}}"
+ wx:if="{{bookDetail.weidianLink}}"
+ />
</view>
</view>
</view>
<view class="book-resource">
- <t-tabs defaultValue="{{tabValue}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel" class="tab-class">
+ <t-tabs
+ defaultValue="{{tabValue}}"
+ bind:change="onTabsChange"
+ t-class="custom-tabs"
+ t-class-content="custom-panel"
+ class="tab-class"
+ >
<t-tab-panel label="鍥句功绠�浠�" value="brief" style="{{tabPanelstyle}}">
- <book-brief content="{{bookDetail.content}}" authorIntroduction="{{bookDetail.authorIntroduction}}" wx:if="{{bookDetail.content && bookDetail.authorIntroduction}}"></book-brief>
- <view wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}" class="noData">
+ <book-brief
+ content="{{bookDetail.content}}"
+ authorIntroduction="{{bookDetail.authorIntroduction}}"
+ wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"
+ ></book-brief>
+ <view
+ wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}"
+ class="noData"
+ >
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
<t-tab-panel label="鐢靛瓙涔�" value="jsek_eBook" style="{{tabPanelstyle}}">
- <epub-view fileInfo="{{fileInfo}}" id="eBook" class="webView"></epub-view>
+ <epub-view
+ fileInfo="{{fileInfo}}"
+ id="eBook"
+ class="webView"
+ ></epub-view>
</t-tab-panel>
- <t-tab-panel label="鏁欏璧勬簮" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}">
+ <t-tab-panel
+ label="鏁欏璧勬簮"
+ value="jsek_teachingResources"
+ class="{{loading ? 'loading': ''}}"
+ >
<view wx:if="{{!loading && teach.length && !noResources}}">
- <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}"></teach-resource>
- <tree openIds="{{openTeachids}}" bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach" openTeachids="{{openTeachids}}" wx:if="{{teach.length}}"></tree>
+ <teach-resource
+ applyState="{{applyState}}"
+ rejectCause="{{rejectCause}}"
+ deadline="{{deadline}}"
+ bind:applyResource="applyResource"
+ applyResourceLoading="{{applyResourceLoading}}"
+ ></teach-resource>
+ <tree
+ openIds="{{openTeachids}}"
+ bookInfo="{{bookDetail}}"
+ treeList="{{teach}}"
+ tab="{{tabValue}}"
+ applyState="{{applyState}}"
+ bind:downloadTeach="downloadTeach"
+ openTeachids="{{openTeachids}}"
+ wx:if="{{teach.length}}"
+ ></tree>
</view>
- <t-loading theme="circular" size="60rpx" class="loading" loading="{{loading}}" />
+ <t-loading
+ theme="circular"
+ size="60rpx"
+ class="loading"
+ loading="{{loading}}"
+ />
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
- <t-tab-panel label="浜戝涔�" value="jsek_cloudLearning" style="{{tabPanelstyle}}">
+ <t-tab-panel
+ label="浜戝涔�"
+ value="jsek_cloudLearning"
+ style="{{tabPanelstyle}}"
+ >
<view wx:if="{{!loading && learn.length}}">
- <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}"></learn-resource>
- <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}"></tree>
+ <learn-resource
+ bind:getFreeResource="getFreeResource"
+ bind:allAddShoppiingCar="allAddShoppiingCar"
+ id="learn-resource"
+ buyResourceData="{{buyResourceData}}"
+ bookId="{{bookDetail.id}}"
+ ></learn-resource>
+ <tree
+ id="tree"
+ openIds="{{openLearnids}}"
+ bookInfo="{{bookDetail}}"
+ tab="{{tabValue}}"
+ treeList="{{learn}}"
+ buyIds="{{buyIdList}}"
+ openLearnids="{{openLearnids}}"
+ ></tree>
</view>
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
</view>
</t-tab-panel>
- <t-tab-panel label="浜戞祴璇�" value="questionBank" style="{{tabPanelstyle}}">
+ <t-tab-panel
+ label="浜戞祴璇�"
+ value="questionBank"
+ style="{{tabPanelstyle}}"
+ >
<view wx:if="{{!loading && test.length}}">
- <test-resource list="{{test}}" bookInfo="{{bookDetail}}" mockData="{{mockData}}"></test-resource>
+ <test-resource
+ list="{{test}}"
+ bookInfo="{{bookDetail}}"
+ mockData="{{mockData}}"
+ ></test-resource>
</view>
<view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
@@ -139,31 +264,77 @@
<view class="box-bottom">
<view class="bottom-btn" bind:tap="appplyElectronicBook">
<view>
- <t-image loading="" src="/static/images/bookService/detail/ebook.png"></t-image>
+ <t-image
+ loading=""
+ src="/static/images/bookService/detail/ebook.png"
+ ></t-image>
</view>
<view class="btn-text">鐢靛瓙鏍蜂功鐢宠</view>
</view>
<view class="bottom-btn" bind:tap="appplyPaperBook">
<view>
- <t-image src="/static/images/bookService/detail/paper-book.png"></t-image>
+ <t-image
+ src="/static/images/bookService/detail/paper-book.png"
+ ></t-image>
</view>
<view class="btn-text">绾歌川鏍蜂功鐢宠</view>
</view>
- <view class="shopCar {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'shopCarColor' }}" bind:tap="addBookShopcCar" wx:if="{{tabValue != 'jsek_eBook'}}">鍔犲叆璐墿杞�</view>
- <view class="buy {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'buyColor' }}" bind:tap="buyBtn" wx:if="{{tabValue != 'jsek_eBook'}}">绔嬪嵆璐拱</view>
- <view class="shopCar shopCarColor" bind:tap="addBookShopcCar" wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}">鍔犲叆璐墿杞�</view>
- <view class="buy buyColor" bind:tap="buyBtn" wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}">绔嬪嵆璐拱</view>
- <view class="read buyColor" bind:tap="goRead" wx:if="{{tabValue == 'jsek_eBook' && bookBuy}}">绔嬪嵆鏌ョ湅</view>
+ <view
+ class="shopCar {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'shopCarColor' }}"
+ bind:tap="addBookShopcCar"
+ wx:if="{{tabValue != 'jsek_eBook'}}"
+ >鍔犲叆璐墿杞�</view
+ >
+ <view
+ class="buy {{(tabValue == 'jsek_teachingResources' || tabValue == 'jsek_note') ? 'disabledColor' : 'buyColor' }}"
+ bind:tap="buyBtn"
+ wx:if="{{tabValue != 'jsek_eBook'}}"
+ >绔嬪嵆璐拱</view
+ >
+ <view
+ class="shopCar shopCarColor"
+ bind:tap="addBookShopcCar"
+ wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}"
+ >鍔犲叆璐墿杞�</view
+ >
+ <view
+ class="buy buyColor"
+ bind:tap="buyBtn"
+ wx:if="{{tabValue == 'jsek_eBook' && !bookBuy}}"
+ >绔嬪嵆璐拱</view
+ >
+ <view
+ class="read buyColor"
+ bind:tap="goRead"
+ wx:if="{{tabValue == 'jsek_eBook' && bookBuy}}"
+ >绔嬪嵆鏌ョ湅</view
+ >
</view>
</scroll-view>
<!-- 鎴戣寤鸿寮圭獥 -->
-<suggest class="suggest-component" id="suggest-component" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest>
+<suggest
+ class="suggest-component"
+ id="suggest-component"
+ bookIcon="{{bookDetail.icon}}"
+ bookName="{{bookDetail.name}}"
+></suggest>
<!-- 鏁欏璧勬簮涓嬭浇鎻愮ず寮圭獥 -->
-<t-dialog class="teachDownloadDialog" visible="{{isShowTeachDownload}}" title="鎻愮ず" content="璇峰墠寰�PC绔笅杞�" confirm-btn="{{ confirmBtn }}" bind:confirm="closeTeachDownload" />
+<t-dialog
+ class="teachDownloadDialog"
+ visible="{{isShowTeachDownload}}"
+ title="鎻愮ず"
+ content="璇峰墠寰�PC绔笅杞�"
+ confirm-btn="{{ confirmBtn }}"
+ bind:confirm="closeTeachDownload"
+/>
<view class="applyBox" bindtap="goApply">
<view class="box">
- <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" />
+ <t-image
+ src="/static/images/home/yangshuForm1.png"
+ mode="heightFix"
+ class="img"
+ />
<view class="num" wx:if="{{num > 0}}">{{num}}</view>
</view>
-</view>
\ No newline at end of file
+</view>
diff --git a/packageBookService/pages/bookServices/examination/examination.js b/packageBookService/pages/bookServices/examination/examination.js
index 495bbee..44262d4 100644
--- a/packageBookService/pages/bookServices/examination/examination.js
+++ b/packageBookService/pages/bookServices/examination/examination.js
@@ -362,10 +362,12 @@
},
// 鎻愪氦閫昏緫
submitPaper() {
+
// 鍏抽棴閫�鍑洪〉闈㈢洃鍚�
wx.disableAlertBeforeUnload()
this.setData({
- submitStatus: true
+ submitStatus: true,
+ loading: true
})
const child = this.selectComponent('#question-options')
if (this.data.answerType == 'option' || this.data.answerType == 'errorQuestion' || this.data.answerType == 'mock') {
@@ -423,7 +425,9 @@
})
child.openTestReportDialog()
}
-
+ this.setData({
+ loading: false
+ })
},
// 鍒濆鍖栧嚱鏁�
async init() {
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxml b/packageBookService/pages/bookServices/examination/questionList/index.wxml
index 654cac3..33d32c5 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxml
@@ -1,122 +1,55 @@
<!--pages/bookServices/examination/questionList/index.wxml-->
-<view
- class="question-list"
- style="background-color:{{isNight ? '#222' : '#fff'}}"
->
+<view class="question-list" style="background-color:{{isNight ? '#222' : '#fff'}}">
<!-- 棰樺瀷title -->
- <view
- class="question-title"
- wx:if="{{questionList[showIndex].type}}"
- style="background-color:{{isNight ? '#222' : '#fff'}}"
- >
- <text class="title-name">{{questionList[showIndex].type}}</text
- ><text class="title-score" style="color: {{isNight ? '#fff' : '#000'}};"
- >(姣忛{{questionList[showIndex].score}}鍒�)</text
- >
+ <view class="question-title" wx:if="{{questionList[showIndex].type}}" style="background-color:{{isNight ? '#222' : '#fff'}}">
+ <text class="title-name">{{questionList[showIndex].type}}</text><text class="title-score" style="color: {{isNight ? '#fff' : '#000'}};">(姣忛{{questionList[showIndex].score}}鍒�)</text>
</view>
<!-- 棰樼洰鍒楄〃 -->
<swiper class="swiper" bind:change="changeSwiper" current="{{currentIndex}}">
- <swiper-item wx:for="{{questionList}}" wx:key="id">
+ <swiper-item wx:for="{{questionList}}" wx:key="id" style="overflow-y: auto;">
<!-- 棰樺共 -->
- <view
- class="question-stem title-score"
- style="color: {{isNight ? '#fff' : '#000'}}; font-size: {{sliderValue || 32}}rpx;"
- >
+ <view class="question-stem title-score" style="color: {{isNight ? '#fff' : '#000'}}; font-size: {{sliderValue || 32}}rpx;">
<!-- 棰樺彿 -->
<text>{{item.number}}.</text>
<!-- 浠呮枃瀛� -->
- <view
- wx:if="{{item.stemStyle == 'Txt' && item.questionType != 'completion'}}"
- >{{item.stem.stemTxt}}</view
- >
+ <view wx:if="{{item.stemStyle == 'Txt' && item.questionType != 'completion'}}">{{item.stem.stemTxt}}</view>
<!-- 浠呭浘鐗� -->
<view wx:elif="{{item.stemStyle == 'Image'}}">
<t-image src="{{item.stem.stemImage}}" />
</view>
<!-- 鍥剧墖鍔犳枃瀛� -->
- <view
- wx:elif="{{item.stemStyle == 'TxtAndImage'}}"
- class="title-TxtAndImage"
- >
+ <view wx:elif="{{item.stemStyle == 'TxtAndImage'}}" class="title-TxtAndImage">
<text>{{item.stem.stemTxt}}</text>
<t-image src="{{item.stem.stemImage}}" />
</view>
<!-- 瀵屾枃鏈� -->
- <view
- wx:elif="{{item.stemStyle == 'RichText'}} "
- class="title-RichText"
- >
+ <view wx:elif="{{item.stemStyle == 'RichText'}} " class="title-RichText">
<rich-text nodes="{{item.stem.stemTxt}}"></rich-text>
</view>
<!-- 濉┖棰� -->
<view wx:if="{{item.questionType == 'completion'}}">
- <view
- class="completion-box"
- wx:for="{{item.stem}}"
- wx:for-item="inputItem"
- wx:for-index="inputIndex"
- wx:key="inputIndex"
- >
- <t-input
- disabled="{{item.isComplete}}"
- bind:change="onChangeInput"
- data-value="{{item.option}}"
- data-id="{{item.id}}"
- data-index="{{inputItem.num}}"
- class="title-input"
- style="border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx;background-color:{{isNight ? '#000' : '#fff'}}; "
- placeholder-style="{{placeholderstyle}}"
- wx:if="{{inputItem.data == 'input'}}"
- placeholder="璇疯緭鍏ユ枃瀛�"
- value="{{item.userAnswer[inputItem.num]}}"
- ></t-input>
+ <view class="completion-box" wx:for="{{item.stem}}" wx:for-item="inputItem" wx:for-index="inputIndex" wx:key="inputIndex">
+ <t-input disabled="{{item.isComplete}}" bind:change="onChangeInput" data-value="{{item.option}}" data-id="{{item.id}}" data-index="{{inputItem.num}}" class="title-input" style="border: 2rpx solid rgba(220,220,220,1);border-radius: 12rpx;background-color:{{isNight ? '#000' : '#fff'}}; " placeholder-style="{{placeholderstyle}}" wx:if="{{inputItem.data == 'input'}}" placeholder="璇疯緭鍏ユ枃瀛�" value="{{item.userAnswer[inputItem.num]}}"></t-input>
<text wx:else>{{inputItem}}</text>
</view>
</view>
</view>
<!-- 绛旈鍖哄煙 -->
- <view class="question-answer">
+ <view class="question-answer {{item.questionType == 'shortAnswer' ? 'textarea-center' : ''}}">
<!-- 鍗曢�夐 -->
- <t-radio-group
- wx:if="{{item.questionType == 'singleChoice' || item.questionType == 'judge'}}"
- defaultValue="{{item.userAnswer}}"
- disabled="{{item.isComplete}}"
- bind:change="onChangeRadio"
- class="radio-group"
- data-value="{{item.option}}"
- data-id="{{item.id}}"
- >
- <view
- wx:for="{{item.option}}"
- wx:for-item="contentItem"
- wx:for-index="contentIndex"
- wx:key="contentIndex"
- >
- <t-radio
- value="{{contentItem.value}}"
- icon="none"
- placement="right"
- borderless
- style="background-color: {{isNight ? '#222' : '#fff'}}"
- >
- <view
- style="font-size: {{sliderValue || 32}}rpx;"
- class="radio-item {{(answerType == 'option' || answerType == 'mock' ) && !submitStatus && item.userAnswer == contentItem.value ? 'radio-active' : isNight ? 'night' :''}} {{ (item.answer == contentItem.value && item.answer == item.userAnswer && submitStatus) ? 'radio-correct' : (item.userAnswer == contentItem.value && item.userAnswer != item.answer && submitStatus) ?'radio-error' :'' }}"
- >
+ <t-radio-group wx:if="{{item.questionType == 'singleChoice' || item.questionType == 'judge'}}" defaultValue="{{item.userAnswer}}" disabled="{{item.isComplete}}" bind:change="onChangeRadio" class="radio-group" data-value="{{item.option}}" data-id="{{item.id}}">
+ <view wx:for="{{item.option}}" wx:for-item="contentItem" wx:for-index="contentIndex" wx:key="contentIndex">
+ <t-radio value="{{contentItem.value}}" icon="none" placement="right" borderless style="background-color: {{isNight ? '#222' : '#fff'}}">
+ <view style="font-size: {{sliderValue || 32}}rpx;" class="radio-item {{(answerType == 'option' || answerType == 'mock' ) && !submitStatus && item.userAnswer == contentItem.value ? 'radio-active' : isNight ? 'night' :''}} {{ (item.answer == contentItem.value && item.answer == item.userAnswer && submitStatus) ? 'radio-correct' : (item.userAnswer == contentItem.value && item.userAnswer != item.answer && submitStatus) ?'radio-error' :'' }}">
<!-- 浠呮枃瀛� -->
- <text wx:if="{{item.optionStyle == 'Txt'}}"
- >{{contentItem.value}}銆亄{contentItem.txt}}</text
- >
+ <text wx:if="{{item.optionStyle == 'Txt'}}">{{contentItem.value}}銆亄{contentItem.txt}}</text>
<!-- 浠呭浘鐗� -->
<view wx:if="{{item.optionStyle == 'Image'}}" class="fl-center">
<text>{{contentItem.value}}銆�</text>
<t-image src="{{contentItem.img}}" />
</view>
<!-- 鏂囧瓧鍔犲浘鐗� -->
- <view
- wx:if="{{item.optionStyle == 'TxtAndImage'}}"
- class="fl-center"
- >
+ <view wx:if="{{item.optionStyle == 'TxtAndImage'}}" class="fl-center">
<text>{{contentItem.value}}銆�</text>
<text>{{contentItem.txt}}</text>
<t-image src="{{contentItem.img}}" />
@@ -126,57 +59,25 @@
<text>{{contentItem.value}}銆�</text>
<rich-text nodes="{{contentItem.txt}}"></rich-text>
</view>
- <text
- wx:if="{{submitStatus && (item.answer == contentItem.value && item.answer == item.userAnswer)}}"
- >瀵�</text
- >
- <text
- wx:if="{{ submitStatus && (item.userAnswer == contentItem.value && item.userAnswer != item.answer)}}"
- >閿�</text
- >
+ <text wx:if="{{submitStatus && (item.answer == contentItem.value && item.answer == item.userAnswer)}}">瀵�</text>
+ <text wx:if="{{ submitStatus && (item.userAnswer == contentItem.value && item.userAnswer != item.answer)}}">閿�</text>
</view>
</t-radio>
</view>
</t-radio-group>
<!-- 澶氶�夐 -->
- <t-checkbox-group
- disabled="{{item.isComplete}}"
- class="checkbox-group"
- wx:elif="{{item.questionType == 'multipleChoice'}}"
- t-class="box"
- borderless
- bind:change="onChangeRadio"
- data-value="{{item.option}}"
- data-id="{{item.id}}"
- defaultValue="{{item.userAnswer}}"
- >
- <view
- wx:for="{{item.option}}"
- wx:for-item="contentItem"
- wx:for-index="contentIndex"
- wx:key="contentIndex"
- >
- <t-checkbox
- block="{{false}}"
- value="{{contentItem.value}}"
- style="background-color:{{isNight ? '#000' :'#fff'}}; "
- >
+ <t-checkbox-group disabled="{{item.isComplete}}" class="checkbox-group" wx:elif="{{item.questionType == 'multipleChoice'}}" t-class="box" borderless bind:change="onChangeRadio" data-value="{{item.option}}" data-id="{{item.id}}" defaultValue="{{item.userAnswer}}">
+ <view wx:for="{{item.option}}" wx:for-item="contentItem" wx:for-index="contentIndex" wx:key="contentIndex">
+ <t-checkbox block="{{false}}" value="{{contentItem.value}}" style="background-color:{{isNight ? '#000' :'#fff'}}; ">
<!-- 浠呮枃瀛� -->
- <text
- wx:if="{{item.optionStyle == 'Txt'}}"
- style="color:{{ isNight ? '#fff' : '#000'}}"
- >{{contentItem.value}}銆亄{contentItem.txt}}</text
- >
+ <text wx:if="{{item.optionStyle == 'Txt'}}" style="color:{{ isNight ? '#fff' : '#000'}}">{{contentItem.value}}銆亄{contentItem.txt}}</text>
<!-- 浠呭浘鐗� -->
<view wx:if="{{item.optionStyle == 'Image'}}" class="fl-center">
<text>{{contentItem.value}}銆�</text>
<t-image src="{{contentItem.img}}" />
</view>
<!-- 鏂囧瓧鍔犲浘鐗� -->
- <view
- wx:if="{{item.optionStyle == 'TxtAndImage'}}"
- class="fl-center"
- >
+ <view wx:if="{{item.optionStyle == 'TxtAndImage'}}" class="fl-center">
<text>{{contentItem.value}}銆�</text>
<text>{{contentItem.txt}}</text>
<t-image src="{{contentItem.img}}" />
@@ -190,126 +91,41 @@
</view>
</t-checkbox-group>
<!-- 绠�绛� 缈昏瘧 -->
- <t-textarea
- disabled="{{item.isComplete}}"
- value="{{item.userAnswer}}"
- bind:change="onChangeRadio"
- data-value="{{item.option}}"
- data-id="{{item.id}}"
- class="option-textarea"
- wx:elif="{{item.questionType == 'shortAnswer'}}"
- t-class="external-class"
- placeholder="璇疯緭鍏ユ枃瀛�"
- bordered
- maxlength="500"
- disableDefaultPadding="{{true}}"
- indicator
- style="background-color:{{isNight ? '#000' : '#fff'}}; "
- />
+ <t-textarea disabled="{{item.isComplete}}" value="{{item.userAnswer}}" bind:change="onChangeRadio" data-value="{{item.option}}" data-id="{{item.id}}" class="option-textarea" wx:elif="{{item.questionType == 'shortAnswer'}}" t-class="external-class" placeholder="璇疯緭鍏ユ枃瀛�" bordered maxlength="500" disableDefaultPadding="{{true}}" indicator style="background-color:{{isNight ? '#000' : '#fff'}}; " />
</view>
<!-- 鍗曢�夈�佸閫夎В鏋� -->
- <view
- class="analysis"
- wx:if="{{item.isComplete && (item.questionType == 'singleChoice' || item.questionType == 'judge' || item.questionType == 'multipleChoice')}}"
- >
+ <view class="analysis" wx:if="{{item.isComplete && (item.questionType == 'singleChoice' || item.questionType == 'judge' || item.questionType == 'multipleChoice')}}">
<view class="analysis-answer">
- <view
- class="answer-correct answer-center"
- style="font-size: {{sliderValue || 32}}rpx;"
- >
+ <view class="answer-correct answer-center" style="font-size: {{sliderValue || 32}}rpx;">
<text class="analysis-title-box">姝ｇ‘绛旀锛�</text>
- <rich-text
- nodes="{{item.answer}}"
- style="font-size: {{sliderValue || 40}}rpx;"
- ></rich-text>
+ <rich-text nodes="{{item.answer}}" style="font-size: {{sliderValue || 40}}rpx;"></rich-text>
</view>
- <view
- class="answer-center marginL {{item.isRight ? 'answer-correct' : 'answer-error'}}"
- wx:if="{{item.questionType !== 'shortAnswer'}}"
- >
- <text
- class="analysis-title-box"
- style="font-size: {{sliderValue || 32}}rpx;"
- >鎮ㄧ殑绛旀锛�</text
- ><text
- class="answer-text"
- style="font-size: {{sliderValue || 40}}rpx;"
- >{{item.userAnswer}}</text
- >
+ <view class="answer-center marginL {{item.isRight ? 'answer-correct' : 'answer-error'}}" wx:if="{{item.questionType !== 'shortAnswer'}}">
+ <text class="analysis-title-box" style="font-size: {{sliderValue || 32}}rpx;">鎮ㄧ殑绛旀锛�</text><text class="answer-text" style="font-size: {{sliderValue || 40}}rpx;">{{item.userAnswer}}</text>
</view>
</view>
- <view
- class="analysis-text"
- wx:if="{{item.analysisCon}}"
- style="color: {{isNight ? '#fff' : '#000'}};"
- >
- <text style="font-size: {{sliderValue || 32}}rpx;">绛旀瑙ｆ瀽锛�</text
- ><rich-text
- style="font-size: {{sliderValue || 32}}rpx;"
- nodes="{{item.analysisCon}}"
- class="analysis-content"
- ></rich-text>
+ <view class="analysis-text" wx:if="{{item.analysisCon}}" style="color: {{isNight ? '#fff' : '#000'}};">
+ <text style="font-size: {{sliderValue || 32}}rpx;">绛旀瑙ｆ瀽锛�</text>
+ <rich-text style="font-size: {{sliderValue || 32}}rpx;" nodes="{{item.analysisCon}}" class="analysis-content"></rich-text>
</view>
</view>
<!-- 濉┖銆佺畝绛旇В鏋� -->
- <view
- class="analysis"
- wx:if="{{(item.questionType == 'shortAnswer' || item.questionType == 'completion') && item.isComplete}}"
- >
- <view
- style="display: {{item.questionType == 'completion' ? 'flex' : 'block'}}"
- >
- <text
- wx:if="{{item.questionType == 'completion'}}"
- class="short-answer-fz answer-correct"
- style="font-size:{{sliderValue || 32}}rpx;"
- >姝ｇ‘绛旀:</text
- >
- <text
- wx:if="{{item.questionType == 'shortAnswer'}}"
- class="short-answer-fz"
- style="color:{{isNight ? '#fff' : '#000'}};font-size:{{sliderValue || 28}}rpx;"
- >
+ <view class="analysis" wx:if="{{(item.questionType == 'shortAnswer' || item.questionType == 'completion') && item.isComplete}}">
+ <view style="display: {{item.questionType == 'completion' ? 'flex' : 'block'}}">
+ <text wx:if="{{item.questionType == 'completion'}}" class="short-answer-fz answer-correct" style="font-size:{{sliderValue || 32}}rpx;">姝ｇ‘绛旀:</text>
+ <text wx:if="{{item.questionType == 'shortAnswer'}}" class="short-answer-fz" style="color:{{isNight ? '#fff' : '#000'}};font-size:{{sliderValue || 28}}rpx;">
鍙傝�冪瓟妗堬細
</text>
- <rich-text
- wx:if="{{item.questionType == 'shortAnswer'}}"
- nodes="{{item.answer}}"
- style="font-size:{{sliderValue || 28}}rpx; color:{{item.questionType == 'completion' ? '#1FBC1F' : isNight ? '#fff' : '#000'}}"
- ></rich-text>
- <view
- wx:if="{{item.questionType == 'completion'}}"
- style="font-size:{{sliderValue || 28}}rpx;"
- class="short-answer-fz answer-correct"
- >{{item.answer}}</view
- >
+ <rich-text wx:if="{{item.questionType == 'shortAnswer'}}" nodes="{{item.answer}}" style="font-size:{{sliderValue || 28}}rpx; color:{{item.questionType == 'completion' ? '#1FBC1F' : isNight ? '#fff' : '#000'}}"></rich-text>
+ <view wx:if="{{item.questionType == 'completion'}}" style="font-size:{{sliderValue || 28}}rpx;" class="short-answer-fz answer-correct">{{item.answer}}</view>
</view>
- <view
- wx:if="{{item.questionType == 'completion'}}"
- class="short-answer-mr"
- style="display: {{item.questionType == 'completion' ? 'flex' : 'block'}}"
- >
- <text
- class="short-answer-fz {{item.isRight ? 'answer-correct' : 'answer-error'}}"
- style="font-size:{{sliderValue || 28}}rpx;"
- >鎮ㄧ殑绛旀锛�</text
- >
- <view
- class="short-answer-fz {{item.isRight ? 'answer-correct' : 'answer-error'}}"
- style="color:{{isNight ? '#fff' : '#000'}};font-size:{{sliderValue || 28}}rpx;"
- >{{item.userAnswer}}</view
- >
+ <view wx:if="{{item.questionType == 'completion'}}" class="short-answer-mr" style="display: {{item.questionType == 'completion' ? 'flex' : 'block'}}">
+ <text class="short-answer-fz {{item.isRight ? 'answer-correct' : 'answer-error'}}" style="font-size:{{sliderValue || 28}}rpx;">鎮ㄧ殑绛旀锛�</text>
+ <view class="short-answer-fz {{item.isRight ? 'answer-correct' : 'answer-error'}}" style="color:{{isNight ? '#fff' : '#000'}};font-size:{{sliderValue || 28}}rpx;">{{item.userAnswer}}</view>
</view>
<view class="short-answer-mr">
- <text
- class="short-answer-fz;"
- style="color:{{isNight ? '#fff' : '#000'}};font-size:{{sliderValue || 28}}rpx;"
- >绛旀瑙ｆ瀽锛�</text
- >
- <rich-text
- nodes="{{item.analysisCon}}"
- style="font-size:{{sliderValue || 28}}rpx;;color:{{isNight ? '#fff' : '#000'}}"
- ></rich-text>
+ <text class="short-answer-fz;" style="color:{{isNight ? '#fff' : '#000'}};font-size:{{sliderValue || 28}}rpx;">绛旀瑙ｆ瀽锛�</text>
+ <rich-text nodes="{{item.analysisCon}}" style="font-size:{{sliderValue || 28}}rpx;;color:{{isNight ? '#fff' : '#000'}}"></rich-text>
</view>
</view>
</swiper-item>
@@ -317,4 +133,4 @@
<text>娌℃湁鏇村浜嗐�傘�傘��</text>
</swiper-item>
</swiper>
-</view>
+</view>
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxss b/packageBookService/pages/bookServices/examination/questionList/index.wxss
index f6efb94..c0fc5bf 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxss
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxss
@@ -1,8 +1,9 @@
/* pages/bookServices/examination/questionList/index.wxss */
.question-list {
width: 95%;
- height: 84%;
+ height: 85%;
padding: 20rpx;
+
background-color: #ffffff;
border-radius: 20rpx;
margin-top: 20rpx;
@@ -153,7 +154,6 @@
.analysis-title-box {
display: inline-block;
- /* width: 160rpx; */
white-space: nowrap;
}
@@ -176,4 +176,9 @@
.short-answer-mr {
margin-top:
40rpx;
+}
+
+.textarea-center {
+ display: flex;
+ justify-content: center;
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/list/index.wxml b/packageBookService/pages/bookServices/list/index.wxml
index 7e76b60..96b5e21 100644
--- a/packageBookService/pages/bookServices/list/index.wxml
+++ b/packageBookService/pages/bookServices/list/index.wxml
@@ -22,7 +22,7 @@
<view class="bookServices-list">
<view class="list-header">
<scroll-view scroll-x="{{true}}" class="header-scroll">
- <t-dropdown-menu style="width: 800rpx">
+ <t-dropdown-menu style="width: 1000rpx">
<t-dropdown-item
options="{{stairList.options}}"
value="{{stairList.value}}"
diff --git a/packageBookService/pages/bookServices/list/index.wxss b/packageBookService/pages/bookServices/list/index.wxss
index 2bc3abc..53af059 100644
--- a/packageBookService/pages/bookServices/list/index.wxss
+++ b/packageBookService/pages/bookServices/list/index.wxss
@@ -14,6 +14,27 @@
display: flex;
}
+.list-header .t-button--primary {
+ border-radius: 50rpx !important;
+ background: #FF6C00 !important;
+ border: none;
+}
+
+.list-header .t-button--light {
+ background: #fff !important;
+ border-radius: 50rpx !important;
+ color: #545C63 !important;
+ border: 2rpx solid #979797 !important;
+}
+
+.t-dropdown-menu__item--active,
+.t-radio__icon--checked,
+.t-checkbox__icon--checked,
+.t-radio__title--checked,
+.t-checkbox__title--checked {
+ color: #FF6C00 !important;
+}
+
.header-sort {
position: relative;
background-color: #fff;
diff --git a/pages/bookServices/assort/index.wxss b/pages/bookServices/assort/index.wxss
index ac6364c..1a7f2df 100644
--- a/pages/bookServices/assort/index.wxss
+++ b/pages/bookServices/assort/index.wxss
@@ -25,9 +25,10 @@
}
.page-container {
- padding: 120rpx 0 20rpx 0;
+ padding-top: 120rpx;
+ padding-bottom: constant(safe-area-inset-bottom);
width: 100%;
- height: 90%;
+ height: 100%;
}
.side-bar-wrapper {
@@ -65,7 +66,7 @@
.myScroll {
/* 鐩掑瓙鐨勬牱寮� */
width: 100%;
- height: 98rpx;
+ height: 108rpx;
white-space: nowrap;
}
@@ -95,8 +96,9 @@
.class-box {
background-color: #fff;
margin-bottom: 20rpx;
- padding: 10rpx 12rpx;
+ padding: 10rpx 0rpx;
border-radius: 12rpx;
+ box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(0, 0, 0, 0.08);
}
@@ -109,8 +111,7 @@
.class-content {
display: flex;
flex-wrap: wrap;
- /* padding: 5rpx 20rpx 30rpx 30rpx; */
- padding: 30rpx;
+ padding: 30rpx 0;
}
.book-box {
--
Gitblit v1.9.1