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/document/index.js | 155 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 114 insertions(+), 41 deletions(-)
diff --git a/packageDomain/pages/resourceDetails/document/index.js b/packageDomain/pages/resourceDetails/document/index.js
index 9cf27f2..0ca3e50 100644
--- a/packageDomain/pages/resourceDetails/document/index.js
+++ b/packageDomain/pages/resourceDetails/document/index.js
@@ -1,4 +1,5 @@
// pages/resourceDetails/document/index.js
+import Toast from 'tdesign-miniprogram/toast/index';
const app = getApp()
Page({
@@ -6,6 +7,11 @@
* 椤甸潰鐨勫垵濮嬫暟鎹�
*/
data: {
+ visible: false,
+ showIndex: false,
+ closeBtn: false,
+ deleteBtn: false,
+ images: [],
webpageSrc: '',
navBarHeight: '',
barHeight: '',
@@ -27,28 +33,22 @@
pauseTime: 0, //鏆傚仠鏃堕棿
applyState: '',
deadline: '',
+ lzoomFlag: false, //瀹氫箟 缂╂斁浜嬩欢 鑺傛祦闃�,闃叉涓�娆＄缉鏀捐Е鍙戜袱娆＄缉鏀句簨浠�
+ distance: 0, //璁板綍鎵嬫寚绉诲姩璺濈
+ scale: 1, //瀹氫箟鍒濆鍖栫殑椤甸潰缂╂斁澶у皬
+ newScale: 1, //璁板綍鏂扮殑椤甸潰缂╂斁澶у皬
},
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
-
wx.setNavigationBarTitle({
title: '璧勬簮璇︽儏'
});
-
-
-
-
-
-
-
-
console.log(options);
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
-
this.setData({
navBarHeight: navBarHeight,
barHeight: systInfo.statusBarHeight,
@@ -88,12 +88,11 @@
this.setData({
pauseTime: Date.now()
})
- if (wx.getStorageSync(app.config.tokenKey) && epubObj.bookBuy) {
+ if (wx.getStorageSync(app.config.tokenKey) && epubObj && epubObj.bookBuy) {
let duration = this.data.pauseTime - this.data.startTime
this.count(duration)
}
},
-
/**
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
@@ -102,7 +101,7 @@
this.setData({
pauseTime: Date.now()
})
- if (wx.getStorageSync(app.config.tokenKey) && epubObj.bookBuy) {
+ if (wx.getStorageSync(app.config.tokenKey) && epubObj && epubObj.bookBuy) {
let duration = this.data.pauseTime - this.data.startTime
this.count(duration)
}
@@ -178,11 +177,6 @@
app.MG.store.getProductDetail(query).then((res) => {
console.log(res);
res.datas.cmsDatas[0].datas.forEach((item) => {
-
-
-
-
- //鍒氬垰杩涙潵鐨勬椂鍊�
if (this.data.productLinkPath == item.productLinkPath) {
this.handleTeachData(item)
this.setData({
@@ -190,8 +184,6 @@
selectType: item.selectType
})
}
-
-
})
})
},
@@ -199,16 +191,13 @@
onDownloadButton() {
const item = this.data.zipData;
if (this.data.applyState !== 'Normal') {
- return wx.showToast({
- icon: 'none',
- title: '璇峰厛鐢宠涓嬭浇',
- })
- } else {
- const flag = new Date(this.data.deadline) > new Date()
- if (!flag) return wx.showToast({
- icon: 'none',
- title: '璇峰厛鐢宠涓嬭浇',
- })
+ if (!this.data.deadline == '姘镐箙') {
+ const flag = new Date(this.data.deadline) > new Date()
+ return wx.showToast({
+ icon: 'none',
+ title: '璇峰厛鐢宠涓嬭浇',
+ })
+ }
}
if (!item || !item.file) {
wx.showToast({
@@ -221,7 +210,6 @@
wx.showLoading({
title: '姝ｅ湪涓嬭浇...',
});
-
wx.downloadFile({
url: downloadUrl,
success(res) {
@@ -279,10 +267,9 @@
console.log(item, 'item11111');
if (item.selectType == 'picture') {
this.setData({
-
showData: item.file ? app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.file : app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.freeFile,
-
})
+ console.log(this.data.showData, 'showData');
}
// 涓嬭浇鏂囦欢zip
if (item.selectType == 'zip') {
@@ -296,7 +283,6 @@
webpageSrc: item.jsek_link
})
}
-
//鏂囨。绛�
if (item.selectType == 'pdf' || item.selectType == 'document') {
app.MG.file.getPdfInfo({
@@ -310,24 +296,111 @@
}
}
})
-
-
-
-
}
},
-
-
handleTap: function () {
const naturalResources = this.data.naturalResources;
naturalResources.forEach(function (item) {
// console.log(item);
});
- }
+ },
+ onClick() {
+ this.setData({
+ images: [
+ this.data.showData,
+ // 'https://tdesign.gtimg.com/mobile/demos/swiper2.png',
+ ],
+ showIndex: true,
+ visible: true,
+ });
+ },
+ onChange(e) {
+ const {
+ index
+ } = e.detail;
+ console.log('change', index);
+ },
+ onDelete(e) {
+ const {
+ index
+ } = e.detail;
+ Toast({
+ context: this,
+ selector: '#t-toast',
+ message: `鍒犻櫎绗�${index + 1}涓猔,
+ });
+ },
+ onClose(e) {
+ const {
+ trigger
+ } = e.detail;
+ console.log(trigger);
+ this.setData({
+ visible: false,
+ });
+ },
+ //棰勮鍥剧墖锛屾斁澶ч瑙�
+ preview(event) {
+ let urls = [event.currentTarget.dataset.src]
+ wx.previewImage({
+ urls: urls // 闇�瑕侀瑙堢殑鍥剧墖http閾炬帴鍒楄〃
+ })
+ },
+ // myTouchStart(e) {
+ // //---------------------璁板綍缂╂斁浜嬩欢淇℃伅---------------------
+ // // 褰撲袱鏍规墜鎸囨斁涓婂幓鐨勬椂鍊欙紝灏嗚窛绂�(distance)鍒濆鍖栥��
+ // let xMove = e.touches[1].clientX - e.touches[0].clientX;
+ // let yMove = e.touches[1].clientY - e.touches[0].clientY;
+ // //璁＄畻寮�濮嬭Е鍙戜袱涓墜鎸囧潗鏍囩殑璺濈
+ // const distance = Math.sqrt(xMove * xMove + yMove * yMove);
+ // this.setData({
+ // distance: distance
+ // })
+ // //---------------------璁板綍缂╂斁浜嬩欢淇℃伅end---------------------
+ // },
+ // myTouchMove(e) {
+ // // ----------------鐩戝惉鎵嬪娍缂╁皬鏀惧ぇ浜嬩欢----------------
+ // // 鍗曟墜鎸囩缉鏀句笉鍋氫换浣曟搷浣�
+ // if (e.touches.length != 1) {
+ // //鍙屾墜鎸囪繍鍔� x绉诲姩鍚庣殑鍧愭爣鍜寉绉诲姩鍚庣殑鍧愭爣
+ // let xMove = e.touches[1].clientX - e.touches[0].clientX;
+ // let yMove = e.touches[1].clientY - e.touches[0].clientY;
+ // //鍙屾墜鎸囪繍鍔ㄦ柊鐨� ditance
+ // let newDistance = Math.sqrt(xMove * xMove + yMove * yMove);
+ // //璁＄畻绉诲姩鐨勮繃绋嬩腑瀹為檯绉诲姩浜嗗灏戠殑璺濈
+ // let distanceDiff = newDistance - this.data.distance;
+ // // newScale = scale + 0.005 * distanceDiff
+ // console.log('绉诲姩璺濈', distanceDiff);
+ // this.setData({
+ // newScale: this.data.newScale + 0.005 * distanceDiff
+ // })
+ // // 鎵撳紑缂╂斁鐩戝惉
+ // // zoomFlag = true
+ // this.setData({
+ // lzoomFlag: true
+ // })
+ // return
+ // }
+ // // ----------------鐩戝惉鎵嬪娍缂╁皬鏀惧ぇ浜嬩欢end----------------
+ // },
+ // myTouchEnd() {
+ // if (this.data.lzoomFlag) {
+ // if (this.data.newScale > 1.3) {
+ // console.log("鏀惧ぇ浜�", this.data.newScale);
+ // } else if (this.data.newScale < 0.7, this.data.newScale) {
+ // console.log("缂╁皬浜�");
+ // }
+ // // 鍏抽棴缂╂斁鐩戝惉
+ // // zoomFlag = false
+ // this.setData({
+ // lzoomFlag: false
+ // })
+ // }
+ // },
})
\ No newline at end of file
--
Gitblit v1.9.1