From 37a205e037614e497b00a076f5bc83520337dbea Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 07 十一月 2024 14:43:01 +0800
Subject: [PATCH] 云学习资源类型
---
packageDomain/pages/resourceDetails/document/index.js | 25 ++++---
packageBookService/pages/bookServices/detail/components/tree/index.wxml | 28 ++++----
packageDomain/pages/resourceDetails/document/index.wxml | 10 +-
packageBookService/pages/bookServices/detail/components/tree/index.js | 6 +-
pages/digitalCourses/digitalCoursesDetails/components/tree/index.js | 30 +++++----
pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxml | 70 +++++++++++++++++++++++
6 files changed, 123 insertions(+), 46 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index d40cad3..a6e144b 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -176,7 +176,7 @@
const parentName = parent ? parent.name : "鏁欏璧勬簮";
// 璧勬簮璐拱椤甸潰(鍙睍绀烘湭璐拱璧勬簮) 鐐瑰嚮涓嶈烦杞�
if (this.properties.isShowCheck) return false;
- if (item.selectType == "webpage") {
+ if (item.selectType == "webpage" || item.learnSelectType == "webpage") {
// 缃戦〉绫诲瀷璺宠浆鍒扮綉鍧�澶嶅埗椤碉紝鍥犱负url浼犲弬涓嶈兘浼� 甯﹀弬鏁扮殑缃戠粶鍦板潃锛屾墍浠ユ澶勮鎶婄綉缁滃湴鍧�閲岀殑浼犲弬鎽樺嚭鏉ワ紝鏀惧埌url閲�
let urlData = ''
const flags = item.jsek_link.indexOf("?")
@@ -194,7 +194,7 @@
title: '鏆傛棤璧勬簮',
})
}
- if (item.selectType == 'zip') {
+ if (item.selectType == 'zip' || item.learnSelectType == 'zip') {
// if (this.properties.applyState == 'Normal') {
return wx.showToast({
icon: 'error',
@@ -251,7 +251,7 @@
) {
url = "/packageDomain/pages/resourceDetails/myAudio/index";
}
- if (item.selectType == "picture" || item.selectType == 'document' || item.selectType == 'pdf') {
+ if (item.selectType == "picture" || item.selectType == 'document' || item.selectType == 'pdf' || item.learnSelectType == "picture" || item.learnSelectType == 'document' || item.learnSelectType == 'pdf') {
url = "/packageDomain/pages/resourceDetails/document/index";
}
wx.navigateTo({
diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
index fc81d48..aeb2510 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml
@@ -47,37 +47,37 @@
mode="aspectFill"
/>
<image
- wx:elif="{{item.selectType == 'pdf'}}"
+ wx:elif="{{item.selectType == 'pdf' || item.learnSelectType == 'pdf'}}"
src="/static/images/bookService/detail/pdf.png"
mode="aspectFill"
/>
<image
- wx:elif="{{item.selectType == 'webpage'}}"
+ wx:elif="{{item.selectType == 'webpage' || item.learnSelectType == 'webpage'}}"
src="/static/images/bookService/detail/net.png"
mode="aspectFill"
/>
<image
- wx:elif="{{item.selectType == 'picture'}}"
+ wx:elif="{{item.selectType == 'picture' || item.learnSelectType == 'picture'}}"
src="/static/images/bookService/detail/picture.png"
mode="aspectFill"
/>
<image
- wx:elif="{{item.selectType == 'zip'}}"
+ wx:elif="{{item.selectType == 'zip' || item.learnSelectType == 'zip'}}"
src="/static/images/bookService/detail/zip.png"
mode="aspectFill"
/>
<image
- wx:elif="{{ item.fileMap[item.file].extension == 'doc' || item.fileMap[item.file].extension == 'docx' || item.fileMap[item.freeFile].extension == 'doc' || item.fileMap[item.freeFile].extension == 'docx'}}"
+ wx:elif="{{ item.fileMap[item.file].extension == 'doc' || item.fileMap[item.file].extension == 'docx' || item.fileMap[item.freeFile].extension == 'doc' || item.fileMap[item.freeFile].extension == 'docx' || item.fileMap[item.protectedFile].extension == 'doc' || item.fileMap[item.protectedFile].extension == 'docx'}}"
src="/static/images/bookService/detail/word.png"
mode="aspectFill"
/>
<image
- wx:elif="{{ item.fileMap[item.file].extension == 'xlsx' || item.fileMap[item.file].extension == 'xlsx' || item.fileMap[item.freeFile].extension == 'xlsx' || item.fileMap[item.freeFile].extension == 'xlsx'}}"
+ wx:elif="{{ item.fileMap[item.file].extension == 'xls' || item.fileMap[item.file].extension == 'xlsx' || item.fileMap[item.freeFile].extension == 'xls' || item.fileMap[item.freeFile].extension == 'xlsx' || item.fileMap[item.protectedFile].extension == 'xls' || item.fileMap[item.protectedFile].extension == 'xlsx'}}"
src="/static/images/bookService/detail/excel.png"
mode="aspectFill"
/>
<image
- wx:elif="{{ item.fileMap[item.file].extension == 'ppt' || item.fileMap[item.file].extension == 'pptx' || item.fileMap[item.freeFile].extension == 'ppt' || item.fileMap[item.freeFile].extension == 'pptx'}}"
+ wx:elif="{{ item.fileMap[item.file].extension == 'ppt' || item.fileMap[item.file].extension == 'pptx' || item.fileMap[item.freeFile].extension == 'ppt' || item.fileMap[item.freeFile].extension == 'pptx' || item.fileMap[item.protectedFile].extension == 'ppt' || item.fileMap[item.protectedFile].extension == 'pptx'}}"
src="/static/images/bookService/detail/PPT.png"
mode="aspectFill"
/>
@@ -222,37 +222,37 @@
mode="aspectFill"
/>
<image
- wx:elif="{{citem.selectType == 'pdf'}}"
+ wx:elif="{{citem.selectType == 'pdf' || citem.learnSelectType == 'pdf'}}"
src="/static/images/bookService/detail/pdf.png"
mode="aspectFill"
/>
<image
- wx:elif="{{citem.selectType == 'webpage'}}"
+ wx:elif="{{citem.selectType == 'webpage' || citem.learnSelectType == 'webpage'}}"
src="/static/images/bookService/detail/net.png"
mode="aspectFill"
/>
<image
- wx:elif="{{citem.selectType == 'picture'}}"
+ wx:elif="{{citem.selectType == 'picture' || citem.learnSelectType == 'picture'}}"
src="/static/images/bookService/detail/picture.png"
mode="aspectFill"
/>
<image
- wx:elif="{{citem.selectType == 'zip'}}"
+ wx:elif="{{citem.selectType == 'zip' || citem.learnSelectType == 'zip'}}"
src="/static/images/bookService/detail/zip.png"
mode="aspectFill"
/>
<image
- wx:elif="{{ citem.fileMap[citem.file].extension == 'doc' || citem.fileMap[citem.file].extension == 'docx' || citem.fileMap[citem.freeFile].extension == 'doc' || citem.fileMap[citem.freeFile].extension == 'docx'}}"
+ wx:elif="{{ citem.fileMap[citem.file].extension == 'doc' || citem.fileMap[citem.file].extension == 'docx' || citem.fileMap[citem.freeFile].extension == 'doc' || citem.fileMap[citem.freeFile].extension == 'docx' || citem.fileMap[citem.protectedFile].extension == 'doc' || citem.fileMap[citem.protectedFile].extension == 'docx'}}"
src="/static/images/bookService/detail/word.png"
mode="aspectFill"
/>
<image
- wx:elif="{{ citem.fileMap[citem.file].extension == 'xlsx' || citem.fileMap[citem.file].extension == 'xlsx' || citem.fileMap[citem.freeFile].extension == 'xlsx' || citem.fileMap[citem.freeFile].extension == 'xlsx' }}"
+ wx:elif="{{ citem.fileMap[citem.file].extension == 'xls' || citem.fileMap[citem.file].extension == 'xlsx' || citem.fileMap[citem.freeFile].extension == 'xls' || citem.fileMap[citem.freeFile].extension == 'xlsx' || citem.fileMap[citem.protectedFile].extension == 'xls' || citem.fileMap[citem.protectedFile].extension == 'xlsx' }}"
src="/static/images/bookService/detail/excel.png"
mode="aspectFill"
/>
<image
- wx:elif="{{ citem.fileMap[citem.file].extension == 'ppt' || citem.fileMap[citem.file].extension == 'pptx' || citem.fileMap[citem.freeFile].extension == 'ppt' || citem.fileMap[citem.freeFile].extension == 'pptx'}}"
+ wx:elif="{{ citem.fileMap[citem.file].extension == 'ppt' || citem.fileMap[citem.file].extension == 'pptx' || citem.fileMap[citem.freeFile].extension == 'ppt' || citem.fileMap[citem.freeFile].extension == 'pptx' || citem.fileMap[citem.protectedFile].extension == 'ppt' || citem.fileMap[citem.protectedFile].extension == 'pptx'}}"
src="/static/images/bookService/detail/PPT.png"
mode="aspectFill"
/>
diff --git a/packageDomain/pages/resourceDetails/document/index.js b/packageDomain/pages/resourceDetails/document/index.js
index 2001062..ab77867 100644
--- a/packageDomain/pages/resourceDetails/document/index.js
+++ b/packageDomain/pages/resourceDetails/document/index.js
@@ -29,6 +29,7 @@
showData: '',
titleName: '',
selectType: '',
+ learnSelectType: '',
zipData: '',
naturalResources: [],
titleName: '',
@@ -199,7 +200,8 @@
this.handleTeachData(item)
this.setData({
titleName: item.name,
- selectType: item.selectType
+ selectType: item.selectType,
+ learnSelectType: item.learnSelectType
})
}
})
@@ -217,14 +219,15 @@
})
}
}
- if (!item || !item.file) {
+ if (!item || !item.file || !item.protectedFile) {
wx.showToast({
title: '鏂囦欢淇℃伅缂哄け',
icon: 'none'
});
return;
}
- const downloadUrl = app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file;
+ let file = item.file ? item.file : item.protectedFile
+ const downloadUrl = app.config.requestCtx + '/file/api/ApiDownload?md5=' + file;
wx.showLoading({
title: '姝ｅ湪涓嬭浇...',
});
@@ -282,21 +285,22 @@
//鍒氳繘鏉ョ殑鏃跺�欒皟鐢�
handleTeachData(item) {
//鍥剧墖
- if (item.selectType == 'picture') {
+ if (item.selectType == 'picture' || item.learnSelectType == 'picture') {
+ let file = item.file ? item.file : item.protectedFile ? item.protectedFile : item.freeFile
this.setData({
- showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile,
+ showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + file,
})
wx.hideLoading();
}
// 涓嬭浇鏂囦欢zip
- if (item.selectType == 'zip') {
+ if (item.selectType == 'zip' || item.learnSelectType == 'zip') {
this.setData({
zipData: item
})
wx.hideLoading();
}
//缃戦〉
- if (item.selectType == 'webpage') {
+ if (item.selectType == 'webpage' || item.learnSelectType == 'webpage') {
this.setData({
webpageSrc: item.jsek_link
})
@@ -312,8 +316,8 @@
// })
// }
//鏂囨。绛�
- if (item.selectType == 'document' || item.selectType == 'pdf') {
- let md5 = item.file ? item.file : item.freeFile
+ if (item.selectType == 'document' || item.selectType == 'pdf' || item.learnSelectType == 'document' || item.learnSelectType == 'pdf') {
+ let md5 = item.file ? item.file : item.protectedFile ? item.protectedFile : item.freeFile
app.MG.file.getPdfInfo({
md5: md5
}).then((res) => {
@@ -335,8 +339,7 @@
handleTap: function () {
const naturalResources = this.data.naturalResources;
- naturalResources.forEach(function (item) {
- });
+ naturalResources.forEach(function (item) {});
},
onClick() {
diff --git a/packageDomain/pages/resourceDetails/document/index.wxml b/packageDomain/pages/resourceDetails/document/index.wxml
index 7b7b5ca..a850da9 100644
--- a/packageDomain/pages/resourceDetails/document/index.wxml
+++ b/packageDomain/pages/resourceDetails/document/index.wxml
@@ -8,11 +8,11 @@
-->
-<view class="titleNameBox" wx:if="{{selectType != 'webpage'}}">
+<view class="titleNameBox" wx:if="{{selectType != 'webpage' && learnSelectType != 'webpage'}}">
{{titleName}}
</view>
<!-- bind:tap="onClick" -->
-<view class="pictureBox" wx:if="{{selectType == 'picture'}}">
+<view class="pictureBox" wx:if="{{selectType == 'picture' || learnSelectType == 'picture'}}">
<!-- style="width: {{(newScale <= 5 ? newScale: 5) * 100}}%;" -->
<image
src="{{showData}}"
@@ -22,7 +22,7 @@
/>
</view>
-<view wx:if="{{selectType == 'zip'}}">
+<view wx:if="{{selectType == 'zip' || learnSelectType == 'zip'}}">
<view class="zipImageBox">
<image src="/static/images/document/zip200px.png" mode="aspectFill" />
</view>
@@ -34,7 +34,7 @@
</view>
</view>
-<view wx:if="{{selectType == 'pdf' || selectType == 'document'}}">
+<view wx:if="{{selectType == 'pdf' || selectType == 'document' || learnSelectType == 'pdf' || learnSelectType == 'document'}}">
<view
wx:for="{{naturalResources}}"
wx:key="index"
@@ -55,7 +55,7 @@
<!-- <web-view src="{{pdfSrc}}" id="web-view-pdf" /> -->
</view>
-<web-view wx:if="{{selectType == 'webpage'}}" src="{{webpageSrc}}"></web-view>
+<web-view wx:if="{{selectType == 'webpage' || learnSelectType == 'webpage'}}" src="{{webpageSrc}}"></web-view>
<!-- <button bind:tap="handleTap">鐐逛綅</button> -->
<!-- <t-button theme="primary" size="large" variant="outline" block>鍩虹鍥剧墖棰勮</t-button> -->
diff --git a/pages/digitalCourses/digitalCoursesDetails/components/tree/index.js b/pages/digitalCourses/digitalCoursesDetails/components/tree/index.js
index eb23e7c..c2eaecc 100644
--- a/pages/digitalCourses/digitalCoursesDetails/components/tree/index.js
+++ b/pages/digitalCourses/digitalCoursesDetails/components/tree/index.js
@@ -65,7 +65,6 @@
// 妫�鏌ョ櫥褰曠姸鎬�
const token = wx.getStorageSync(app.config.tokenKey);
if (token) {
-
const item = e.currentTarget.dataset.item;
const parent = e.currentTarget.dataset.parent;
const isTry = e.currentTarget.dataset.istry;
@@ -80,24 +79,29 @@
title: '璇峰厛璐拱璇ヨ绋�',
})
}
- if (item.selectType == 'zip') {
- if (this.properties.applyState == 'Normal') {
- return wx.showToast({
- icon: 'error',
- title: '璇峰墠寰�PC绔笅杞�',
- })
- } else {
- return wx.showToast({
- icon: 'error',
- title: '璇峰厛鐢宠涓嬭浇',
- })
+ if (item.selectType == "webpage" || item.learnSelectType == "webpage") {
+ // 缃戦〉绫诲瀷璺宠浆鍒扮綉鍧�澶嶅埗椤碉紝鍥犱负url浼犲弬涓嶈兘浼� 甯﹀弬鏁扮殑缃戠粶鍦板潃锛屾墍浠ユ澶勮鎶婄綉缁滃湴鍧�閲岀殑浼犲弬鎽樺嚭鏉ワ紝鏀惧埌url閲�
+ let urlData = ''
+ const flags = item.jsek_link.indexOf("?")
+ if (flags > -1) {
+ urlData = item.jsek_link.slice(flags + 1, item.jsek_link.length)
}
+ url = '/packageBookService/pages/bookServices/linkPage/index'
+ return wx.navigateTo({
+ url: urlData ? url + `?path=${item.jsek_link.slice(0,flags)}` + '&' + urlData : url + `?path=${item.jsek_link}`
+ })
+ }
+ if (item.selectType == 'zip' || item.learnSelectType == 'zip') {
+ return wx.showToast({
+ icon: 'error',
+ title: '璇峰墠寰�PC绔笅杞�',
+ })
}
if (item.learnSelectType == "video") {
url = "/packageDomain/pages/resourceDetails/myVideo/index";
} else if (item.learnSelectType == "audio") {
url = "/packageDomain/pages/resourceDetails/myAudio/index";
- } else if (item.selectType == "picture" || item.selectType == "zip") {
+ } else if (item.learnSelectType == "picture" || item.learnSelectType == 'document' || item.learnSelectType == 'pdf') {
url = "/packageDomain/pages/resourceDetails/document/index";
}
if ((!item.file && !item.freeFile && !item.protectedFile)) {
diff --git a/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxml b/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxml
index fa1bd39..2ba7bc1 100644
--- a/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxml
+++ b/pages/digitalCourses/digitalCoursesDetails/components/tree/index.wxml
@@ -9,6 +9,41 @@
<view class="teach-icon fl-cn">
<image wx:if="{{item.selectType == 'audio' || item.learnSelectType == 'audio'}}" src="/static/images/bookService/detail/audioIcon.png" mode="aspectFill" />
<image wx:elif="{{item.selectType == 'video' || item.learnSelectType == 'video'}}" src="/static/images/bookService/detail/video.png" mode="aspectFill" />
+ <image
+ wx:elif="{{item.selectType == 'pdf' || item.learnSelectType == 'pdf'}}"
+ src="/static/images/bookService/detail/pdf.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{item.selectType == 'webpage' || item.learnSelectType == 'webpage'}}"
+ src="/static/images/bookService/detail/net.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{item.selectType == 'picture' || item.learnSelectType == 'picture'}}"
+ src="/static/images/bookService/detail/picture.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{item.selectType == 'zip' || item.learnSelectType == 'zip'}}"
+ src="/static/images/bookService/detail/zip.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{ item.fileMap[item.file].extension == 'doc' || item.fileMap[item.file].extension == 'docx' || item.fileMap[item.freeFile].extension == 'doc' || item.fileMap[item.freeFile].extension == 'docx' || item.fileMap[item.protectedFile].extension == 'doc' || item.fileMap[item.protectedFile].extension == 'docx'}}"
+ src="/static/images/bookService/detail/word.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{ item.fileMap[item.file].extension == 'xls' || item.fileMap[item.file].extension == 'xlsx' || item.fileMap[item.freeFile].extension == 'xls' || item.fileMap[item.freeFile].extension == 'xlsx' || item.fileMap[item.protectedFile].extension == 'xls' || item.fileMap[item.protectedFile].extension == 'xlsx'}}"
+ src="/static/images/bookService/detail/excel.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{ item.fileMap[item.file].extension == 'ppt' || item.fileMap[item.file].extension == 'pptx' || item.fileMap[item.freeFile].extension == 'ppt' || item.fileMap[item.freeFile].extension == 'pptx' || item.fileMap[item.protectedFile].extension == 'ppt' || item.fileMap[item.protectedFile].extension == 'pptx'}}"
+ src="/static/images/bookService/detail/PPT.png"
+ mode="aspectFill"
+ />
<!-- 璧勬簮鏃犳枃浠跺唴瀹瑰浘鏍� -->
<image wx:else src="/static/images/bookService/detail/word.png" mode="" />
</view>
@@ -43,6 +78,41 @@
<view class="teach-icon fl-cn">
<image wx:if="{{citem.selectType == 'audio' || citem.learnSelectType == 'audio'}}" src="/static/images/bookService/detail/audioIcon.png" mode="aspectFill" />
<image wx:elif="{{citem.selectType == 'video' || citem.learnSelectType == 'video'}}" src="/static/images/bookService/detail/video.png" mode="aspectFill" />
+ <image
+ wx:elif="{{citem.selectType == 'pdf' || citem.learnSelectType == 'pdf'}}"
+ src="/static/images/bookService/detail/pdf.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{citem.selectType == 'webpage' || citem.learnSelectType == 'webpage'}}"
+ src="/static/images/bookService/detail/net.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{citem.selectType == 'picture' || citem.learnSelectType == 'picture'}}"
+ src="/static/images/bookService/detail/picture.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{citem.selectType == 'zip' || citem.learnSelectType == 'zip'}}"
+ src="/static/images/bookService/detail/zip.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{ citem.fileMap[citem.file].extension == 'doc' || citem.fileMap[citem.file].extension == 'docx' || citem.fileMap[citem.freeFile].extension == 'doc' || citem.fileMap[citem.freeFile].extension == 'docx' || citem.fileMap[citem.protectedFile].extension == 'doc' || citem.fileMap[citem.protectedFile].extension == 'docx'}}"
+ src="/static/images/bookService/detail/word.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{ citem.fileMap[citem.file].extension == 'xls' || citem.fileMap[citem.file].extension == 'xlsx' || citem.fileMap[citem.freeFile].extension == 'xls' || citem.fileMap[citem.freeFile].extension == 'xlsx' || citem.fileMap[citem.protectedFile].extension == 'xls' || citem.fileMap[citem.protectedFile].extension == 'xlsx' }}"
+ src="/static/images/bookService/detail/excel.png"
+ mode="aspectFill"
+ />
+ <image
+ wx:elif="{{ citem.fileMap[citem.file].extension == 'ppt' || citem.fileMap[citem.file].extension == 'pptx' || citem.fileMap[citem.freeFile].extension == 'ppt' || citem.fileMap[citem.freeFile].extension == 'pptx' || citem.fileMap[citem.protectedFile].extension == 'ppt' || citem.fileMap[citem.protectedFile].extension == 'pptx'}}"
+ src="/static/images/bookService/detail/PPT.png"
+ mode="aspectFill"
+ />
<!-- 璧勬簮鏃犳枃浠跺唴瀹瑰浘鏍� -->
<image wx:else src="/static/images/bookService/detail/word.png" mode="" />
<text class="name" style="width:400rpx">{{citem.name || '-'}}</text>
--
Gitblit v1.9.1