From 1c64c10f8dd88018c0d30de79237f3128173f118 Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期二, 26 三月 2024 17:36:51 +0800
Subject: [PATCH] 调整登录
---
pages/home/home.js | 145 +++++++++++++++++++++++++++---------------------
1 files changed, 81 insertions(+), 64 deletions(-)
diff --git a/pages/home/home.js b/pages/home/home.js
index 4575a24..0a15970 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -1,14 +1,16 @@
import { fetchHome } from '../../services/home/home';
import moment from 'moment'
-import { setSessionGuid } from "../../assets/js/userAction"
+import { checkLoginInfo } from '../../assets/js/login';
const app = getApp()
Page({
data: {
+ barHeight: '',
+ navBarHeight: '',
+ searchVal: '',
isWhite: false,
backUrl: null,
userInfo: {},
tabList: [], //鐩綍
- pageLoading: false,
current: 1,//杞挱鍥惧弬鏁�
autoplay: true, //杞挱鍥惧弬鏁�
duration: '500',//杞挱鍥惧弬鏁�
@@ -25,16 +27,25 @@
readBookList: [], //鏁板瓧闃呰
textbookList: [], //鏁板瓧鏁欐潗
rankingList: [],//鎺掕姒�
- shoppingCartGetId: []
+ shoppingCartGetId: [],
+ baseRefresh: {
+ value: false
+ }
},
onShow() {
- this.getTabBar().init();
this.loadHomePage();
this.getBannerList()
},
onLoad(options) {
+ const systInfo = wx.getSystemInfoSync();
+ const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
+ const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
+ this.setData({
+ barHeight: systInfo.statusBarHeight,
+ navBarHeight: navBarHeight,
+ });
if (options.backUrl) {
let backUrl = JSON.parse(decodeURIComponent(options.backUrl));
if (backUrl.options) {
@@ -47,12 +58,21 @@
backUrl: backUrl.backUrl
})
}
- this.getTestLoginInfo()
+
+ // checkLoginInfo(app, (data) => {
+ // if (data) {
+ // this.getCurrentUserInfo();
+ // }
+ // })
+
this.init();
},
onReachBottom() {
},
onPullDownRefresh() {
+ this.setData({
+ 'baseRefresh.value': true,
+ })
this.init();
},
init() {
@@ -62,52 +82,12 @@
this.getReadBookList();
this.getTextbookListList();
this.getRankingList();
- this.getShoppingCartList()
- },
- // 鑾峰彇娴嬭瘯鐧诲綍鏃剁殑token
- getTestLoginInfo() {
- const token = wx.getStorageSync(app.config.tokenKey)
- if (!token) {
- wx.login({
- success: (res) => {
- wx.getUserInfo({
- success: (infoRes) => {
- app.MG.identity.checkWeChatAppAccount({
- code: res.code,
- appCode: app.config.appRefCode,
- encryptedData: infoRes.encryptedData,
- iv: infoRes.iv
- }).then(loginRes => {
- if (!loginRes) {
- // wx.navigateTo({
- // url: "/pages/index/bindInfo/index?code=" + res.code,
- // });
- } else {
- wx.login({
- success: (res) => {
- app.MG.identity.loginByWeChatAppCode({
- code: res.code,
- appRefCode: app.config.appRefCode,
- platform: "weChatApp",
- encryptedData: infoRes.encryptedData,
- iv: infoRes.iv
- }).then(res => {
- if (res && res.status == "Ok") {
- wx.setStorageSync(app.config.tokenKey, res.token);
- setSessionGuid()
- this.getCurrentUserInfo()
- }
- })
- },
- })
- }
- })
- }
- })
- },
+ setTimeout(() => {
+ this.setData({
+ 'baseRefresh.value': false,
})
- }
+ }, 500);
},
getCurrentUserInfo() {
@@ -142,13 +122,12 @@
url: '/pages/home/home'
})
}
-
});
},
getBannerList() {
const list = []
app.MG.resource.getItem({
- path: 'jsek_banner\\jsek_homeBanner',
+ path: 'jsek_banner\\jsek_homeBannerApplet',
fields: { jsek_link: [] },
paging: { start: 0, size: 9 }
}).then(res => {
@@ -168,14 +147,9 @@
loadHomePage() {
- wx.stopPullDownRefresh();
- this.setData({
- pageLoading: true,
- });
fetchHome().then(({ tabList }) => {
this.setData({
tabList,
- pageLoading: false,
});
});
},
@@ -216,7 +190,8 @@
liveTime: [],
lecturer: [],
startTime: [],
- jsek_link: []
+ jsek_link: [],
+ position: []
}
}
app.MG.store.getProductList(obj).then((res) => {
@@ -380,6 +355,9 @@
}
}
app.MG.store.getProductList(obj).then((res) => {
+ res.datas.forEach((item) => {
+ item.price = item.price ? item.price.toFixed(2) : item.price;
+ });
this.setData({
textbookList: res.datas
})
@@ -423,9 +401,43 @@
goDetail(e) {
const { book } = e.currentTarget.dataset;
wx.navigateTo({
- url: `/pages/bookServices/detail/index?id=${book.id}&name=${book.name}`,
+ url: `/packageBookService/pages/bookServices/detail/index?id=${book.id}&name=${book.name}`,
});
},
+ goSubjectDetail(e) {
+ const { book } = e.currentTarget.dataset;
+ wx.showToast({
+ title: "寤鸿涓�",
+ icon: 'none',
+ duration: 2000
+ })
+ },
+ goCourseDetail(e) {
+ const { book } = e.currentTarget.dataset;
+ wx.showToast({
+ title: "寤鸿涓�",
+ icon: 'none',
+ duration: 2000
+ })
+ },
+ goReadBookDetail(e) {
+ const { book } = e.currentTarget.dataset;
+ wx.showToast({
+ title: "寤鸿涓�",
+ icon: 'none',
+ duration: 2000
+ })
+ },
+ goTextBookDetail(e) {
+ const { book } = e.currentTarget.dataset;
+ wx.showToast({
+ title: "寤鸿涓�",
+ icon: 'none',
+ duration: 2000
+ })
+ },
+
+
getShoppingCartList() {
let query = {
start: 0,
@@ -495,7 +507,7 @@
console.log(e, 1)
if (type == "tushufuwu") {
wx.navigateTo({
- url: '/pages/bookServices/list/index'
+ url: '/packageBookService/pages/bookServices/list/index'
})
} else {
wx.showToast({
@@ -508,11 +520,16 @@
},
- onPageScroll(e) {
+ // 鐩戝惉婊氬姩鏉�
+ onScroll(e) {
this.setData({
- isWhite: e.scrollTop > 50 ? true : false
+ isWhite: e.detail.scrollTop > 10 ? true : false
})
-
- }
-
+ },
+ onRetrievalPage() {
+ console.log(this.data.searchVal);
+ wx.navigateTo({
+ url: '/pages/retrievalPage/index?searchVal=' + this.data.searchVal
+ })
+ },
});
--
Gitblit v1.9.1