From e90c18770dfccded106c395c05dbc88d8fd99040 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 15 四月 2024 16:17:21 +0800
Subject: [PATCH] 答题器，详情页bug修改
---
packageBookService/pages/bookServices/examination/examination.js | 98 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 84 insertions(+), 14 deletions(-)
diff --git a/packageBookService/pages/bookServices/examination/examination.js b/packageBookService/pages/bookServices/examination/examination.js
index f3924ad..a819f70 100644
--- a/packageBookService/pages/bookServices/examination/examination.js
+++ b/packageBookService/pages/bookServices/examination/examination.js
@@ -30,6 +30,7 @@
total: 0, // 棰樼洰鎬绘暟
cardList: [], // 鎻愪氦椤�,
questionDataList: [], // 鏄剧ず棰樼洰鍒楄〃
+ noData: false,
mockid: 0,
uuid: 0,
mockData: {
@@ -46,6 +47,7 @@
sliderValue: 0, // 瀛椾綋婊戝潡
startTime: "", //杩涘叆椤甸潰褰撳墠鏃堕棿
pauseTime: 0, //鏆傚仠鏃堕棿
+
},
/**
@@ -73,7 +75,6 @@
});
}
this.init();
- console.log("浼犲弬", options);
},
/**
@@ -180,7 +181,6 @@
// 鐩戝惉watch
watch(context, variableName, callback) {
let value = context.data[variableName]; // 鑾峰彇琚洃鍚睘鎬х殑褰撳墠鍊�
-
// 浣跨敤 Object.defineProperty 鏂规硶鍦ㄦ暟鎹璞′笂瀹氫箟灞炴�х殑 getter 鍜� setter
Object.defineProperty(context.data, variableName, {
configurable: true, // 鍙厤缃�
@@ -195,6 +195,35 @@
},
});
},
+
+ // 姝ｅ垯鎵惧嚭鍚姏src
+ extractSourceSrc(htmlString) {
+ // 姝ｅ垯琛ㄨ揪寮忓尮閰�<source>鏍囩涓殑src灞炴�у��
+ var srcRegex = /<source\s+src="([^"]+)"/i;
+ var srcTwo = /<audio\s+src="([^"]+)"/i;
+
+ // 鎵ц姝ｅ垯鍖归厤
+ var match = srcRegex.exec(htmlString);
+ const local = srcTwo.exec(htmlString)
+ // 濡傛灉鍖归厤鎴愬姛锛岃繑鍥炵涓�涓崟鑾风粍鐨勫唴瀹癸紙src灞炴�х殑鍊硷級
+ if (match && match[1]) {
+ return match[1].replace('../file', app.config.requestCtx + '/file');
+ } else if (local && local[1]) {
+ return local[1].replace('../file', app.config.requestCtx + '/file')
+ } else {
+ // 濡傛灉娌℃湁鍖归厤鍒帮紝杩斿洖null
+ return null;
+ }
+ },
+
+ // 鎷垮埌鍚姏棰橀櫎audio鏍囩澶栧叾浠栧唴瀹�
+ removeVideoAndAudioTags(htmlString) {
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忓尮閰嶅苟绉婚櫎鎵�鏈夌殑 <video> 鍜� <audio> 鏍囩
+ var cleanedHtml = htmlString.replace(/<video[^>]*>[\s\S]*?<\/video>|<audio[^>]*>[\s\S]*?<\/audio>/gi, '');
+
+ return cleanedHtml;
+ },
+
// 鏀瑰彉loading鐘舵��
changeLoadingState() {
this.setData({
@@ -463,7 +492,6 @@
loading: true,
});
const child = this.selectComponent("#question-options");
- debugger
if (
this.data.answerType == "option" ||
this.data.answerType == "errorQuestion" ||
@@ -697,7 +725,6 @@
this.setData({
currentIndex: value.currentIndex,
});
- console.log(this.data.submitStatus);
// 鎼哄甫绛旈璁板綍 鑾峰彇棰樼洰
await this.getQuestionList(value.dataList);
} else {
@@ -726,6 +753,7 @@
async getQuestionList(oldData) {
// 娓呯┖姝ｇ‘棰樻暟璁板綍
this.setData({
+ noData: false,
cardList: [],
correctNum: 0,
});
@@ -843,7 +871,7 @@
/\<img/gi,
'<img style="max-width: 300rpx !important;object-fit: contain;" class="stem-rich-img" '
)
- .replace(/\<p/gi, '<p class="stem-rich-p"');
+ .replace(/\<p/gi, '<p class="stem-rich-p"').replace('../file', app.config.requestCtx + '/file');
}
// 閫夐」瀵屾枃鏈鐞�
if (
@@ -856,7 +884,7 @@
if (item.txt)
item.txt = item.txt
.replace(/\<img/gi, '<img class="option-rich-img"')
- .replace(/\<p/gi, '<p class="stem-rich-p"');
+ .replace(/\<p/gi, '<p class="stem-rich-p"').replace('../file', app.config.requestCtx + '/file');
});
}
// 瑙ｆ瀽瀵屾枃鏈鐞�
@@ -868,6 +896,14 @@
/\<img/gi,
'<img style="max-width: 300rpx !important;object-fit: contain;" class="stem-rich-img" '
);
+ }
+ // 鍚姏棰樹慨鏀�
+ if (questionObj.questionType == 'singleChoice') {
+ const src = this.extractSourceSrc(questionObj.stem.stemTxt)
+ if (src) {
+ questionObj.src = src
+ questionObj.stem.stemTxt = this.removeVideoAndAudioTags(questionObj.stem.stemTxt)
+ }
}
// 鑾峰彇鍥剧墖
if (
@@ -947,7 +983,14 @@
});
}
// 鏈夐鐩啀寮�濮嬪�掕鏃�
- if (this.data.questionDataList.length) this.startCountdown();
+ if (this.data.questionDataList.length) {
+ // console.log(this.data.questionDataList);
+ this.startCountdown();
+ } else {
+ this.setData({
+ noData: true
+ })
+ }
this.setData({
loading: false,
});
@@ -1196,6 +1239,7 @@
} else {
this.setData({
loading: false,
+ noData: true
});
wx.showModal({
title: "鎻愮ず",
@@ -1347,7 +1391,7 @@
/\<img/gi,
'<img style="max-width: 300rpx !important;object-fit: contain;" class="stem-rich-img" '
)
- .replace(/\<p/gi, '<p class="stem-rich-p"');
+ .replace(/\<p/gi, '<p class="stem-rich-p"').replace('../file', app.config.requestCtx + '/file');
}
// 閫夐」瀵屾枃鏈鐞�
if (
@@ -1360,7 +1404,7 @@
if (item.txt)
item.txt = item.txt
.replace(/\<img/gi, '<img class="option-rich-img"')
- .replace(/\<p/gi, '<p class="stem-rich-p"');
+ .replace(/\<p/gi, '<p class="stem-rich-p"').replace('../file', app.config.requestCtx + '/file');
});
}
// 瑙ｆ瀽瀵屾枃鏈鐞�
@@ -1372,6 +1416,14 @@
/\<img/gi,
'<img style="max-width: 300rpx !important;object-fit: contain;" class="stem-rich-img" '
);
+ }
+ // 鍚姏棰樹慨鏀�
+ if (questionObj.questionType == 'singleChoice') {
+ const src = this.extractSourceSrc(questionObj.stem.stemTxt)
+ if (src) {
+ questionObj.src = src
+ questionObj.stem.stemTxt = this.removeVideoAndAudioTags(questionObj.stem.stemTxt)
+ }
}
if (item.Embedded_QuestionBank_QuestionType == "judge") {
questionObj.type = "鍒ゆ柇棰�";
@@ -1435,7 +1487,8 @@
this.getErrorDataList();
} else {
this.setData({
- loading: true,
+ loading: false,
+ noData: true
});
wx.showModal({
title: "鎻愮ず",
@@ -1586,7 +1639,7 @@
/\<img/gi,
'<img style="max-width: 300rpx !important;object-fit: contain;" class="stem-rich-img" '
)
- .replace(/\<p/gi, '<p class="stem-rich-p"');
+ .replace(/\<p/gi, '<p class="stem-rich-p"').replace('../file', app.config.requestCtx + '/file');
}
// 閫夐」瀵屾枃鏈鐞�
if (
@@ -1599,7 +1652,7 @@
if (item.txt)
item.txt = item.txt
.replace(/\<img/gi, '<img class="option-rich-img"')
- .replace(/\<p/gi, '<p class="stem-rich-p"');
+ .replace(/\<p/gi, '<p class="stem-rich-p"').replace('../file', app.config.requestCtx + '/file');
});
}
// 瑙ｆ瀽瀵屾枃鏈鐞�
@@ -1611,6 +1664,15 @@
/\<img/gi,
'<img style="max-width: 300rpx !important;object-fit: contain;" class="stem-rich-img" '
);
+ }
+ // 鍚姏棰樹慨鏀�
+ if (questionObj.questionType == 'singleChoice') {
+ const src = this.extractSourceSrc(questionObj.stem.stemTxt)
+ if (src) {
+ questionObj.src = src
+ questionObj.stem.stemTxt = this.removeVideoAndAudioTags(questionObj.stem.stemTxt)
+ console.log('棰樺共', questionObj.stem.stemTxt);
+ }
}
if (item.Embedded_QuestionBank_QuestionType == "judge") {
questionObj.type = "鍒ゆ柇棰�";
@@ -1847,7 +1909,7 @@
questionObj.stem.stemTxt = questionObj.stem.stemTxt.replace(
/\<img/gi,
'<img style="max-width: 300rpx !important;object-fit: contain;" class="stem-rich-img"'
- );
+ ).replace(/\<p/gi, '<p class="stem-rich-p"').replace('../file', app.config.requestCtx + '/file');
}
// 閫夐」瀵屾枃鏈鐞�
if (
@@ -1861,9 +1923,17 @@
item.txt = item.txt.replace(
/\<img/gi,
'<img class="option-rich-img"'
- );
+ ).replace(/\<p/gi, '<p class="stem-rich-p"').replace('../file', app.config.requestCtx + '/file');
});
}
+ // 鍚姏棰樹慨鏀�
+ if (questionObj.questionType == 'singleChoice') {
+ const src = this.extractSourceSrc(questionObj.stem.stemTxt)
+ if (src) {
+ questionObj.src = src
+ questionObj.stem.stemTxt = this.removeVideoAndAudioTags(questionObj.stem.stemTxt)
+ }
+ }
// 鑾峰彇鍥剧墖
if (
questionObj.stemStyle == "Image" ||
--
Gitblit v1.9.1