From 10db09788d74b441a2efd85f5d4614e944b07bb3 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 26 三月 2024 20:07:11 +0800
Subject: [PATCH] 问题修改

---
 pages/home/home.js |   87 ++++++++++++-------------------------------
 1 files changed, 25 insertions(+), 62 deletions(-)

diff --git a/pages/home/home.js b/pages/home/home.js
index 60f3e8a..a066913 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: {
@@ -23,6 +23,7 @@
     courseList: [],
     bookTypeList: [],//鍥句功绫诲瀷
     activeItem1: 0,
+    bookTypeData: {},
     booksList: [],
     readBookList: [], //鏁板瓧闃呰
     textbookList: [], //鏁板瓧鏁欐潗
@@ -58,7 +59,13 @@
         backUrl: backUrl.backUrl
       })
     }
-    this.getTestLoginInfo()
+
+    // checkLoginInfo(app, (data) => {
+    //   if (data) {
+    //     this.getCurrentUserInfo();
+    //   }
+    // })
+
     this.init();
   },
   onReachBottom() {
@@ -83,57 +90,9 @@
       })
     }, 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 = {};
@@ -163,7 +122,6 @@
           url: '/pages/home/home'
         })
       }
-
     });
   },
   getBannerList() {
@@ -184,7 +142,6 @@
         bannerList: list
       })
     })
-    console.log('杞挱鍥�', this.data.bannerList);
   },
 
 
@@ -355,7 +312,10 @@
   //鍥句功鏈嶅姟
   tabBookClick(item) {
     let info = this.data.bookTypeList[item.detail.value]
-    console.log(info, 123)
+    bookTypeData
+    this.setData({
+      bookTypeData: info,
+    })
     this.getBooksList(info)
   },
   //鏁板瓧闃呰
@@ -451,7 +411,7 @@
     wx.showToast({
       title: "寤鸿涓�",
       icon: 'none',
-      duration: 2000
+      duration: 1000
     })
   },
   goCourseDetail(e) {
@@ -459,7 +419,7 @@
     wx.showToast({
       title: "寤鸿涓�",
       icon: 'none',
-      duration: 2000
+      duration: 1000
     })
   },
   goReadBookDetail(e) {
@@ -467,7 +427,7 @@
     wx.showToast({
       title: "寤鸿涓�",
       icon: 'none',
-      duration: 2000
+      duration: 1000
     })
   },
   goTextBookDetail(e) {
@@ -475,7 +435,7 @@
     wx.showToast({
       title: "寤鸿涓�",
       icon: 'none',
-      duration: 2000
+      duration: 1000
     })
   },
 
@@ -499,7 +459,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,
@@ -546,16 +511,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
       })
     }
 
@@ -569,7 +533,6 @@
     })
   },
   onRetrievalPage() {
-    console.log(this.data.searchVal);
     wx.navigateTo({
       url: '/pages/retrievalPage/index?searchVal=' + this.data.searchVal
     })

--
Gitblit v1.9.1