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 |  126 ++++++++++++++++++++---------------------
 1 files changed, 61 insertions(+), 65 deletions(-)

diff --git a/pages/home/home.js b/pages/home/home.js
index 2105851..0a15970 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 { setSessionGuid } from "../../assets/js/userAction"
+import { checkLoginInfo } from '../../assets/js/login';
 const app = getApp()
 Page({
   data: {
@@ -11,7 +11,6 @@
     backUrl: null,
     userInfo: {},
     tabList: [], //鐩綍
-    pageLoading: false,
     current: 1,//杞挱鍥惧弬鏁�
     autoplay: true, //杞挱鍥惧弬鏁�
     duration: '500',//杞挱鍥惧弬鏁�
@@ -28,10 +27,12 @@
     readBookList: [], //鏁板瓧闃呰
     textbookList: [], //鏁板瓧鏁欐潗
     rankingList: [],//鎺掕姒�
-    shoppingCartGetId: []
+    shoppingCartGetId: [],
+    baseRefresh: {
+      value: false
+    }
   },
   onShow() {
-    this.getTabBar().init();
     this.loadHomePage();
     this.getBannerList()
 
@@ -57,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() {
@@ -72,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() {
@@ -152,7 +122,6 @@
           url: '/pages/home/home'
         })
       }
-
     });
   },
   getBannerList() {
@@ -178,14 +147,9 @@
 
 
   loadHomePage() {
-    wx.stopPullDownRefresh();
-    this.setData({
-      pageLoading: true,
-    });
     fetchHome().then(({ tabList }) => {
       this.setData({
         tabList,
-        pageLoading: false,
       });
     });
   },
@@ -226,7 +190,8 @@
         liveTime: [],
         lecturer: [],
         startTime: [],
-        jsek_link: []
+        jsek_link: [],
+        position: []
       }
     }
     app.MG.store.getProductList(obj).then((res) => {
@@ -390,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
       })
@@ -436,6 +404,40 @@
       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,
@@ -518,22 +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