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 | 132 ++++++++++++++++++++++++++-----------------
1 files changed, 79 insertions(+), 53 deletions(-)
diff --git a/pages/home/home.js b/pages/home/home.js
index 6b539a6..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 { loginInfo } from '../../assets/js/login';
+import {
+ loginInfo
+} from '../../assets/js/login';
const app = getApp()
Page({
data: {
@@ -10,23 +14,25 @@
isWhite: false,
userInfo: {},
tabList: [], //鐩綍
- current: 1,//杞挱鍥惧弬鏁�
+ 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: false
@@ -49,24 +55,23 @@
// 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲�
// 妫�鏌ョ櫥褰曠姸鎬�
- // const token = wx.getStorageSync(app.config.tokenKey)
- // if (!token) {
- // loginInfo(app, (data) => {
- // // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
- // if (data) {
- // // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
- // } else {
- // // 鍑虹幇閿欒锛岃繑鍥瀎alse
- // }
- // })
- // } else {
- // // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
- // }
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (!token) {
+ loginInfo(app, (data) => {
+ // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
+ if (data) {
+ // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
+ } else {
+ // 鍑虹幇閿欒锛岃繑鍥瀎alse
+ }
+ })
+ } else {
+ // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
+ }
this.init();
},
- onReachBottom() {
- },
+ onReachBottom() {},
onPullDownRefresh() {
this.setData({
'baseRefresh.value': true,
@@ -92,8 +97,13 @@
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]
@@ -110,7 +120,9 @@
loadHomePage() {
- fetchHome().then(({ tabList }) => {
+ fetchHome().then(({
+ tabList
+ }) => {
this.setData({
tabList,
});
@@ -180,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) {
@@ -236,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) {
@@ -244,7 +262,8 @@
dataList.push(...res.datas)
this.setData({
bookTypeList: dataList,
- activeItem1: 0
+ activeItem1: 0,
+ bookTypeData: dataList[0],
})
this.getBooksList(dataList[0])
}
@@ -276,7 +295,6 @@
//鍥句功鏈嶅姟
tabBookClick(item) {
let info = this.data.bookTypeList[item.detail.value]
- bookTypeData
this.setData({
bookTypeData: info,
})
@@ -345,12 +363,10 @@
fields: {
author: [],
},
- filterList: [
- {
- value: 'Normal',
- field: 'state'
- }
- ],
+ filterList: [{
+ value: 'Normal',
+ field: 'state'
+ }],
sort: {
Name: 'Asc',
BaseType: ''
@@ -365,13 +381,17 @@
},
// 璺宠浆鍥句功璇︽儏
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',
@@ -379,7 +399,9 @@
})
},
goCourseDetail(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
@@ -387,7 +409,9 @@
})
},
goReadBookDetail(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
@@ -395,7 +419,9 @@
})
},
goTextBookDetail(e) {
- const { book } = e.currentTarget.dataset;
+ const {
+ book
+ } = e.currentTarget.dataset;
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
@@ -422,7 +448,9 @@
})
},
addCart(e) {
- const { info } = e.currentTarget.dataset;
+ const {
+ info
+ } = e.currentTarget.dataset;
wx.showToast({
title: "寤鸿涓�",
icon: 'none',
@@ -449,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) {
@@ -501,4 +527,4 @@
url: '/pages/retrievalPage/index?searchVal=' + this.data.searchVal
})
},
-});
+});
\ No newline at end of file
--
Gitblit v1.9.1