From cf6e9bcbfc64019bb14fb0964576ae3e3bd2fde5 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 26 三月 2025 11:22:20 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/civilServices/view/components/chapter003.vue | 53 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/src/books/civilServices/view/components/chapter003.vue b/src/books/civilServices/view/components/chapter003.vue
index bd6a9fd..1496891 100644
--- a/src/books/civilServices/view/components/chapter003.vue
+++ b/src/books/civilServices/view/components/chapter003.vue
@@ -423,7 +423,7 @@
<span>瑙嗛锛氫汉闄呭惛寮� </span>
<el-tooltip class="item" effect="dark"
:content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start">
- <img :src="collectResourceList.findIndex(item => item.id == 'f230fd8fd7952a4ad4dd05d94df7e797') > -1 ? collectCheck : collectImg"
+ <img :src="collectResourceList.findIndex(item => item.id == '30b4c510514d03ed2902817e6e9f4fb2') > -1 ? collectCheck : collectImg"
alt="" class="collect-btn" @click="handleCollect('video-01')" />
</el-tooltip>
</p>
@@ -722,7 +722,7 @@
</p>
<div class="video-box-left">
<p class="center text">
- <video :src="videoPathOne" webkit-playsinline="true" x-webkit-airplay="true"
+ <video :src="videoPathTwo" webkit-playsinline="true" x-webkit-airplay="true"
playsinline="true" x5-video-orientation="h5" x5-video-player-fullscreen="true"
x5-playsinline="" controls controlslist="nodownload" class="w100 video"
style=" border-radius: 10px; "></video>
@@ -730,9 +730,9 @@
<p class="center videoname">
<span>瑙嗛锛氬鎴戜氦寰�鎶�宸� </span>
<el-tooltip class="item" effect="dark"
- :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start">
- <img :src="collectResourceList.findIndex(item => item.id == 'f230fd8fd7952a4ad4dd05d94df7e797') > -1 ? collectCheck : collectImg"
- alt="" class="collect-btn" @click="handleCollect('video-01')" />
+ :content="chapterData.isCollectVideo01 ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start">
+ <img :src="collectResourceList.findIndex(item => item.id == '114bfb6ee69164a3d24991fe2061fab2') > -1 ? collectCheck : collectImg"
+ alt="" class="collect-btn" @click="handleCollect('video-02')" />
</el-tooltip>
</p>
</div>
@@ -1725,7 +1725,7 @@
<p class="p-even">姘戣埅鏈嶅姟宸ヤ綔涓富瑕佸寘鎷涓嬪叚绉嶅父瑙佺殑娌熼�氶殰纰嶃��</p>
<div class="video-box">
<p class="center text">
- <video :src="videoPathOne" webkit-playsinline="true" x-webkit-airplay="true"
+ <video :src="videoPathThree" webkit-playsinline="true" x-webkit-airplay="true"
playsinline="true" x5-video-orientation="h5" x5-video-player-fullscreen="true"
x5-playsinline="" controls controlslist="nodownload" class="w100 video"
style=" border-radius: 10px; "></video>
@@ -1733,9 +1733,9 @@
<p class="center videoname">
<span>瑙嗛锛氭皯鑸湇鍔′腑甯歌鐨勬矡閫氶殰纰嶇被鍨� </span>
<el-tooltip class="item" effect="dark"
- :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start">
- <img :src="collectResourceList.findIndex(item => item.id == 'f230fd8fd7952a4ad4dd05d94df7e797') > -1 ? collectCheck : collectImg"
- alt="" class="collect-btn" @click="handleCollect('video-01')" />
+ :content="chapterData.isCollectVideo02 ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start">
+ <img :src="collectResourceList.findIndex(item => item.id == ' 4ee774f6507c878e0e2ba42a12cc3362') > -1 ? collectCheck : collectImg"
+ alt="" class="collect-btn" @click="handleCollect('video-03')" />
</el-tooltip>
</p>
</div>
@@ -2039,17 +2039,17 @@
<p class="p-even">鍦ㄦ皯鑸湇鍔″伐浣滀腑锛屼竴鑸湁鍥涘ぇ娌熼�氱瓥鐣ャ��</p>
<div class="video-box">
<p class="center text">
- <video :src="videoPathOne" webkit-playsinline="true" x-webkit-airplay="true"
+ <video :src="videoPathFour" webkit-playsinline="true" x-webkit-airplay="true"
playsinline="true" x5-video-orientation="h5" x5-video-player-fullscreen="true"
x5-playsinline="" controls controlslist="nodownload" class="w100 video"
style=" border-radius: 10px; "></video>
</p>
<p class="center videoname">
- <span>瑙嗛锛氭皯鑸湇鍔＄殑娌熼�氱瓥鐣� </span>
+ <span>瑙嗛锛氭皯鑸湇鍔＄殑娌熼�氱瓥鐣�</span>
<el-tooltip class="item" effect="dark"
- :content="chapterData.isCollectVideo ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start">
- <img :src="collectResourceList.findIndex(item => item.id == 'f230fd8fd7952a4ad4dd05d94df7e797') > -1 ? collectCheck : collectImg"
- alt="" class="collect-btn" @click="handleCollect('video-01')" />
+ :content="chapterData.isCollectVideo03 ? '鐐瑰嚮鍙栨秷' : '鐐瑰嚮鏀惰棌'" placement="top-start">
+ <img :src="collectResourceList.findIndex(item => item.id == ' 8f57603126cedddbcd4be17c34099107') > -1 ? collectCheck : collectImg"
+ alt="" class="collect-btn" @click="handleCollect('video-04')" />
</el-tooltip>
</p>
</div>
@@ -2487,6 +2487,9 @@
collectImg: require("../../assets/images/icon/heart.png"),
collectCheck: require("../../assets/images/icon/heart-check.png"),
videoPathOne: "",
+ videoPathTwo: "",
+ videoPathThree: "",
+ videoPathFour: "",
collectResourceList: [],
questionData: {
isComplete: false,
@@ -2579,6 +2582,8 @@
chapterData: {
isCollectVideo: false,
isCollectVideo01: false,
+ isCollectVideo02: false,
+ isCollectVideo03: false,
},
};
},
@@ -2605,10 +2610,16 @@
methods: {
async getVidoePath() {
this.videoPathOne = await getResourcePath(
- "f230fd8fd7952a4ad4dd05d94df7e797"
+ "30b4c510514d03ed2902817e6e9f4fb2"
);
this.videoPathTwo = await getResourcePath(
- "700cfdb8b85b372045b1e97e3356ae3a"
+ "114bfb6ee69164a3d24991fe2061fab2"
+ );
+ this.videoPathThree = await getResourcePath(
+ " 4ee774f6507c878e0e2ba42a12cc3362"
+ );
+ this.videoPathFour = await getResourcePath(
+ " 8f57603126cedddbcd4be17c34099107"
);
for (let index = 0; index < this.chapter003.videoMd5.length; index++) {
const item = this.chapter003.videoMd5[index];
@@ -2651,10 +2662,16 @@
this.handleCollectResource(e.md5, e.md5, '', "瑙嗛", "bits", '寰灏忚鍫傦細' + e.name)
e.isCollectVideo = !e.isCollectVideo
} else if (e == 'video-01') {
- this.handleCollectResource("f230fd8fd7952a4ad4dd05d94df7e797", "f230fd8fd7952a4ad4dd05d94df7e797", '', "瑙嗛", "bits", '瑙嗛锛氬績鐞嗗鐨勬祦娲�')
+ this.handleCollectResource("30b4c510514d03ed2902817e6e9f4fb2", "30b4c510514d03ed2902817e6e9f4fb2", '', "瑙嗛", "bits", '瑙嗛锛氫汉闄呭惛寮�')
this.chapterData.isCollectVideo = !this.chapterData.isCollectVideo
} else if (e == 'video-02') {
- this.handleCollectResource("700cfdb8b85b372045b1e97e3356ae3a", "700cfdb8b85b372045b1e97e3356ae3a", '', "瑙嗛", "bits", '瑙嗛锛氬績鐞嗗鐨勭爺绌跺唴瀹�')
+ this.handleCollectResource("114bfb6ee69164a3d24991fe2061fab2", "114bfb6ee69164a3d24991fe2061fab2", '', "瑙嗛", "bits", '瑙嗛锛氬鎴戜氦寰�鎶�宸�')
+ this.chapterData.isCollectVideo01 = !this.chapterData.isCollectVideo01
+ }else if (e == 'video-03') {
+ this.handleCollectResource(" 4ee774f6507c878e0e2ba42a12cc3362", " 4ee774f6507c878e0e2ba42a12cc3362", '', "瑙嗛", "bits", '瑙嗛锛氭皯鑸湇鍔′腑甯歌鐨勬矡閫氶殰纰嶇被鍨�')
+ this.chapterData.isCollectVideo01 = !this.chapterData.isCollectVideo01
+ }else if (e == 'video-04') {
+ this.handleCollectResource(" 8f57603126cedddbcd4be17c34099107", " 8f57603126cedddbcd4be17c34099107", '', "瑙嗛", "bits", '瑙嗛锛氭皯鑸湇鍔＄殑娌熼�氱瓥鐣�')
this.chapterData.isCollectVideo01 = !this.chapterData.isCollectVideo01
}
this.handlechapter003();
--
Gitblit v1.9.1