From 0b523220931d70aa752c3beaca5ed32ca85511c5 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 28 三月 2024 11:36:05 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/home/home.js | 249 ++++++++++++++++++++-----------------------------
1 files changed, 100 insertions(+), 149 deletions(-)
diff --git a/pages/home/home.js b/pages/home/home.js
index ac08cdd..fcd8dad 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -1,6 +1,10 @@
-import { fetchHome } from '../../services/home/home';
+import {
+ fetchHome
+} from '../../services/home/home';
import moment from 'moment'
-import { setSessionGuid } from "../../assets/js/userAction"
+import {
+ loginInfo
+} from '../../assets/js/login';
const app = getApp()
Page({
data: {
@@ -8,27 +12,30 @@
navBarHeight: '',
searchVal: '',
isWhite: false,
- backUrl: null,
userInfo: {},
tabList: [], //鐩綍
+ current: 1, //杞挱鍥惧弬鏁�
autoplay: true, //杞挱鍥惧弬鏁�
- duration: '500',//杞挱鍥惧弬鏁�
- interval: 5000,//杞挱鍥惧弬鏁�
- navigation: { type: 'dots' },//杞挱鍥惧弬鏁�
+ duration: '500', //杞挱鍥惧弬鏁�
+ interval: 5000, //杞挱鍥惧弬鏁�
+ navigation: {
+ type: 'dots'
+ }, //杞挱鍥惧弬鏁�
bannerList: [], //杞挱鍥惧垪琛�
- specialSubjectList: [],//涓撻璁ㄨ
- activeItem: 0,//绮鹃�夎绋嬮粯璁ら�変腑
- courseTypeList: [],//绮鹃�夎绋嬪垎绫�
+ specialSubjectList: [], //涓撻璁ㄨ
+ activeItem: 0, //绮鹃�夎绋嬮粯璁ら�変腑
+ courseTypeList: [], //绮鹃�夎绋嬪垎绫�
courseList: [],
- bookTypeList: [],//鍥句功绫诲瀷
+ bookTypeList: [], //鍥句功绫诲瀷
activeItem1: 0,
+ bookTypeData: {},
booksList: [],
readBookList: [], //鏁板瓧闃呰
textbookList: [], //鏁板瓧鏁欐潗
- rankingList: [],//鎺掕姒�
+ rankingList: [], //鎺掕姒�
shoppingCartGetId: [],
baseRefresh: {
- value: true
+ value: false
}
},
onShow() {
@@ -37,7 +44,7 @@
},
- onLoad(options) {
+ onLoad() {
const systInfo = wx.getSystemInfoSync();
const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
@@ -45,26 +52,29 @@
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}&`
+
+ // 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲�
+ // 妫�鏌ョ櫥褰曠姸鎬�
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
+ if (data) {
+ // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
+ } else {
+ // 鍑虹幇閿欒锛岃繑鍥瀎alse
}
- }
- this.setData({
- backUrl: backUrl.backUrl
})
+ } else {
+ // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
}
- this.getTestLoginInfo()
+
this.init();
},
- onReachBottom() {
- },
+ onReachBottom() {},
onPullDownRefresh() {
this.setData({
- isWhite: true
+ 'baseRefresh.value': true,
})
this.init();
},
@@ -78,102 +88,22 @@
setTimeout(() => {
this.setData({
- baseRefresh: {
- value: false,
- },
- isWhite: false,
+ 'baseRefresh.value': false,
})
}, 500);
},
- // 鑾峰彇娴嬭瘯鐧诲綍鏃剁殑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()
- }
- })
- },
- })
- }
- })
- }
- })
- },
- })
- } else {
- this.getShoppingCartList();
- }
- },
-
- 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({
path: 'jsek_banner\\jsek_homeBannerApplet',
- fields: { jsek_link: [] },
- paging: { start: 0, size: 9 }
+ fields: {
+ jsek_link: []
+ },
+ paging: {
+ start: 0,
+ size: 9
+ }
}).then(res => {
for (let i = 0; i < res.datas.length; i++) {
const item = res.datas[i]
@@ -186,12 +116,13 @@
bannerList: list
})
})
- console.log('杞挱鍥�', this.data.bannerList);
},
loadHomePage() {
- fetchHome().then(({ tabList }) => {
+ fetchHome().then(({
+ tabList
+ }) => {
this.setData({
tabList,
});
@@ -261,7 +192,10 @@
size: '20',
start: '0',
storeRefCode: app.config.digitalCourses,
- sort: { type: 'Asc', field: 'LinkOrder' }
+ sort: {
+ type: 'Asc',
+ field: 'LinkOrder'
+ }
}
app.MG.store.getStoreChannelList(data).then((res) => {
if (res.datas && res.datas.length > 0) {
@@ -317,7 +251,10 @@
size: '20',
start: '0',
storeRefCode: app.config.goodsStore,
- sort: { type: 'Asc', field: 'LinkOrder' }
+ sort: {
+ type: 'Asc',
+ field: 'LinkOrder'
+ }
}
app.MG.store.getStoreChannelList(data).then((res) => {
if (res.datas && res.datas.length > 0) {
@@ -325,7 +262,8 @@
dataList.push(...res.datas)
this.setData({
bookTypeList: dataList,
- activeItem1: 0
+ activeItem1: 0,
+ bookTypeData: dataList[0],
})
this.getBooksList(dataList[0])
}
@@ -357,7 +295,9 @@
//鍥句功鏈嶅姟
tabBookClick(item) {
let info = this.data.bookTypeList[item.detail.value]
- console.log(info, 123)
+ this.setData({
+ bookTypeData: info,
+ })
this.getBooksList(info)
},
//鏁板瓧闃呰
@@ -423,12 +363,10 @@
fields: {
author: [],
},
- filterList: [
- {
- value: 'Normal',
- field: 'state'
- }
- ],
+ filterList: [{
+ value: 'Normal',
+ field: 'state'
+ }],
sort: {
Name: 'Asc',
BaseType: ''
@@ -443,41 +381,51 @@
},
// 璺宠浆鍥句功璇︽儏
goDetail(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.navigateTo({
url: `/packageBookService/pages/bookServices/detail/index?id=${book.id}&name=${book.name}`,
});
},
goSubjectDetail(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
- duration: 2000
+ duration: 1000
})
},
goCourseDetail(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
- duration: 2000
+ duration: 1000
})
},
goReadBookDetail(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
- duration: 2000
+ duration: 1000
})
},
goTextBookDetail(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
- duration: 2000
+ duration: 1000
})
},
@@ -500,8 +448,15 @@
})
},
addCart(e) {
- const { info } = e.currentTarget.dataset;
- console.log(info)
+ const {
+ info
+ } = e.currentTarget.dataset;
+ wx.showToast({
+ title: "寤鸿涓�",
+ icon: 'none',
+ duration: 1000
+ })
+ return;
if (wx.getStorageSync(app.config.tokenKey)) {
let query = {
start: 0,
@@ -522,13 +477,11 @@
})
} else {
let query = {
- requests: [
- {
- saleMethodId: info.defaultSaleMethodId,
- storeEventId: null,
- agentCode: '鐢靛瓙涔�'
- }
- ]
+ requests: [{
+ saleMethodId: info.defaultSaleMethodId,
+ storeEventId: null,
+ agentCode: '鐢靛瓙涔�'
+ }]
}
const addRes = app.MG.store.addShoppingCart(query)
if (addRes) {
@@ -548,16 +501,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
})
}
@@ -571,9 +523,8 @@
})
},
onRetrievalPage() {
- console.log(this.data.searchVal);
wx.navigateTo({
url: '/pages/retrievalPage/index?searchVal=' + this.data.searchVal
})
},
-});
+});
\ No newline at end of file
--
Gitblit v1.9.1