From c4e651ac030ef5fe8870f6974fcc4658d42986c6 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 21 三月 2024 14:35:01 +0800
Subject: [PATCH] 图书列表，详情页、答题器样式修改，代码合并上传测试服
---
packageBookService/pages/bookServices/detail/components/note/note.wxml | 10 ++-
packageBookService/pages/bookServices/examination/questionList/index.js | 5 +
packageBookService/pages/bookServices/examination/questionList/index.wxss | 4 +
packageBookService/pages/bookServices/examination/questionList/index.wxml | 8 +-
custom-tab-bar/index.wxml | 2
packageBookService/pages/bookServices/detail/index.wxml | 12 +++-
packageBookService/pages/bookServices/detail/index.wxss | 6 +-
packageBookService/pages/bookServices/detail/components/brief/index.js | 1
packageBookService/pages/bookServices/examination/examination.wxml | 1
packageBookService/pages/bookServices/examination/examination.js | 47 +++++++++++++--
packageBookService/pages/bookServices/detail/components/note/note.js | 16 ++++-
packageBookService/pages/bookServices/detail/index.js | 24 +++++--
packageBookService/pages/bookServices/detail/components/note/note.json | 3
packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss | 14 ++--
packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml | 11 +--
15 files changed, 117 insertions(+), 47 deletions(-)
diff --git a/custom-tab-bar/index.wxml b/custom-tab-bar/index.wxml
index 6cfdf11..1c93f72 100644
--- a/custom-tab-bar/index.wxml
+++ b/custom-tab-bar/index.wxml
@@ -1,5 +1,5 @@
<t-tab-bar value="{{active}}" bindchange="onChange" split="{{false}}">
- <t-tab-bar-item wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="{{item.id}}">
+ <t-tab-bar-item wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="id">
<view class="custom-tab-bar-wrapper">
<!-- <t-icon prefix="wr" name="{{item.icon}}" size="48rpx" />
<view class="text">{{ item.text }}</view> -->
diff --git a/packageBookService/pages/bookServices/detail/components/brief/index.js b/packageBookService/pages/bookServices/detail/components/brief/index.js
index 4eeb653..8cc00b8 100644
--- a/packageBookService/pages/bookServices/detail/components/brief/index.js
+++ b/packageBookService/pages/bookServices/detail/components/brief/index.js
@@ -9,4 +9,5 @@
value: '',
},
},
+
});
diff --git a/packageBookService/pages/bookServices/detail/components/note/note.js b/packageBookService/pages/bookServices/detail/components/note/note.js
index b059f83..64cc2ad 100644
--- a/packageBookService/pages/bookServices/detail/components/note/note.js
+++ b/packageBookService/pages/bookServices/detail/components/note/note.js
@@ -32,6 +32,7 @@
noteList: [],
activeValues: 0,
loading: false,
+ noList: false,
},
/**
* 缁勪欢鐨勬柟娉曞垪琛�
@@ -136,9 +137,10 @@
},
// 鑾峰彇绗旇鍒楄〃
async getNoteList() {
- // this.setData({
- // loading: true
- // })
+ this.setData({
+ loading: true,
+ noList: false
+ })
console.log(this.properties.bookInfo.id, 'this.properties.bookInfo.id');
let topicId
await app.MG.ugc
@@ -169,6 +171,13 @@
topicIdOrRefCode: topicId + ''
}
await app.MG.ugc.getTopicMessageList(query).then((res) => {
+ if (!res.datas.length) {
+ return this.setData({
+ noList: true,
+ loading: false,
+ noteList: res.datas,
+ })
+ }
// notePage.value.total = res.totalSize
res.datas.forEach((item) => {
item.compliceHover = false
@@ -180,7 +189,6 @@
noteList: res.datas,
loading: false
})
- console.log('绗旇鍒楄〃', res.datas);
})
},
// 鏂板缓绗旇鎺ュ彛
diff --git a/packageBookService/pages/bookServices/detail/components/note/note.json b/packageBookService/pages/bookServices/detail/components/note/note.json
index 598afe7..6754b91 100644
--- a/packageBookService/pages/bookServices/detail/components/note/note.json
+++ b/packageBookService/pages/bookServices/detail/components/note/note.json
@@ -10,6 +10,7 @@
"t-input": "tdesign-miniprogram/input/input",
"t-loading": "tdesign-miniprogram/loading/loading",
"t-popup": "tdesign-miniprogram/popup/popup",
- "t-icon": "tdesign-miniprogram/icon/icon"
+ "t-icon": "tdesign-miniprogram/icon/icon",
+ "t-empty": "tdesign-miniprogram/empty/empty"
}
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/detail/components/note/note.wxml b/packageBookService/pages/bookServices/detail/components/note/note.wxml
index 19eb4cf..bd0ab06 100644
--- a/packageBookService/pages/bookServices/detail/components/note/note.wxml
+++ b/packageBookService/pages/bookServices/detail/components/note/note.wxml
@@ -1,5 +1,5 @@
<!--pages/bookServices/detail/components/note/note.wxml-->
-<view class="note" wx:if="{{!loading && noteList.length}}">
+<view class="note">
<view class="note-btn">
<t-button theme="primary" class="make-note" bind:tap="openDialog" style="width: 240rpx;">
<view slot="content">
@@ -10,7 +10,7 @@
</view>
<view class="note-content">
- <t-collapse value="{{activeValues}}" bind:change="handleChange">
+ <t-collapse value="{{activeValues}}" bind:change="handleChange" wx:if="{{!loading && noteList.length}}">
<t-collapse-panel value="{{item.id}}" expandIcon wx:for="{{noteList}}">
<view slot="header" class="collapse-header">
<t-image class="note-icon" src="/static/images/bookService/detail/note-icon.png"></t-image>
@@ -28,14 +28,16 @@
</view>
</t-collapse-panel>
</t-collapse>
-
+ <view wx:if="{{noList}}" class="noData">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
</view>
<view class="bottom-box">
<t-loading wx:if="{{isMore == true}}"></t-loading>
<text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text>
</view>
</view>
-<view class="loading-box" wx:if="{{loading}}">
+<view class="loading-box" wx:if="{{loading}}" >
<t-loading loading="{{loading}}" size="60rpx"></t-loading>
</view>
diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
index 4d44c62..61d1f5c 100644
--- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
+++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
@@ -1,7 +1,7 @@
<!--pages/bookServices/detail/components/testResource/testResource.wxml-->
<view class="test-resource">
<view class="top-btn">
- <t-radio-group class="test-radio" t-class="horizontal-box" value="{{radioItem}}" bind:change="onRadioChange" style="margin: 0px">
+ <t-radio-group class="test-radio" t-class="horizontal-box" value="{{radioItem}}" bind:change="onRadioChange" style="margin: 0 10rpx 0 0">
<view class="card {{radioItem == 'test' ? 'card--active' : ''}}">
<t-radio value="test" icon="none" borderless style="height: 80rpx">
<view class="radio-content" slot="content">
@@ -11,11 +11,10 @@
</t-radio>
</view>
<view class="card {{radioItem == 'mock' ? 'card--active' : ''}}">
- <t-radio value="mock" icon="none" borderless>
+ <t-radio value="mock" icon="none" borderless style="height: 74rpx">
<view class="radio-content" slot="content">
<t-image src="{{ radioItem == 'mock' ? '/static/images/bookService/detail/checkpaper.png' : '/static/images/bookService/detail/zujuan.png'}}"></t-image>
- <text style="color: {{radioItem == 'mock' ? '#fff':''}};">
- 缁勫嵎</text>
+ <text style="color: {{radioItem == 'mock' ? '#fff':''}};">缁勫嵎</text>
</view>
</t-radio>
</view>
@@ -34,7 +33,7 @@
</t-button>
</view>
<!-- 缁冧範鍒楄〃 -->
- <view class="resource-list" wx:for="{{list}}" wx:key="item.id" wx:if="{{radioItem == 'test'}}">
+ <view class="resource-list" wx:for="{{list}}" wx:key="id" wx:if="{{radioItem == 'test'}}">
<view class="list-title">
<t-image src="/static/images/bookService/detail/test-icon.png"></t-image>
<text>{{item.name}}</text>
@@ -50,7 +49,7 @@
<view wx:if="{{mockData.mockList.length}}">
<view class="mack-num">宸茬粍鍗穥{mockData.mockList.length}}娆�</view>
<view class="mock-list">
- <view class="mock-list-box" wx:for="{{mockData.mockList}}" data-item="{{item}}" bind:tap="goMackPaper">
+ <view class="mock-list-box" wx:for="{{mockData.mockList}}" wx:key="id" data-item="{{item}}" bind:tap="goMackPaper">
<view class="mock-title">{{item.name}}</view>
<view class="mock-message">
<view class="message-box">
diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss
index ed954c7..34496b5 100644
--- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss
+++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxss
@@ -31,6 +31,7 @@
.top-btn {
display: flex;
justify-content: space-evenly;
+ align-items: center;
padding: 0 0 20rpx 15rpx;
border-bottom: 1px solid #EFF0F1;
}
@@ -57,6 +58,10 @@
.practice-btn text {
font-size: 28rpx;
+}
+
+.error-btn {
+ margin-left: 10rpx;
}
.paper-btn,
@@ -178,11 +183,6 @@
align-items: center;
}
-.mack-state {
- width: 94rpx;
- height: 42rpx;
-}
-
.mock-score {
font-size: 28rpx;
color: #ff6c00;
@@ -194,10 +194,12 @@
}
.state-pad {
- width: 80rpx;
+ white-space: nowrap;
+ width: 90rpx;
border-radius: 10rpx;
display: inline-block;
padding: 10rpx;
+ text-align: center;
}
.complete {
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 6231fb5..74a2653 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -52,7 +52,8 @@
mockList: [] // 鐢ㄦ埛缁勫嵎鎻愪氦淇℃伅
},
flag: true,
- applyResourceLoading: false
+ applyResourceLoading: false,
+ noResources: false
},
@@ -344,7 +345,8 @@
},
onTabsChange(e) {
this.setData({
- tabValue: e.detail.value
+ tabValue: e.detail.value,
+ noResources: false
})
if (e.detail.label == '鏁欏璧勬簮' || e.detail.label == '浜戝涔�' || e.detail.label == '浜戞祴璇�') {
const checkData = this.data.cmsDatas.find(item => item.refCode == e.detail.value)
@@ -354,7 +356,10 @@
|| (e.detail.value == 'questionBank' && !this.data.test.length)) {
this.getResourceData(checkData)
}
-
+ } else {
+ this.setData({
+ noResources: true
+ })
}
} else if (e.detail.label == '浜戠瑪璁�') {
const token = wx.getStorageSync('jsek-token')
@@ -381,7 +386,8 @@
// 鑾峰彇鏁欏璧勬簮 浜戝涔� 浜戞祴璇�
getResourceData(type) {
this.setData({
- loading: true
+ loading: true,
+ noResources: false
})
let query = {
path: '*',
@@ -408,6 +414,12 @@
app.MG.store
.getProductDetail(query)
.then(async (res) => {
+ if (!res.datas.cmsDatas[0].datas.length) {
+ return this.setData({
+ noResources: true,
+ loading: false
+ })
+ }
// 浜戞祴璇曪紝閫掑綊璇锋眰閲屽眰鏁版嵁
if (type.refCode == 'questionBank') {
const data = res.datas.cmsDatas[0].datas.filter(
@@ -427,14 +439,12 @@
teach: list,
loading: false
})
- console.log('鏁欏璧勬簮', this.data.teach);
this.findChildIds(this.data.teach, this.data.openTeachids = [])
} else if (type.refCode == 'jsek_cloudLearning') {
res.datas.cmsDatas[0].datas.forEach(item => {
item.checked = false
})
const list = await this.getAllResource(res.datas.cmsDatas[0].datas)
- console.log(list, 'list');
this.setData({
learn: list,
loading: false
@@ -1206,7 +1216,7 @@
}
else if (this.data.tabValue == 'jsek_cloudLearning') {
const tree = this.selectComponent('#tree')
-
+
tree.onCloudShoppingCart()
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index b6006bb..0272a41 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -104,25 +104,31 @@
鐢靛瓙涔�
</t-tab-panel>
<t-tab-panel label="鏁欏璧勬簮" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}">
- <view wx:if="{{!loading && teach.length}}">
+ <view wx:if="{{!loading && teach.length && !noResources}}">
<teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}"></teach-resource>
<tree 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}}" />
- <!-- <view wx:if="{{!teach.length && !loading}}" class="noData">
+ <view wx:if="{{noResources}}" class="noData">
<t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
- </view> -->
+ </view>
</t-tab-panel>
<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"></learn-resource>
<tree id="tree" 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}}">
<view wx:if="{{!loading && test.length}}">
<test-resource list="{{test}}" bookInfo="{{bookDetail}}" mockData="{{mockData}}"></test-resource>
</view>
+ <view wx:if="{{noResources}}" class="noData">
+ <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ </view>
</t-tab-panel>
<t-tab-panel label="浜戠瑪璁�" value="jesk_note" style="{{tabPanelstyle}}">
<note bookInfo="{{bookDetail}}" id="note" class="note-list" bind:changeLoaidng="changeLoaidng"></note>
diff --git a/packageBookService/pages/bookServices/detail/index.wxss b/packageBookService/pages/bookServices/detail/index.wxss
index 2287ac5..8deaf31 100644
--- a/packageBookService/pages/bookServices/detail/index.wxss
+++ b/packageBookService/pages/bookServices/detail/index.wxss
@@ -200,7 +200,8 @@
/* 鍥句功璧勬簮 */
.book-resource {
- min-height: 640rpx;
+ /* min-height: 640rpx; */
+ min-height: calc(100vh - 960rpx);
margin-top: 20rpx;
background-color: #fff !important;
}
@@ -298,6 +299,5 @@
}
.noData {
- /* width: 500rpx;
- height: 500rpx; */
+ height: 100%;
}
\ No newline at end of file
diff --git a/packageBookService/pages/bookServices/examination/examination.js b/packageBookService/pages/bookServices/examination/examination.js
index 6b82781..3bec06c 100644
--- a/packageBookService/pages/bookServices/examination/examination.js
+++ b/packageBookService/pages/bookServices/examination/examination.js
@@ -48,6 +48,15 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
+ // wx.enableAlertBeforeUnload({
+ // message: "鏈彁浜わ紝鏄惁閫�鍑虹瓟棰橈紵",
+ // success: function (res) {
+ // console.log('纭畾', res);
+ // },
+ // fail: function (err) {
+ // console.log("澶辫触锛�", err);
+ // },
+ // });
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -75,7 +84,6 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
*/
onReady() {
-
},
/**
@@ -101,13 +109,12 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
*/
onHide() {
-
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
*/
- onUnload() {
+ onUnload(e) {
if (this.data.countdownInterval !== null) {
clearInterval(this.data.countdownInterval)
}
@@ -132,8 +139,29 @@
*/
onShareAppMessage() {
},
+
+ // 鐩戝惉watch
+ watch(context, variableName, callback) {
+ let value = context.data[variableName]; // 鑾峰彇琚洃鍚睘鎬х殑褰撳墠鍊�
+
+ // 浣跨敤 Object.defineProperty 鏂规硶鍦ㄦ暟鎹璞′笂瀹氫箟灞炴�х殑 getter 鍜� setter
+ Object.defineProperty(context.data, variableName, {
+ configurable: true, // 鍙厤缃�
+ enumerable: true, // 鍙灇涓�
+ get: function () {
+ return value; // 杩斿洖灞炴�х殑褰撳墠鍊�
+ },
+ set: function (newVal) {
+ const oldVal = value; // 璁板綍灞炴�х殑鏃у��
+ value = newVal; // 鏇存柊灞炴�х殑鍊�
+ callback.call(context, newVal, oldVal); // 璋冪敤鍥炶皟鍑芥暟锛屼紶閫掓柊鍊煎拰鏃у��
+ }
+ });
+ },
+
// 杩斿洖
goBack() {
+ console.log(this.data.submitStatus);
wx.navigateBack();
},
//璁剧疆鑳屾櫙鑹�
@@ -201,10 +229,11 @@
this.setData({
currentIndex: e.detail.index
})
- let index = e.detail.index - 1 >= 0 ? e.detail.index - 1 : 0
- let flag = this.isHaveAnswer(this.data.questionDataList[index].userAnswer)
- if (flag) this.handleQuestion(e.detail.index)
-
+ if (this.data.answerType == 'collectQuestion' || this.data.answerType == 'errorQuestion') {
+ let index = e.detail.index - 1 >= 0 ? e.detail.index - 1 : 0
+ let flag = this.isHaveAnswer(this.data.questionDataList[index].userAnswer)
+ if (flag) this.handleQuestion(e.detail.index)
+ }
},
// 鐐瑰嚮绛旈鍗¤烦杞鐩�
goQuestion(e) {
@@ -295,6 +324,8 @@
},
// 鎻愪氦閫昏緫
submitPaper() {
+ // 鍏抽棴閫�鍑洪〉闈㈢洃鍚�
+ wx.disableAlertBeforeUnload()
this.setData({
submitStatus: true
})
@@ -495,6 +526,7 @@
let value = JSON.parse(res[0].value)
// 鏈夌瓟棰樿褰曪紝寰楀垎璧嬪��
if (value) {
+ wx.disableAlertBeforeUnload()
this.setData({
submitStatus: true
})
@@ -508,6 +540,7 @@
this.setData({
currentIndex: value.currentIndex
})
+ console.log(this.data.submitStatus);
// 鎼哄甫绛旈璁板綍 鑾峰彇棰樼洰
await this.getQuestionList(value.dataList)
} else {
diff --git a/packageBookService/pages/bookServices/examination/examination.wxml b/packageBookService/pages/bookServices/examination/examination.wxml
index 1f24f93..f6ed136 100644
--- a/packageBookService/pages/bookServices/examination/examination.wxml
+++ b/packageBookService/pages/bookServices/examination/examination.wxml
@@ -36,6 +36,7 @@
<question-list
wx:if="{{!loading}}"
isNight="{{isNight}}"
+ answerType="{{answerType}}"
currentIndex="{{currentIndex}}"
questionList="{{questionDataList}}"
submitStatus="{{submitStatus}}"
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.js b/packageBookService/pages/bookServices/examination/questionList/index.js
index dfb3b6e..b489b78 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.js
+++ b/packageBookService/pages/bookServices/examination/questionList/index.js
@@ -19,6 +19,10 @@
isNight:{
type:Boolean,
value:false
+ },
+ answerType:{
+ type:Boolean,
+ value:''
}
},
created() {
@@ -45,7 +49,6 @@
methods: {
// 鍒囨崲棰樼洰
changeSwiper(e) {
- console.log(e);
this.setData({
showIndex: e.detail.current
})
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxml b/packageBookService/pages/bookServices/examination/questionList/index.wxml
index a62a5f4..66a3bbf 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxml
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxml
@@ -6,7 +6,7 @@
</view>
<!-- 棰樼洰鍒楄〃 -->
<swiper class="swiper" bind:change="changeSwiper" current="{{currentIndex}}">
- <swiper-item wx:for="{{questionList}}" wx:key="{{item.id}}">
+ <swiper-item wx:for="{{questionList}}" wx:key="{{id}}">
<!-- 棰樺共 -->
<view class="question-stem title-score" style="color: {{isNight ? '#fff' : '#000'}};">
<!-- 棰樺彿 -->
@@ -40,7 +40,7 @@
<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>
- <view class="radio-item {{item.answer == contentItem.value && item.answer == item.userAnswer ? 'radio-correct' : item.userAnswer == contentItem.value && item.userAnswer != item.answer ?'radio-error' :''}}">
+ <view class="radio-item {{item.userAnswer == contentItem.value ? 'radio-active' : ''}} {{(answerType == 'collectQuestion' || answerType == 'errorQuestion') && (item.answer == contentItem.value && item.answer == item.userAnswer ? 'radio-correct' : item.userAnswer == contentItem.value && item.userAnswer != item.answer ?'radio-error' :'')}}">
<!-- 浠呮枃瀛� -->
<text wx:if="{{item.optionStyle == 'Txt'}}">{{contentItem.value}}銆亄{contentItem.txt}}</text>
<!-- 浠呭浘鐗� -->
@@ -59,8 +59,8 @@
<text>{{contentItem.value}}銆�</text>
<rich-text nodes="{{contentItem.txt}}"></rich-text>
</view>
- <text wx:if="{{item.answer == contentItem.value && item.answer == item.userAnswer}}">瀵�</text>
- <text wx:if="{{item.userAnswer == contentItem.value && item.userAnswer != item.answer}}">閿�</text>
+ <text wx:if="{{(answerType == 'collectQuestion' || answerType == 'errorQuestion') && (item.answer == contentItem.value && item.answer == item.userAnswer)}}">瀵�</text>
+ <text wx:if="{{(answerType == 'collectQuestion' || answerType == 'errorQuestion') && (item.userAnswer == contentItem.value && item.userAnswer != item.answer)}}">閿�</text>
</view>
</t-radio>
</view>
diff --git a/packageBookService/pages/bookServices/examination/questionList/index.wxss b/packageBookService/pages/bookServices/examination/questionList/index.wxss
index 1bdc74f..8cb16ff 100644
--- a/packageBookService/pages/bookServices/examination/questionList/index.wxss
+++ b/packageBookService/pages/bookServices/examination/questionList/index.wxss
@@ -51,6 +51,10 @@
background-color: #F9F9F9;
}
+.radio-active {
+ background-color: #ff6c00;
+}
+
.radio-correct {
background-color: #EAF7EE;
}
--
Gitblit v1.9.1