From 3f1ea0a8e4bb02bf7544df8660b15cfa69d6b84a Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 15 三月 2024 18:54:04 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/bibliographyList/index.js | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/pages/bibliographyList/index.js b/pages/bibliographyList/index.js
index cab19a3..4c3cd21 100644
--- a/pages/bibliographyList/index.js
+++ b/pages/bibliographyList/index.js
@@ -15,7 +15,8 @@
teacherTotal: 0,
value: '',
BarHeight: '',
- navBarHeight: ''
+ navBarHeight: '',
+
},
/**
@@ -26,13 +27,12 @@
this.vocationalGet()
this.teacherGet()
-
- //鑾峰彇绯荤粺淇℃伅锛岀姸鎬佹爮楂樺害涓簊ysInfo['statusBarHeight'];
- let sysInfo = wx.getSystemInfoSync();
- let menu = wx.getMenuButtonBoundingClientRect(); //鑳跺泭淇℃伅
- let navBarHeight = (menu.top - sysInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
+ const systInfo = wx.getSystemInfoSync();
+ const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
+ const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
this.setData({
- BarHeight: sysInfo.statusBarHeight, navBarHeight: navBarHeight
+ navBarHeight: navBarHeight,
+ barHeight: systInfo.statusBarHeight,
})
@@ -227,9 +227,9 @@
console.log(111);
const item = event.currentTarget.dataset.item;
// console.log(item.datas.freeFile.Value);
- const URL = 'http://182.92.203.7:3001/file/api/ApiDownload?md5=' + item.datas.freeFile.Value
+ const URL = app.config.requestCtx + '/file/api/ApiDownload?md5=' + item.datas.freeFile.Value
item.determine = false
-
+ console.log(URL, 'URL');
setTimeout(() => {
if (URL) {
item.determine = true
@@ -264,6 +264,8 @@
},
-
+ goBack() {
+ wx.navigateBack();
+ },
})
\ No newline at end of file
--
Gitblit v1.9.1