From 447fad1797cc37d2a9e2d5129ce74af728fa8836 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 27 六月 2024 18:23:05 +0800
Subject: [PATCH] 题目公共请求方法添加收藏获取
---
.env.product | 4 +-
src/books/artAndDance/view/components/chapter003.vue | 2
src/books/artAndDance/view/components/chapter002.vue | 2
src/books/artAndDance/view/components/chapter001.vue | 2
src/books/artAndDance/view/components/chapter004.vue | 2
src/books/artAndDance/view/components/chapter005.vue | 2
src/books/artAndDance/view/components/index.vue | 21 ++++++++++
src/assets/methods/examination.js | 44 ++++++++++++++++++++-
src/App.vue | 2
src/books/childHealth/view/content/index.vue | 11 -----
src/books/artAndDance/assets/main.less | 7 +++
11 files changed, 77 insertions(+), 22 deletions(-)
diff --git a/.env.product b/.env.product
index 307f663..3958a74 100644
--- a/.env.product
+++ b/.env.product
@@ -1,6 +1,6 @@
VUE_APP_ENV = 'product'
VUE_APP_API_URL = "https://jsek.bnuic.com"
VUE_APP_RESOURCE_CTX = 'https://jsek.bnuic.com/books/resource/'
-VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/artAndDrama'
+VUE_APP_PUBLIC_PATH = 'https://jsek.bnuic.com/books/book/english'
VUE_APP_BOOK_LIST = "childHealth/lifeCare/sportsAndHealth/embedded/english/artAndDance/artAndDrama/mathBook"
-VUE_APP_BOOK_ID = 'artAndDrama'
\ No newline at end of file
+VUE_APP_BOOK_ID = 'english'
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index ef3b19b..65f4077 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -65,7 +65,7 @@
process.env.VUE_APP_RESOURCE_CTX +
(process.env.VUE_APP_ENV == "product"
? process.env.VUE_APP_BOOK_ID
- : "english")
+ : "childHealth")
);
// 娴嬭瘯璇曡30椤�
// this.activeBook.tryPageCount = 10;
diff --git a/src/assets/methods/examination.js b/src/assets/methods/examination.js
index 0da5175..e4c2cd1 100644
--- a/src/assets/methods/examination.js
+++ b/src/assets/methods/examination.js
@@ -1,7 +1,9 @@
import MG from "@/assets/js/middleGround/WebMiddleGroundApi";
import getPublicImage from "@/assets/js/middleGround/tool";
+// 鑾峰彇棰樼洰鍒楄〃
const getQuestionList = async (page, questionList, activeBook) => {
- console.log("page", page);
+const collectList = await getCollectList(activeBook)
+console.log('鏀惰棌鍒楄〃',collectList);
const oldAnswerData = localStorage.getItem(activeBook.name + "oldAnswerData");
let oldData = null;
let oldList = [];
@@ -97,7 +99,7 @@
isSubmit: false, // 鏌ョ湅瑙ｆ瀽
isRight: null, // 鏄惁姝ｇ‘
isComplete: false,
- isCollect: true,
+ isCollect: collectList.indexOf(qitem) > -1 ? true : false,
isUnfold: "",
};
// 澶氶�夊拰濉┖绛旀鑲负鏁扮粍锛岃杞崲JSON鏍煎紡
@@ -222,7 +224,43 @@
}
return cardList.filter((item) => item.infoList.length > 0);
};
-
+// 鑾峰彇鏀惰棌鍒楄〃
+const getCollectList = async(activeBook) => {
+ const allCollect = [
+ {
+ type:'bits',
+ collectList:[]
+ },
+ {
+ type:'json',
+ collectList:[]
+ },
+ ]
+ await MG.identity
+ .getUserKey({
+ domain: 'collectData',
+ keys: [activeBook.bookId]
+ })
+ .then((res) => {
+ try {
+ const collect = JSON.parse(res[0].value)
+ if (collect.length) {
+ allCollect[0].collectList = collect.find(
+ (citem) => citem.type == 'bits'
+ ).collectList
+ allCollect[1].collectList = collect.find(
+ (citem) => citem.type == 'json'
+ ).collectList
+ }
+ } catch (error) {
+ console.log('鏆傛棤鏁版嵁')
+ }
+ })
+ .catch(() => {
+ console.log('鑾峰彇鏀惰棌鎶ラ敊');
+ })
+ return allCollect.find(item => item.type == 'bits').collectList
+}
const getQuestionData = async (chapter, chapterData, activeBook) => {
const data = { ...chapterData };
const oldAnswerData = localStorage.getItem("oldAnswerData");
diff --git a/src/books/artAndDance/assets/main.less b/src/books/artAndDance/assets/main.less
index 6b92359..95b4af5 100644
--- a/src/books/artAndDance/assets/main.less
+++ b/src/books/artAndDance/assets/main.less
@@ -454,6 +454,13 @@
}
}
}
+@media (max-width:820px) {
+ .ans-dance {
+ .page-box {
+ min-height: 500px;
+ }
+ }
+}
@media (min-width: 660px) {
.ans-dance {
.page-padding {
diff --git a/src/books/artAndDance/view/components/chapter001.vue b/src/books/artAndDance/view/components/chapter001.vue
index f27f6fc..d462483 100644
--- a/src/books/artAndDance/view/components/chapter001.vue
+++ b/src/books/artAndDance/view/components/chapter001.vue
@@ -79,7 +79,7 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100"
+ class="w100 video"
style="margin-top: 40px;"
></video>
</div>
diff --git a/src/books/artAndDance/view/components/chapter002.vue b/src/books/artAndDance/view/components/chapter002.vue
index 392469b..08778f8 100644
--- a/src/books/artAndDance/view/components/chapter002.vue
+++ b/src/books/artAndDance/view/components/chapter002.vue
@@ -119,7 +119,7 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100"
+ class="w100 video"
style="margin-top: 40px;"
></video>
<h2 class="lefth2 mt-40" id="b007">
diff --git a/src/books/artAndDance/view/components/chapter003.vue b/src/books/artAndDance/view/components/chapter003.vue
index c31a403..7091624 100644
--- a/src/books/artAndDance/view/components/chapter003.vue
+++ b/src/books/artAndDance/view/components/chapter003.vue
@@ -79,7 +79,7 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100"
+ class="w100 video"
style="margin-top: 40px;"
></video>
</div>
diff --git a/src/books/artAndDance/view/components/chapter004.vue b/src/books/artAndDance/view/components/chapter004.vue
index ee3064c..73e3e16 100644
--- a/src/books/artAndDance/view/components/chapter004.vue
+++ b/src/books/artAndDance/view/components/chapter004.vue
@@ -83,7 +83,7 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100"
+ class="w100 video"
style="margin-top: 40px;"
></video>
</div>
diff --git a/src/books/artAndDance/view/components/chapter005.vue b/src/books/artAndDance/view/components/chapter005.vue
index 9b5dc90..032ca3e 100644
--- a/src/books/artAndDance/view/components/chapter005.vue
+++ b/src/books/artAndDance/view/components/chapter005.vue
@@ -111,7 +111,7 @@
x5-playsinline=""
controls
controlslist="nodownload"
- class="w100"
+ class="w100 video"
style="margin:38px 0"
></video>
<h2 class="lefth2" id="b003">
diff --git a/src/books/artAndDance/view/components/index.vue b/src/books/artAndDance/view/components/index.vue
index 9c7b0c0..0d85c36 100644
--- a/src/books/artAndDance/view/components/index.vue
+++ b/src/books/artAndDance/view/components/index.vue
@@ -119,6 +119,7 @@
this.initSwiper();
this.initViewer();
this.closeAudio()
+ this.closeVideo()
}, 200);
},
},
@@ -895,7 +896,6 @@
closeMiniAudio() {
this.audioPath = "";
},
-
// 鐐瑰嚮闊抽鎾斁锛屽叧闂叾浠栭煶棰�
closeAudio() {
let allAudio = (
@@ -915,6 +915,25 @@
this.closeMiniAudio()
})
}
+ },
+ // 鐐瑰嚮瑙嗛鍏抽棴鍏朵粬
+ closeVideo() {
+ let allVideo = (
+ this.container ? this.container : document
+ ).querySelectorAll(".video");
+ for (let index = 0; index < allVideo.length; index++) {
+ const item = allVideo[index];
+ item.addEventListener('playing',(item) => {
+ const path = item.srcElement.src
+ const videoList = Array.from(allVideo);
+ for (let cindex = 0; cindex < videoList.length; cindex++) {
+ const citem = videoList[cindex];
+ if(citem.currentSrc != path && path) {
+ citem.pause()
+ }
+ }
+ })
+ }
}
},
components: {
diff --git a/src/books/childHealth/view/content/index.vue b/src/books/childHealth/view/content/index.vue
index 6b0600d..0b2d947 100644
--- a/src/books/childHealth/view/content/index.vue
+++ b/src/books/childHealth/view/content/index.vue
@@ -898,6 +898,7 @@
// 璺宠浆
this.gotoPage(data.catalog, data.page, () => {});
},
+ // 鐐瑰嚮瑙嗛鍏抽棴鍏朵粬
closeVideo() {
let allVideo = (
this.container ? this.container : document
@@ -907,7 +908,6 @@
item.addEventListener('playing',(item) => {
const path = item.srcElement.src
const videoList = Array.from(allVideo);
- console.log('鎾斁',item);
for (let cindex = 0; cindex < videoList.length; cindex++) {
const citem = videoList[cindex];
if(citem.currentSrc != path && path) {
@@ -917,15 +917,6 @@
})
}
}
- // allVideo = Array.from(allVideo);
- // if(allVideo.length) {
- // for (let index = 0; index < allVideo.length; index++) {
- // const item = allVideo[index];
- // if(item.currentSrc != path) {
- // item.pause()
- // }
- // }
- // }
},
components: {
pageHeader,
--
Gitblit v1.9.1