From ce3a08b28c16f5cce2185167f8a9030ee16898ed Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期六, 07 九月 2024 14:44:55 +0800
Subject: [PATCH] xiugai
---
pages/bookExhibitionDetails/index.js | 50 ++++++++++++++++++++------------------------------
1 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/pages/bookExhibitionDetails/index.js b/pages/bookExhibitionDetails/index.js
index 8a752fa..a8e7b80 100644
--- a/pages/bookExhibitionDetails/index.js
+++ b/pages/bookExhibitionDetails/index.js
@@ -1,5 +1,8 @@
// pages/bookExhibitionDetails/index.js
const app = getApp()
+import {
+ loginInfo
+} from '../../assets/js/login';
Page({
/**
@@ -27,8 +30,6 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
-
-
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -36,20 +37,26 @@
navBarHeight: navBarHeight,
barHeight: systInfo.statusBarHeight,
})
- console.log();
-
-
this.setData({
bookName: options.bookName,
subtitleName: options.subtitleName,
passId: options.id
})
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ if (data) {
+ this.bookExhibitionGet(this.data.passId)
+ this.getBookExhibitionDetails()
+ } else {
+ this.bookExhibitionGet(this.data.passId)
+ this.getBookExhibitionDetails()
+ }
+ })
- const passId = options.id
-
- this.bookExhibitionGet(passId)
+ }
+ this.bookExhibitionGet(this.data.passId)
this.getBookExhibitionDetails()
-
wx.setNavigationBarTitle({
title: this.data.subtitleName
});
@@ -109,10 +116,6 @@
loading: true,
hidden: true,
})
- wx.showLoading({
- title: '鍔犺浇涓�...',
- })
- console.log(passId, 8988989);
app.MG.store.getProductDetail({
storeInfo: 'jsek_bookFair', //鍟嗗搧搴�
path: '*', //璺緞
@@ -132,18 +135,15 @@
bookBeginDate: res.datas.beginDate,
bookCreator: res.datas.datas.Creator.Name,
bookContent: res.datas.content,
- bookImage: res.datas.icon
- });
- wx.hideLoading()
- this.setData({
+ bookImage: res.datas.icon,
loading: false,
hidden: false,
- })
+ });
+ console.log(this.data.loading, 123)
})
},
//涔﹀睍璇︽儏鎺ュ彛
getBookExhibitionDetails() {
-
app.MG.store.getProductList({
path: '*',
storeInfo: 'jsek_bookFair',
@@ -161,15 +161,9 @@
Creator: []
}
}).then(res => {
-
this.setData({
bookExhibitionList: res.datas,
- totalSize: res.total
- })
-
- this.setData({
- loading: false,
- hidden: false,
+ totalSize: res.total,
})
})
},
@@ -185,10 +179,7 @@
},
// 瑙﹀簳鍑芥暟
onReachBottom() {
- console.log(this.data.bookExhibitionList.length);
- console.log(this.data.totalSize);
if (this.data.bookExhibitionList.length < this.data.totalSize) {
- console.log(11111);
this.setData({
isMore: true,
start: this.data.start + 1
@@ -202,7 +193,6 @@
this.setData({
isMore: false
})
- console.log('300');
}, 300)
}
},
--
Gitblit v1.9.1