From b2a6887c94cc7887b03ba1cce578e3fc59a62259 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 27 三月 2024 16:12:28 +0800
Subject: [PATCH] 1
---
pages/home/home.js | 99 +++++++++++++++++--------------------------------
1 files changed, 34 insertions(+), 65 deletions(-)
diff --git a/pages/home/home.js b/pages/home/home.js
index 0a15970..6b539a6 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -1,6 +1,6 @@
import { fetchHome } from '../../services/home/home';
import moment from 'moment'
-import { checkLoginInfo } from '../../assets/js/login';
+import { loginInfo } from '../../assets/js/login';
const app = getApp()
Page({
data: {
@@ -8,7 +8,6 @@
navBarHeight: '',
searchVal: '',
isWhite: false,
- backUrl: null,
userInfo: {},
tabList: [], //鐩綍
current: 1,//杞挱鍥惧弬鏁�
@@ -23,6 +22,7 @@
courseList: [],
bookTypeList: [],//鍥句功绫诲瀷
activeItem1: 0,
+ bookTypeData: {},
booksList: [],
readBookList: [], //鏁板瓧闃呰
textbookList: [], //鏁板瓧鏁欐潗
@@ -38,7 +38,7 @@
},
- onLoad(options) {
+ onLoad() {
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -46,24 +46,22 @@
barHeight: systInfo.statusBarHeight,
navBarHeight: navBarHeight,
});
- if (options.backUrl) {
- let backUrl = JSON.parse(decodeURIComponent(options.backUrl));
- if (backUrl.options) {
- for (let key in backUrl.options) {
- const value = backUrl.options[key]
- backUrl.backUrl += `${key}=${value}&`
- }
- }
- this.setData({
- backUrl: backUrl.backUrl
- })
- }
- // checkLoginInfo(app, (data) => {
- // if (data) {
- // this.getCurrentUserInfo();
- // }
- // })
+ // 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲�
+ // 妫�鏌ョ櫥褰曠姸鎬�
+ // const token = wx.getStorageSync(app.config.tokenKey)
+ // if (!token) {
+ // loginInfo(app, (data) => {
+ // // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
+ // if (data) {
+ // // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
+ // } else {
+ // // 鍑虹幇閿欒锛岃繑鍥瀎alse
+ // }
+ // })
+ // } else {
+ // // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
+ // }
this.init();
},
@@ -90,40 +88,6 @@
}, 500);
},
- getCurrentUserInfo() {
- app.MG.identity.getCurrentAppUser().then(res => {
- console.log(res, "userInfo");
- // 鐢ㄦ埛淇℃伅浼樺厛绾э細鏁欏笀璁よ瘉 > 寰俊 > 瀛︾敓锛堟敞鍐屾椂榛樿锛�
- if (res) {
- let defaultUser = {};
- let WeChatInfo = res.infoList.find((item) => item.type === "WeChat");
- let phoneNumber = res.secretList.find(i => i.type == 'MobilePhone')
- if (WeChatInfo) {
- defaultUser = {
- nickName: WeChatInfo.name,
- avatarUrl: WeChatInfo.icon,
- weChatId: WeChatInfo.id
- }
- }
- if (phoneNumber) {
- defaultUser.phoneNumber = phoneNumber.credential
- }
- this.setData({
- userInfo: defaultUser,
- })
- wx.setStorageSync(app.config.userInfoKey, JSON.stringify(this.data.userInfo));
- }
- if (this.data.backUrl) {
- wx.navigateTo({
- url: this.data.backUrl,
- })
- } else {
- wx.switchTab({
- url: '/pages/home/home'
- })
- }
- });
- },
getBannerList() {
const list = []
app.MG.resource.getItem({
@@ -142,7 +106,6 @@
bannerList: list
})
})
- console.log('杞挱鍥�', this.data.bannerList);
},
@@ -313,7 +276,10 @@
//鍥句功鏈嶅姟
tabBookClick(item) {
let info = this.data.bookTypeList[item.detail.value]
- console.log(info, 123)
+ bookTypeData
+ this.setData({
+ bookTypeData: info,
+ })
this.getBooksList(info)
},
//鏁板瓧闃呰
@@ -409,7 +375,7 @@
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
- duration: 2000
+ duration: 1000
})
},
goCourseDetail(e) {
@@ -417,7 +383,7 @@
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
- duration: 2000
+ duration: 1000
})
},
goReadBookDetail(e) {
@@ -425,7 +391,7 @@
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
- duration: 2000
+ duration: 1000
})
},
goTextBookDetail(e) {
@@ -433,7 +399,7 @@
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
- duration: 2000
+ duration: 1000
})
},
@@ -457,7 +423,12 @@
},
addCart(e) {
const { info } = e.currentTarget.dataset;
- console.log(info)
+ wx.showToast({
+ title: "寤鸿涓�",
+ icon: 'none',
+ duration: 1000
+ })
+ return;
if (wx.getStorageSync(app.config.tokenKey)) {
let query = {
start: 0,
@@ -504,16 +475,15 @@
},
onMoreGuide(e) {
let type = e.currentTarget.dataset.info
- console.log(e, 1)
if (type == "tushufuwu") {
wx.navigateTo({
- url: '/packageBookService/pages/bookServices/list/index'
+ url: '/packageBookService/pages/bookServices/list/index?assorName=' + this.data.bookTypeData.name
})
} else {
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
- duration: 2000
+ duration: 1000
})
}
@@ -527,7 +497,6 @@
})
},
onRetrievalPage() {
- console.log(this.data.searchVal);
wx.navigateTo({
url: '/pages/retrievalPage/index?searchVal=' + this.data.searchVal
})
--
Gitblit v1.9.1