From 4a9955330070cf8abd78d95aaa2067d9a06a88c3 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期二, 07 五月 2024 10:05:59 +0800
Subject: [PATCH] 各页面bug修改
---
packageDomain/pages/resourceDetails/myVideo/index.js | 182 +++++++++++++++++++++++++++++++--------------
1 files changed, 125 insertions(+), 57 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index d99b880..5311e4f 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -34,6 +34,14 @@
style: 'height: 248rpx',
submitType: "new", // 鏂板缓 or 缂栬緫
noteId: '',
+ videoChange: true,
+ startTime: "", //杩涘叆椤甸潰褰撳墠鏃堕棿
+ pauseTime: 0, //鏆傚仠鏃堕棿
+ formPath: '',
+ loading: true,
+ hidden: true,
+ videoError: false,
+ videoLoaidng: false
},
// 鏍煎紡鍖栫瑪璁版椂闂�
convertTimestamp(timestamp) {
@@ -51,11 +59,12 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
-
+ wx.setNavigationBarTitle({
+ title: '璧勬簮璇︽儏-瑙嗛'
+ });
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
- console.log(options, 'options');
this.setData({
navBarHeight: navBarHeight,
barHeight: systInfo.statusBarHeight,
@@ -63,12 +72,16 @@
bookId: options.bookId,
bookName: options.bookName,
cmsId: options.cmsId,
- parentName: options.parentName,
parentProductLinkPath: options.parentProductLinkPath,
productLinkPath: options.productLinkPath,
+ formPath: options.formPath,
flag: false
})
-
+ if (options.parentName !== "鏁欏璧勬簮" && options.parentName !== "浜戝涔�") {
+ this.setData({
+ parentName: options.parentName,
+ })
+ }
this.resourceDetailsData()
this.getNoteList()
},
@@ -84,6 +97,9 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
*/
onShow() {
+ this.setData({
+ startTime: Date.now()
+ })
},
@@ -91,16 +107,45 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
*/
onHide() {
-
+ this.setData({
+ pauseTime: Date.now()
+ })
+ if (wx.getStorageSync(app.config.tokenKey)) {
+ let duration = this.data.pauseTime - this.data.startTime
+ this.count(duration)
+ }
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
*/
onUnload() {
-
+ this.setData({
+ pauseTime: Date.now()
+ })
+ if (wx.getStorageSync(app.config.tokenKey)) {
+ let duration = this.data.pauseTime - this.data.startTime
+ this.count(duration)
+ }
},
-
+ count(timeStr) {
+ const data = {
+ appRefCode: app.config.appRefCode,
+ type: 'LearningTime', //缁熻绫诲瀷--闃呰鏃堕暱
+ data: timeStr + '', //缁熻鍐呭--鏃堕暱姣
+ event: 'LearningTime',
+ sysType: 'App'
+ }
+ //闃呰鍟嗗搧鐨刬d
+ if (this.data.bookId) {
+ data.productId = this.data.bookId
+ }
+ //闃呰璧勬簮鐨刬d
+ if (this.data.cmsId) {
+ data.cmsItemId = this.data.cmsId
+ }
+ app.MG.job.newJobWithApiNewEvent(data).then((res) => {})
+ },
/**
* 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
*/
@@ -139,16 +184,13 @@
showDialog(e) {
this.setData({
- submitTitle: this.data.bookName,
dialogKey: true,
- // textvalue: ''
-
+ textvalue: '',
+ submitTitle: this.data.titleName
});
},
-
closeDialog() {
-
this.setData({
dialogKey: false,
textvalue: '',
@@ -159,6 +201,9 @@
wx.navigateBack();
},
resourceDetailsData() {
+ this.setData({
+ videoLoaidng: true
+ })
let query = {
path: '*',
queryType: '*',
@@ -183,48 +228,64 @@
size: 999
}
}
-
app.MG.store.getProductDetail(query).then(res => {
res.datas.cmsDatas[0].datas.forEach((item) => {
- if (item.selectType === "video") {
+ if (item.selectType === "video" || item.learnSelectType === "video") {
this.data.threeLeveData.push(item)
this.setData({
threeLeveData: this.data.threeLeveData
})
-
- if (this.data.productLinkPath == item.productLinkPath) {
- this.setData({
- showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file,
- titleName: item.name
- })
- }
+ this.data.threeLeveData.forEach((items, index) => { // 淇敼姝ゅ娣诲姞index鍙傛暟
+ if (this.data.productLinkPath == items.productLinkPath) {
+ if (this.data.formPath === "jsek_cloudLearning") {
+ let file
+ items.protectedFile ? file = items.protectedFile : file = items.freeFile
+ this.setData({
+ showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + file + '&token=' + wx.getStorageSync(app.config.tokenKey),
+ titleName: items.name
+ })
+ } else {
+ this.setData({
+ showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile,
+ titleName: items.name
+ })
+ }
+ let selectedIndex = index; // 瀛樺偍閫変腑椤圭殑绱㈠紩
+ this.setData({
+ selectedId: selectedIndex // 璁剧疆閫変腑椤圭殑绱㈠紩
+ });
+ }
+ });
}
-
-
})
- this.data.threeLeveData.forEach((item) => {
- console.log(item.name);
+ this.setData({
+ loading: false,
+ hidden: false
})
+ console.log('鍦板潃', this.data.showData);
})
},
onVideo(e) {
- if (this.data.showData != '') {
- this.setData({
- showData: ''
- })
- }
- this.setData({
- selectedId: e.currentTarget.dataset.index,
- })
const item = e.currentTarget.dataset.item
this.setData({
+ videoLoaidng: true,
+ selectedId: e.currentTarget.dataset.index,
+ showData: '',
titleName: item.name
})
-
- if (item.selectType == "video") {
- this.setData({
- showData: app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file
- })
+ if (item.selectType == "video" || item.learnSelectType === "video") {
+ if (this.data.formPath === "jsek_cloudLearning") {
+ let file
+ item.protectedFile ? file = item.protectedFile : file = item.freeFile
+ this.setData({
+ showData: app.config.requestCtx + '/file/api/ApiDownloadForAuthorize?md5=' + file + '&token=' + wx.getStorageSync(app.config.tokenKey)
+ })
+ console.log(this.data.showData);
+ } else {
+ this.setData({
+ showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile,
+ })
+ }
}
},
@@ -233,15 +294,11 @@
productId: this.data.bookId,
appRefCode: app.config.appRefCode
}).then((res) => {
- console.log(res);
-
this.setData({
topicId: res.id
})
})
},
-
-
newTopicMessageGet() {
let query = {
@@ -259,7 +316,6 @@
// 鏍囬鏀瑰彉
changeTitle(e) {
- console.log(e.currentTarget.dataset.value);
this.setData({
flag: e.currentTarget.dataset.value
})
@@ -267,18 +323,17 @@
// 鏍囬杈撳叆妗嗗��
inputChange(e) {
this.setData({
- titleName: e.detail.value
+ submitTitle: e.detail.value
})
},
confirmSuggest() {
- if (!this.data.textvalue) {
+ if (!this.data.textvalue.trim()) {
return wx.showToast({
icon: 'error',
title: '璇峰～鍐欑瑪璁板唴瀹�',
})
-
- } else if (!this.data.titleName) {
+ } else if (!this.data.submitTitle) {
return wx.showToast({
icon: 'error',
title: '璇峰～鍐欑瑪璁版爣棰�',
@@ -303,8 +358,6 @@
textvalue: e.detail.value
})
},
-
-
// 鑾峰彇绗旇鍒楄〃
async getNoteList() {
// this.setData({
@@ -345,12 +398,12 @@
// item.deleteHover = false
item.createDate = this.convertTimestamp(item.createDate)
})
+ console.log(res, 'res');
this.setData({
"pageCount.total": res.totalSize,
noteList: res.datas,
loading: false
})
- console.log('绗旇鍒楄〃', res.datas);
})
},
// 缂栬緫鎸夐挳
@@ -360,9 +413,9 @@
submitType: "edit",
textvalue: note.content,
submitTitle: note.name,
- noteId: note.id
+ noteId: note.id,
+ dialogKey: true,
})
- this.showDialog()
},
// 鍒犻櫎绗旇
@@ -372,13 +425,15 @@
messageIds.push(id)
wx.showModal({
title: '鎻愮ず',
- content: '纭鍒犻櫎璇ョ瑪璁板悧锛�',//editable濡傛灉涓簍rue锛岃繖灏辨槸杈撳叆妗嗙殑鍐呭
- editable: false,//鏄惁鏄剧ず杈撳叆妗�
- placeholderText: '璇疯緭鍏ュ唴瀹瑰惂',//杈撳叆妗嗙殑榛樿鍐呭
+ content: '纭鍒犻櫎璇ョ瑪璁板悧锛�', //editable濡傛灉涓簍rue锛岃繖灏辨槸杈撳叆妗嗙殑鍐呭
+ editable: false, //鏄惁鏄剧ず杈撳叆妗�
+ placeholderText: '璇疯緭鍏ュ唴瀹瑰惂', //杈撳叆妗嗙殑榛樿鍐呭
success: (res) => {
if (res.confirm) {
app.MG.ugc
- .delTopicMessage({ messageIds })
+ .delTopicMessage({
+ messageIds
+ })
.then((res) => {
wx.showToast({
title: '鍒犻櫎鎴愬姛',
@@ -480,5 +535,18 @@
submitType: "new"
})
},
-
+ videoErrorCallback(e) {
+ console.log(e);
+ },
+ videoError: function (e) {
+ console.log('瑙嗛鍔犺浇澶辫触', e);
+ this.setData({
+ videoError: true
+ });
+ },
+ loadedmetadata(e) {
+ this.setData({
+ videoLoaidng: false
+ })
+ }
})
\ No newline at end of file
--
Gitblit v1.9.1