feat 登录token放到globaldata中

api/api.js

@@ -16,7 +16,8 @@ export const userLogin = (data) => requestLogin(data);
 
 // 获取token
 const getToken = () => {
-  return wx.getStorageSync("accessToken") || "";
+  const app = getApp();
+  return app.globalData.accessToken || "";
 };
 
 // 添加token到header

app.js

@@ -84,6 +84,7 @@ App({
             .then((res) => {
               console.log(res);
               wx.setStorageSync("accessToken", res.accessToken);
+              this.globalData.accessToken = res.accessToken;
               this.globalData.isLogin = true;
               if (res.userCode) {
                 this.globalData.userCode = res.userCode;
@@ -145,8 +146,7 @@ App({
   async autoLogin(promotionid) {
     try {
       // 检查是否已经登录
-      const token = wx.getStorageSync("accessToken");
-      if (token) {
+      if (this.globalData.accessToken) {
         // 已经登录
         console.log("已经登录");
         return;
@@ -160,13 +160,13 @@ App({
 
   // 检查登录状态
   checkLoginStatus() {
-    const token = wx.getStorageSync("accessToken");
-    return !!token && this.globalData.isLogin;
+    return !!this.globalData.accessToken && this.globalData.isLogin;
   },
 
   globalData: {
     userInfo: null,
     isLogin: false,
+    accessToken: "",
     novelManager: {},
     uuid: "fuck",
     isShowDialog: false,

pages/bookshelf/bookshelf.js

@@ -1,184 +1,177 @@
-import {
-    getBookshelfList,
-    getBrowsingHistory
-} from '../../api/api'
-import {
-    goToBookDetail, SendEvent
-} from '../../utils/util'
-import {
-    apple
-} from '../../config/config'
+import { getBookshelfList, getBrowsingHistory } from "../../api/api";
+import { goToBookDetail, SendEvent } from "../../utils/util";
+import { apple } from "../../config/config";
 
-let interstitialAd = null
-let app = getApp()
+let interstitialAd = null;
+let app = getApp();
 
 Page({
-    data: {
-        activeTab: 'history',
-        bookList: [],
-        loading: false,
-        hasMore: true,
-        page: 1,
-        size: 10,
-        isLoggedIn: false
-    },
-
-    onLoad() {
-        this.autoLogin()
-    },
-
-    onShow() {
-        // 每次显示页面时刷新列表
-        this.setData({
-            page: 1,
-            bookList: []
-        })
-
-        if (this.data.isLoggedIn) {
-            this.loadBookList()
-        }
-    },
+  data: {
+    activeTab: "history",
+    bookList: [],
+    loading: false,
+    hasMore: true,
+    page: 1,
+    size: 10,
+    isLoggedIn: false,
+  },
 
-    onTabItemTap(item) {
-        console.log(item.index)
-        setTimeout(() => {
-            this.interstitalPlayFn()
-        }, 1000)
-    },
+  onLoad() {
+    this.autoLogin();
+  },
 
-    // 自动登录
-    async autoLogin() {
-        try {
-            // 检查是否已经登录
-            const token = wx.getStorageSync('accessToken');
-            if (token) {
-                this.setData({
-                    isLoggedIn: true
-                });
-                // 已经登录
-                console.log('已经登录')
-                // 页面首次加载时的处理
-                this.loadBookList()
-                this.interstitalLoad()
-                return;
-            }
-            // 未登录，执行登录
-            const res = await getApp().login();
-            this.setData({
-                isLoggedIn: true
-            });
-            console.log('重新登录', res)
-            // 页面首次加载时的处理
-            if (res.accessToken) {
-                this.loadBookList();
-            }
-            this.interstitalLoad();
-        } catch (error) {
-            console.error('登录失败:', error);
-        }
-    },
+  onShow() {
+    // 每次显示页面时刷新列表
+    this.setData({
+      page: 1,
+      bookList: [],
+    });
 
-    // 插屏广告加载
-    interstitalLoad() {
-        let adId = apple.ads.insertAdId
-        interstitialAd = wx.createInterstitialAd({
-            adUnitId: adId
-        })
-        interstitialAd.onLoad(() => {
-            console.log('书架页插屏广告onLoad')
-        })
-        interstitialAd.onError((err) => {
-            console.log('书架页插屏广告onError', err)
-        })
-        interstitialAd.onClose(() => {
-            console.log('书架页插屏广告onClose')
-        })
-    },
+    if (this.data.isLoggedIn) {
+      this.loadBookList();
+    }
+  },
 
-    // 插屏广告展示
-    interstitalPlayFn() {
-        if (interstitialAd) {
-            interstitialAd.show().catch((err) => {
-                console.error('书架页插屏显示错误', err)
-            })
-        }
-    },
+  onTabItemTap(item) {
+    console.log(item.index);
+    setTimeout(() => {
+      this.interstitalPlayFn();
+    }, 1000);
+  },
 
-    // 切换标签
-    switchTab(e) {
-        const tab = e.currentTarget.dataset.tab
+  // 自动登录
+  async autoLogin() {
+    try {
+      // 检查是否已经登录
+      if (app.globalData.accessToken) {
         this.setData({
-            activeTab: tab,
-            page: 1,
-            bookList: []
-        })
-        this.loadBookList()
-    },
+          isLoggedIn: true,
+        });
+        // 已经登录
+        console.log("已经登录");
+        // 页面首次加载时的处理
+        this.loadBookList();
+        this.interstitalLoad();
+        return;
+      }
+      // 未登录，执行登录
+      const res = await getApp().login();
+      this.setData({
+        isLoggedIn: true,
+      });
+      console.log("重新登录", res);
+      // 页面首次加载时的处理
+      if (res.accessToken) {
+        this.loadBookList();
+      }
+      this.interstitalLoad();
+    } catch (error) {
+      console.error("登录失败:", error);
+    }
+  },
 
-    // 加载书架列表
-    async loadBookList() {
-        if (this.data.loading) return
-        this.setData({
-            loading: true
-        })
-        try {
-            let result = [];
-            // 根据当前激活的标签页加载不同的数据
-            if (this.data.activeTab === 'history') {
-                // 加载阅读历史记录
-                result = await getBrowsingHistory();
-            } else {
-                // 加载书架列表
-                result = await getBookshelfList();
-            }
+  // 插屏广告加载
+  interstitalLoad() {
+    let adId = apple.ads.insertAdId;
+    interstitialAd = wx.createInterstitialAd({
+      adUnitId: adId,
+    });
+    interstitialAd.onLoad(() => {
+      console.log("书架页插屏广告onLoad");
+    });
+    interstitialAd.onError((err) => {
+      console.log("书架页插屏广告onError", err);
+    });
+    interstitialAd.onClose(() => {
+      console.log("书架页插屏广告onClose");
+    });
+  },
 
-            if (Array.isArray(result)) {
-                this.setData({
-                    bookList: result,
-                    loading: false,
-                    hasMore: false // 目前接口不支持分页，所以直接设置为false
-                })
-            } else {
-                this.setData({
-                    loading: false,
-                    hasMore: false
-                })
-            }
-        } catch (error) {
-            console.error('加载数据失败:', error)
-            this.setData({
-                loading: false,
-                hasMore: false
-            })
-            wx.showToast({
-                title: '加载失败，请重试',
-                icon: 'none'
-            })
-        }
-    },
+  // 插屏广告展示
+  interstitalPlayFn() {
+    if (interstitialAd) {
+      interstitialAd.show().catch((err) => {
+        console.error("书架页插屏显示错误", err);
+      });
+    }
+  },
+
+  // 切换标签
+  switchTab(e) {
+    const tab = e.currentTarget.dataset.tab;
+    this.setData({
+      activeTab: tab,
+      page: 1,
+      bookList: [],
+    });
+    this.loadBookList();
+  },
 
-    // 加载更多
-    loadMore() {
-        if (this.data.hasMore) {
-            this.loadBookList()
-        }
-    },
+  // 加载书架列表
+  async loadBookList() {
+    if (this.data.loading) return;
+    this.setData({
+      loading: true,
+    });
+    try {
+      let result = [];
+      // 根据当前激活的标签页加载不同的数据
+      if (this.data.activeTab === "history") {
+        // 加载阅读历史记录
+        result = await getBrowsingHistory();
+      } else {
+        // 加载书架列表
+        result = await getBookshelfList();
+      }
 
-    // 跳转到书籍详情
-    goToBookDetail(e) {
-        const book = e.currentTarget.dataset.book;
-        console.log(book)
-        SendEvent('click_shelf_novel', {
-            "video_id": book.novelId,
-            "wx_book_id": book.wxBookId,
-            "chapter_no": book.novelChapterId,
-            "uuid": app.globalData.uuid
+      if (Array.isArray(result)) {
+        this.setData({
+          bookList: result,
+          loading: false,
+          hasMore: false, // 目前接口不支持分页，所以直接设置为false
         });
-        // 使用公共的goToBookDetail函数
-        goToBookDetail({
-            bookId: book.novelId,
-            wxBookId: book.wxBookId,
-            chapterId: book.novelChapterId
+      } else {
+        this.setData({
+          loading: false,
+          hasMore: false,
         });
+      }
+    } catch (error) {
+      console.error("加载数据失败:", error);
+      this.setData({
+        loading: false,
+        hasMore: false,
+      });
+      wx.showToast({
+        title: "加载失败，请重试",
+        icon: "none",
+      });
     }
-})
+  },
+
+  // 加载更多
+  loadMore() {
+    if (this.data.hasMore) {
+      this.loadBookList();
+    }
+  },
+
+  // 跳转到书籍详情
+  goToBookDetail(e) {
+    const book = e.currentTarget.dataset.book;
+    console.log(book);
+    SendEvent("click_shelf_novel", {
+      video_id: book.novelId,
+      wx_book_id: book.wxBookId,
+      chapter_no: book.novelChapterId,
+      uuid: app.globalData.uuid,
+    });
+    // 使用公共的goToBookDetail函数
+    goToBookDetail({
+      bookId: book.novelId,
+      wxBookId: book.wxBookId,
+      chapterId: book.novelChapterId,
+    });
+  },
+});
+

pages/category/category.js

@@ -1,251 +1,254 @@
-import {
-    getCategoryList,
-    getNovelSearch
-} from '../../api/api'
-import {
-    goToBookDetail, SendEvent
-} from '../../utils/util'
-import {
-    apple
-} from '../../config/config'
-
-let interstitialAd = null
-let app = getApp()
+import { getCategoryList, getNovelSearch } from "../../api/api";
+import { goToBookDetail, SendEvent } from "../../utils/util";
+import { apple } from "../../config/config";
+
+let interstitialAd = null;
+let app = getApp();
 
 Page({
-    data: {
-        gender: 'male', // 当前性别选择
-        currentCategory: '', // 当前选中的分类
-        categories: [],
-        bookList: [],
-        loading: false,
-        keyword: '',
-        page: 1,
-        size: 10,
-        hasMore: true, // 是否还有更多数据,
-        isLoggedIn: false, //是否登录
-    },
-
-    onLoad: function (options) {
-        this.autoLogin();
-    },
-
-    onShow: function () {
-        if (this.data.isLoggedIn) {
-            this.syncGenderState();
-        }
-    },
-
-    onTabItemTap: function (item) {
-        console.log(item.index)
-        setTimeout(() => {
-            this.interstitalPlayFn()
-        }, 1000)
-        if (this.data.isLoggedIn) {
-            this.syncGenderState();
-        }
-    },
-
-    // 自动登录
-    async autoLogin() {
-        try {
-            // 检查是否已经登录
-            const token = wx.getStorageSync('accessToken');
-            if (token) {
-                this.setData({
-                    isLoggedIn: true
-                });
-                // 已经登录
-                console.log('已经登录')
-                // 页面首次加载时的处理
-                this.syncGenderState();
-                this.interstitalLoad();
-                return;
-            }
-            // 未登录，执行登录
-            getApp().login().then(res => {
-                this.setData({
-                    isLoggedIn: true
-                });
-                this.syncGenderState();
-                this.interstitalLoad();
-                console.log('重新登录', res)
-            })
-        } catch (error) {
-            console.error('登录失败:', error);
-        }
-    },
-
-    // 插屏广告加载
-    interstitalLoad() {
-        let adId = apple.ads.insertAdId
-        interstitialAd = wx.createInterstitialAd({
-            adUnitId: adId
-        })
-        interstitialAd.onLoad(() => {
-            console.log('分类页插屏广告onLoad')
-        })
-        interstitialAd.onError((err) => {
-            console.log('分类页插屏广告onError', err)
-        })
-        interstitialAd.onClose(() => {
-            console.log('分类页插屏广告onClose')
-        })
-    },
-
-    // 插屏广告展示
-    interstitalPlayFn() {
-        if (interstitialAd) {
-            interstitialAd.show().catch((err) => {
-                console.error('分类页插屏显示错误', err)
-            })
-        }
-    },
-
-    // 同步性别状态
-    syncGenderState: async function () {
-        const gender = wx.getStorageSync('gender') || 'male';
-        if (gender !== this.data.gender) {
-            this.setData({
-                gender
-            });
-            await this.loadCategories();
-        } else {
-            await this.loadCategories();
-        }
-    },
+  data: {
+    gender: "male", // 当前性别选择
+    currentCategory: "", // 当前选中的分类
+    categories: [],
+    bookList: [],
+    loading: false,
+    keyword: "",
+    page: 1,
+    size: 10,
+    hasMore: true, // 是否还有更多数据,
+    isLoggedIn: false, //是否登录
+  },
+
+  onLoad: function (options) {
+    this.autoLogin();
+  },
+
+  onShow: function () {
+    if (this.data.isLoggedIn) {
+      this.syncGenderState();
+    }
+  },
+
+  onTabItemTap: function (item) {
+    console.log(item.index);
+    setTimeout(() => {
+      this.interstitalPlayFn();
+    }, 1000);
+    if (this.data.isLoggedIn) {
+      this.syncGenderState();
+    }
+  },
 
-    // 切换性别
-    switchGender: async function (e) {
-        const {
-            gender
-        } = e.detail;
+  // 自动登录
+  async autoLogin() {
+    try {
+      // 检查是否已经登录
+      if (app.globalData.accessToken) {
         this.setData({
-            gender: gender,
-            currentCategory: '',
-            bookList: [],
-            page: 1,
-            hasMore: true
+          isLoggedIn: true,
         });
-        SendEvent('click_classify_type', { "gender": gender, "uuid": app.globalData.uuid });
-        if (this.data.isLoggedIn) {
-            await this.loadCategories();
-        }
-    },
-
-    // 加载分类列表
-    async loadCategories() {
-        try {
-            const channel = this.data.gender === 'male' ? "man" : "woman";
-            const result = await getCategoryList(channel);
-
-            if (result && Array.isArray(result)) {
-                this.setData({
-                    categories: result,
-                    currentCategory: result[0]?.code || '',
-                    page: 1,
-                    hasMore: true
-                });
-                // 加载第一个分类的书籍
-                if (result[0]?.code) {
-                    this.loadBookList(result[0].code);
-                }
-            }
-        } catch (error) {
-            console.error('加载分类失败:', error);
-            wx.showToast({
-                title: '加载分类失败',
-                icon: 'none'
-            });
-        }
-    },
-
-    // 切换分类
-    switchCategory: function (e) {
-        const category = e.currentTarget.dataset.category;
-        this.setData({
-            currentCategory: category,
-            bookList: [],
-            page: 1,
-            hasMore: true
+        // 已经登录
+        console.log("已经登录");
+        // 页面首次加载时的处理
+        this.syncGenderState();
+        this.interstitalLoad();
+        return;
+      }
+      // 未登录，执行登录
+      getApp()
+        .login()
+        .then((res) => {
+          this.setData({
+            isLoggedIn: true,
+          });
+          this.syncGenderState();
+          this.interstitalLoad();
+          console.log("重新登录", res);
         });
-        SendEvent('click_classify_name', { "category": category, "uuid": app.globalData.uuid });
-        this.loadBookList(category);
-    },
+    } catch (error) {
+      console.error("登录失败:", error);
+    }
+  },
+
+  // 插屏广告加载
+  interstitalLoad() {
+    let adId = apple.ads.insertAdId;
+    interstitialAd = wx.createInterstitialAd({
+      adUnitId: adId,
+    });
+    interstitialAd.onLoad(() => {
+      console.log("分类页插屏广告onLoad");
+    });
+    interstitialAd.onError((err) => {
+      console.log("分类页插屏广告onError", err);
+    });
+    interstitialAd.onClose(() => {
+      console.log("分类页插屏广告onClose");
+    });
+  },
+
+  // 插屏广告展示
+  interstitalPlayFn() {
+    if (interstitialAd) {
+      interstitialAd.show().catch((err) => {
+        console.error("分类页插屏显示错误", err);
+      });
+    }
+  },
+
+  // 同步性别状态
+  syncGenderState: async function () {
+    const gender = wx.getStorageSync("gender") || "male";
+    if (gender !== this.data.gender) {
+      this.setData({
+        gender,
+      });
+      await this.loadCategories();
+    } else {
+      await this.loadCategories();
+    }
+  },
+
+  // 切换性别
+  switchGender: async function (e) {
+    const { gender } = e.detail;
+    this.setData({
+      gender: gender,
+      currentCategory: "",
+      bookList: [],
+      page: 1,
+      hasMore: true,
+    });
+    SendEvent("click_classify_type", {
+      gender: gender,
+      uuid: app.globalData.uuid,
+    });
+    if (this.data.isLoggedIn) {
+      await this.loadCategories();
+    }
+  },
 
-    // 加载书籍列表
-    async loadBookList(category) {
-        if (this.data.loading) return; // 只检查loading状态，移除hasMore检查
+  // 加载分类列表
+  async loadCategories() {
+    try {
+      const channel = this.data.gender === "male" ? "man" : "woman";
+      const result = await getCategoryList(channel);
 
+      if (result && Array.isArray(result)) {
         this.setData({
-            loading: true
+          categories: result,
+          currentCategory: result[0]?.code || "",
+          page: 1,
+          hasMore: true,
         });
-
-        try {
-            const params = {
-                keyword: this.data.keyword,
-                page: this.data.page,
-                size: this.data.size,
-                category: category
-            };
-
-            const result = await getNovelSearch(params);
-
-            if (result && result.records) {
-                const newList = this.data.page === 1 ? result.records : [...this.data.bookList, ...result.records];
-                const hasMore = !result.last;
-
-                this.setData({
-                    bookList: newList,
-                    loading: false,
-                    hasMore: hasMore,
-                    page: hasMore ? this.data.page + 1 : this.data.page
-                });
-            } else {
-                this.setData({
-                    loading: false,
-                    hasMore: false
-                });
-            }
-        } catch (error) {
-            console.error('加载书籍列表失败:', error);
-            this.setData({
-                loading: false,
-                hasMore: false
-            });
-            wx.showToast({
-                title: '加载失败，请重试',
-                icon: 'none'
-            });
+        // 加载第一个分类的书籍
+        if (result[0]?.code) {
+          this.loadBookList(result[0].code);
         }
-    },
+      }
+    } catch (error) {
+      console.error("加载分类失败:", error);
+      wx.showToast({
+        title: "加载分类失败",
+        icon: "none",
+      });
+    }
+  },
+
+  // 切换分类
+  switchCategory: function (e) {
+    const category = e.currentTarget.dataset.category;
+    this.setData({
+      currentCategory: category,
+      bookList: [],
+      page: 1,
+      hasMore: true,
+    });
+    SendEvent("click_classify_name", {
+      category: category,
+      uuid: app.globalData.uuid,
+    });
+    this.loadBookList(category);
+  },
+
+  // 加载书籍列表
+  async loadBookList(category) {
+    if (this.data.loading) return; // 只检查loading状态，移除hasMore检查
+
+    this.setData({
+      loading: true,
+    });
+
+    try {
+      const params = {
+        keyword: this.data.keyword,
+        page: this.data.page,
+        size: this.data.size,
+        category: category,
+      };
+
+      const result = await getNovelSearch(params);
+
+      if (result && result.records) {
+        const newList =
+          this.data.page === 1
+            ? result.records
+            : [...this.data.bookList, ...result.records];
+        const hasMore = !result.last;
 
-    // 监听滚动到底部
-    onScrollToLower: function () {
-        if (this.data.currentCategory && this.data.hasMore) {
-            this.loadBookList(this.data.currentCategory);
-        }
-    },
-
-    // 跳转到书籍详情
-    handleBookTap: function (e) {
-        const {
-            id,
-            wxbookid
-        } = e.currentTarget.dataset;
-        SendEvent('click_classfy_novel', { "novel_id": id, "wx_book_id": wxbookid, "uuid": app.globalData.uuid })
-        goToBookDetail({
-            bookId: id,
-            wxBookId: wxbookid
+        this.setData({
+          bookList: newList,
+          loading: false,
+          hasMore: hasMore,
+          page: hasMore ? this.data.page + 1 : this.data.page,
         });
-    },
-
-    // 跳转到搜索页面
-    goToSearch: function (e) {
-        // 如果有输入内容，则带上关键词
-        const keyword = e.detail?.value || '';
-        wx.navigateTo({
-            url: `/pages/search/search?keyword=${encodeURIComponent(keyword)}`
+      } else {
+        this.setData({
+          loading: false,
+          hasMore: false,
         });
+      }
+    } catch (error) {
+      console.error("加载书籍列表失败:", error);
+      this.setData({
+        loading: false,
+        hasMore: false,
+      });
+      wx.showToast({
+        title: "加载失败，请重试",
+        icon: "none",
+      });
     }
-})
+  },
+
+  // 监听滚动到底部
+  onScrollToLower: function () {
+    if (this.data.currentCategory && this.data.hasMore) {
+      this.loadBookList(this.data.currentCategory);
+    }
+  },
+
+  // 跳转到书籍详情
+  handleBookTap: function (e) {
+    const { id, wxbookid } = e.currentTarget.dataset;
+    SendEvent("click_classfy_novel", {
+      novel_id: id,
+      wx_book_id: wxbookid,
+      uuid: app.globalData.uuid,
+    });
+    goToBookDetail({
+      bookId: id,
+      wxBookId: wxbookid,
+    });
+  },
+
+  // 跳转到搜索页面
+  goToSearch: function (e) {
+    // 如果有输入内容，则带上关键词
+    const keyword = e.detail?.value || "";
+    wx.navigateTo({
+      url: `/pages/search/search?keyword=${encodeURIComponent(keyword)}`,
+    });
+  },
+});
+

pages/index/index.js

@@ -1,567 +1,572 @@
 // index.js
-const defaultAvatarUrl = 'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0'
-const testCover = '/assets/images/bg-book.png'
+const defaultAvatarUrl =
+  "https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0";
+const testCover = "/assets/images/bg-book.png";
 import {
-    getBannerList,
-    getCardNovels,
-    getBrowsingHistory,
-    getNovelDetail
-} from '../../api/api'
-import {
-    goToBookDetail, SendEvent
-} from '../../utils/util'
-import { apple } from '../../config/config'
+  getBannerList,
+  getCardNovels,
+  getBrowsingHistory,
+  getNovelDetail,
+} from "../../api/api";
+import { goToBookDetail, SendEvent } from "../../utils/util";
+import { apple } from "../../config/config";
 
-const app = getApp()
-let interstitialAd = null
+const app = getApp();
+let interstitialAd = null;
 
 Page({
-    data: {
-        isLoggedIn: false,
-        // 轮播配置
-        indicatorDots: true,
-        autoplay: true,
-        interval: 3000,
-        duration: 500,
-        cardNovels: [],
-        bannerList: [], // 添加banner列表数据
-
-        // 性别选项
-        gender: 'male', // male or female
-
-        // 主编推荐数据
-        recommendBooks: [], // 主编推荐数据
-
-        // 推荐书籍列表
-        bookList: [],
-
-        // 全网热推
-        hotBooks: [], // 全网热推数据
-
-        // 强力推荐
-        showStrongRecommend: false, // 控制强力推荐模块显示/隐藏
-        strongBooks: [],
-
-        // 最近阅读书籍
-        recentBook: null, // 最近阅读的书籍
-        showRecentBook: false, // 是否显示最近阅读
-        isRecentBookHidden: false, // 最近阅读是否隐藏
-        recentBookAnimation: {}, // 最近阅读动画数据
-
-        motto: 'Hello World',
-        userInfo: {
-            avatarUrl: defaultAvatarUrl,
-            nickName: '',
-        },
-        hasUserInfo: false,
-        canIUseGetUserProfile: wx.canIUse('getUserProfile'),
-        canIUseNicknameComp: wx.canIUse('input.type.nickname'),
-
-        share_count: 1,
+  data: {
+    isLoggedIn: false,
+    // 轮播配置
+    indicatorDots: true,
+    autoplay: true,
+    interval: 3000,
+    duration: 500,
+    cardNovels: [],
+    bannerList: [], // 添加banner列表数据
+
+    // 性别选项
+    gender: "male", // male or female
+
+    // 主编推荐数据
+    recommendBooks: [], // 主编推荐数据
+
+    // 推荐书籍列表
+    bookList: [],
+
+    // 全网热推
+    hotBooks: [], // 全网热推数据
+
+    // 强力推荐
+    showStrongRecommend: false, // 控制强力推荐模块显示/隐藏
+    strongBooks: [],
+
+    // 最近阅读书籍
+    recentBook: null, // 最近阅读的书籍
+    showRecentBook: false, // 是否显示最近阅读
+    isRecentBookHidden: false, // 最近阅读是否隐藏
+    recentBookAnimation: {}, // 最近阅读动画数据
+
+    motto: "Hello World",
+    userInfo: {
+      avatarUrl: defaultAvatarUrl,
+      nickName: "",
     },
-
-    onLoad(options) {
-        console.log('入参options:', options)
-        const promotionid = options.promotionId;
-        console.log('传入promotionid:', promotionid)
-        this.interstitalLoad()
-        this.autoLogin(promotionid);
-        // 创建动画实例
-        this.recentBookAnimator = wx.createAnimation({
-            duration: 300,
-            timingFunction: 'ease',
+    hasUserInfo: false,
+    canIUseGetUserProfile: wx.canIUse("getUserProfile"),
+    canIUseNicknameComp: wx.canIUse("input.type.nickname"),
+
+    share_count: 1,
+  },
+
+  onLoad(options) {
+    console.log("入参options:", options);
+    const promotionid = options.promotionId;
+    console.log("传入promotionid:", promotionid);
+    this.interstitalLoad();
+    this.autoLogin(promotionid);
+    // 创建动画实例
+    this.recentBookAnimator = wx.createAnimation({
+      duration: 300,
+      timingFunction: "ease",
+    });
+    const scene = wx.getStorageSync("scene");
+    const bookId = parseInt(options.novelId);
+    const jump = options.jump; // 跳转类型 1-不进阅读器
+    console.log("传入jump:", jump);
+    console.log("scene:", scene);
+    console.log("传入novelId:", bookId);
+    if (
+      bookId &&
+      this.data.share_count === 1 &&
+      (scene === 1008 || scene === 1007) &&
+      jump !== 1
+    ) {
+      getNovelDetail(bookId).then((res) => {
+        this.setData({
+          share_count: 2,
         });
-        const scene = wx.getStorageSync('scene');
-        const bookId = parseInt(options.novelId);
-        const jump = options.jump;// 跳转类型 1-不进阅读器
-        console.log('传入jump:', jump)
-        console.log('scene:', scene)
-        console.log('传入novelId:', bookId)
-        if (bookId && this.data.share_count === 1 && (scene === 1008 || scene === 1007) && jump !== 1) {
-            getNovelDetail(bookId).then(res => {
-                this.setData({
-                    share_count: 2
-                })
-                goToBookDetail({
-                    bookId,
-                    wxBookId: res.wxBookId
-                })
-            })
-        } else if (bookId && this.data.share_count === 2) {
-            setTimeout(() => {
-                this.interstitalPlayFn()
-            }, 1000)
-        }
-    },
-
-    onShow() {
-        // 每次页面显示时检查是否需要更新数据
-        if (this.data.isLoggedIn) {
-            this.checkAndUpdateGender();
-            // 每次页面显示时获取最近阅读
-            this.getRecentReadBook();
-        }
-    },
-
-    onTabItemTap(item) {
-        console.log(item.index)
-        setTimeout(() => {
-            this.interstitalPlayFn()
-        }, 1000)
-        // tabBar 点击时检查是否需要更新数据
-        if (this.data.isLoggedIn) {
-            this.checkAndUpdateGender();
-        }
-    },
-
-    // 插屏广告加载
-    interstitalLoad() {
-        let adId = apple.ads.insertAdId
-        interstitialAd = wx.createInterstitialAd({
-            adUnitId: adId
-        })
-        interstitialAd.onLoad(() => {
-            console.log('书城页插屏广告onLoad')
-        })
-        interstitialAd.onError((err) => {
-            console.log('书城页插屏广告onError', err)
-        })
-        interstitialAd.onClose(() => {
-            console.log('书城页插屏广告onClose')
-        })
-    },
-
-    // 插屏广告展示
-    interstitalPlayFn() {
-        if (interstitialAd) {
-            interstitialAd.show().catch((err) => {
-                console.error('书城页插屏显示错误', err)
-            })
-        }
-    },
-
-    // 页面滚动触发
-    onPageScroll(e) {
-        // 清除之前的定时器
-        if (this.scrollTimer) {
-            clearTimeout(this.scrollTimer);
-            this.scrollTimer = null;
-        }
-
-        // 滚动时隐藏最近阅读
-        if (e.scrollTop > 300 && !this.data.isRecentBookHidden && this.data.showRecentBook) {
-            this.hideRecentBook();
-        }
-
-        // 设置滑动停止后的定时器
-        this.lastScrollTop = e.scrollTop;
-        this.scrollTimer = setTimeout(() => {
-            // 2秒后检查是否已经停止滚动
-            if (this.lastScrollTop === e.scrollTop && this.data.isRecentBookHidden && this.data.showRecentBook) {
-                this.showRecentBook();
-            }
-        }, 1500); // 2秒后执行
-    },
-
-    // 隐藏最近阅读
-    hideRecentBook() {
-        // 计算移动距离，只漏出10px
-        const windowWidth = wx.getSystemInfoSync().windowWidth;
-        const rpxToPx = windowWidth / 750; // rpx到px的转换比例
-        const btnWidth = 90 * rpxToPx; // 悬浮按钮宽度，90rpx转换为px
-        const moveX = -(btnWidth + 35); // 只漏出10px
-
-        this.recentBookAnimator.translateX(moveX).step();
+        goToBookDetail({
+          bookId,
+          wxBookId: res.wxBookId,
+        });
+      });
+    } else if (bookId && this.data.share_count === 2) {
+      setTimeout(() => {
+        this.interstitalPlayFn();
+      }, 1000);
+    }
+  },
+
+  onShow() {
+    // 每次页面显示时检查是否需要更新数据
+    if (this.data.isLoggedIn) {
+      this.checkAndUpdateGender();
+      // 每次页面显示时获取最近阅读
+      this.getRecentReadBook();
+    }
+  },
+
+  onTabItemTap(item) {
+    console.log(item.index);
+    setTimeout(() => {
+      this.interstitalPlayFn();
+    }, 1000);
+    // tabBar 点击时检查是否需要更新数据
+    if (this.data.isLoggedIn) {
+      this.checkAndUpdateGender();
+    }
+  },
+
+  // 插屏广告加载
+  interstitalLoad() {
+    let adId = apple.ads.insertAdId;
+    interstitialAd = wx.createInterstitialAd({
+      adUnitId: adId,
+    });
+    interstitialAd.onLoad(() => {
+      console.log("书城页插屏广告onLoad");
+    });
+    interstitialAd.onError((err) => {
+      console.log("书城页插屏广告onError", err);
+    });
+    interstitialAd.onClose(() => {
+      console.log("书城页插屏广告onClose");
+    });
+  },
+
+  // 插屏广告展示
+  interstitalPlayFn() {
+    if (interstitialAd) {
+      interstitialAd.show().catch((err) => {
+        console.error("书城页插屏显示错误", err);
+      });
+    }
+  },
+
+  // 页面滚动触发
+  onPageScroll(e) {
+    // 清除之前的定时器
+    if (this.scrollTimer) {
+      clearTimeout(this.scrollTimer);
+      this.scrollTimer = null;
+    }
+
+    // 滚动时隐藏最近阅读
+    if (
+      e.scrollTop > 300 &&
+      !this.data.isRecentBookHidden &&
+      this.data.showRecentBook
+    ) {
+      this.hideRecentBook();
+    }
+
+    // 设置滑动停止后的定时器
+    this.lastScrollTop = e.scrollTop;
+    this.scrollTimer = setTimeout(() => {
+      // 2秒后检查是否已经停止滚动
+      if (
+        this.lastScrollTop === e.scrollTop &&
+        this.data.isRecentBookHidden &&
+        this.data.showRecentBook
+      ) {
+        this.showRecentBook();
+      }
+    }, 1500); // 2秒后执行
+  },
+
+  // 隐藏最近阅读
+  hideRecentBook() {
+    // 计算移动距离，只漏出10px
+    const windowWidth = wx.getSystemInfoSync().windowWidth;
+    const rpxToPx = windowWidth / 750; // rpx到px的转换比例
+    const btnWidth = 90 * rpxToPx; // 悬浮按钮宽度，90rpx转换为px
+    const moveX = -(btnWidth + 35); // 只漏出10px
+
+    this.recentBookAnimator.translateX(moveX).step();
+    this.setData({
+      recentBookAnimation: this.recentBookAnimator.export(),
+      isRecentBookHidden: true,
+    });
+  },
+
+  // 显示最近阅读
+  showRecentBook() {
+    this.recentBookAnimator.translateX(0).step();
+    this.setData({
+      recentBookAnimation: this.recentBookAnimator.export(),
+      isRecentBookHidden: false,
+    });
+  },
+
+  // 点击隐藏的最近阅读
+  toggleRecentBook() {
+    if (this.data.isRecentBookHidden) {
+      // 隐藏状态点击展开
+      this.showRecentBook();
+    } else {
+      // 展开状态点击跳转
+      this.goToRecentBook();
+    }
+  },
+
+  // 自动登录
+  async autoLogin(promotionid) {
+    try {
+      // 检查是否已经登录
+      if (app.globalData.accessToken) {
         this.setData({
-            recentBookAnimation: this.recentBookAnimator.export(),
-            isRecentBookHidden: true
+          isLoggedIn: true,
         });
-    },
-
-    // 显示最近阅读
-    showRecentBook() {
-        this.recentBookAnimator.translateX(0).step();
+        // 获取性别设置并加载数据
+        this.initGenderAndLoadData();
+        // 获取最近阅读记录
+        this.getRecentReadBook();
+        return;
+      }
+
+      // 未登录，执行登录
+      const res = await getApp().login(promotionid);
+      this.setData({
+        isLoggedIn: true,
+      });
+      // 登录成功后获取性别设置并加载数据
+      this.initGenderAndLoadData();
+      // 获取最近阅读记录
+      this.getRecentReadBook();
+    } catch (error) {
+      console.error("登录失败:", error);
+      // 登录失败也尝试加载数据，使用默认性别
+      this.initGenderAndLoadData();
+    }
+  },
+
+  // 初始化性别设置并加载数据
+  initGenderAndLoadData() {
+    // 获取保存的性别设置，如果没有则使用默认值
+    const gender = wx.getStorageSync("gender") || "male";
+    this.setData({
+      gender,
+    });
+    // 加载所有数据
+    this.loadAllData();
+  },
+
+  // 检查并更新性别，如果有变化则重新加载数据
+  checkAndUpdateGender() {
+    const savedGender = wx.getStorageSync("gender") || "male";
+    if (savedGender !== this.data.gender) {
+      this.setData({
+        gender: savedGender,
+      });
+      this.loadAllData();
+    }
+  },
+
+  // 获取最近阅读的书籍
+  async getRecentReadBook() {
+    try {
+      const historyList = await getBrowsingHistory();
+      if (Array.isArray(historyList) && historyList.length > 0) {
+        // 取第一本作为最近阅读
+        const recentBook = historyList[0];
         this.setData({
-            recentBookAnimation: this.recentBookAnimator.export(),
-            isRecentBookHidden: false
+          recentBook: recentBook,
+          showRecentBook: true,
+          isRecentBookHidden: false,
         });
-    },
-
-    // 点击隐藏的最近阅读
-    toggleRecentBook() {
-        if (this.data.isRecentBookHidden) {
-            // 隐藏状态点击展开
-            this.showRecentBook();
-        } else {
-            // 展开状态点击跳转
-            this.goToRecentBook();
-        }
-    },
 
-    // 自动登录
-    async autoLogin(promotionid) {
-        try {
-            // 检查是否已经登录
-            const token = wx.getStorageSync('accessToken');
-            if (token) {
-                this.setData({
-                    isLoggedIn: true
-                });
-                // 获取性别设置并加载数据
-                this.initGenderAndLoadData();
-                // 获取最近阅读记录
-                this.getRecentReadBook();
-                return;
-            }
-
-            // 未登录，执行登录
-            const res = await getApp().login(promotionid);
-            this.setData({
-                isLoggedIn: true
-            });
-            // 登录成功后获取性别设置并加载数据
-            this.initGenderAndLoadData();
-            // 获取最近阅读记录
-            this.getRecentReadBook();
-
-        } catch (error) {
-            console.error('登录失败:', error);
-            // 登录失败也尝试加载数据，使用默认性别
-            this.initGenderAndLoadData();
+        // 重置动画
+        if (this.recentBookAnimator) {
+          this.recentBookAnimator.translateX(0).step();
+          this.setData({
+            recentBookAnimation: this.recentBookAnimator.export(),
+          });
         }
-    },
-
-    // 初始化性别设置并加载数据
-    initGenderAndLoadData() {
-        // 获取保存的性别设置，如果没有则使用默认值
-        const gender = wx.getStorageSync('gender') || 'male';
+      } else {
         this.setData({
-            gender
+          showRecentBook: false,
         });
-        // 加载所有数据
-        this.loadAllData();
-    },
-
-    // 检查并更新性别，如果有变化则重新加载数据
-    checkAndUpdateGender() {
-        const savedGender = wx.getStorageSync('gender') || 'male';
-        if (savedGender !== this.data.gender) {
-            this.setData({
-                gender: savedGender
-            });
-            this.loadAllData();
-        }
-    },
-
-    // 获取最近阅读的书籍
-    async getRecentReadBook() {
-        try {
-            const historyList = await getBrowsingHistory();
-            if (Array.isArray(historyList) && historyList.length > 0) {
-                // 取第一本作为最近阅读
-                const recentBook = historyList[0];
-                this.setData({
-                    recentBook: recentBook,
-                    showRecentBook: true,
-                    isRecentBookHidden: false
-                });
-
-                // 重置动画
-                if (this.recentBookAnimator) {
-                    this.recentBookAnimator.translateX(0).step();
-                    this.setData({
-                        recentBookAnimation: this.recentBookAnimator.export()
-                    });
-                }
-            } else {
-                this.setData({
-                    showRecentBook: false
-                });
-            }
-        } catch (error) {
-            console.error('获取最近阅读失败:', error);
-            this.setData({
-                showRecentBook: false
-            });
-        }
-    },
-
-    // 跳转到最近阅读的书籍
-    goToRecentBook() {
-        if (this.data.recentBook) {
-            SendEvent('click_bookmall_recently_read', {
-                "video_id": this.data.recentBook.novelId,
-                "wx_book_id": this.data.recentBook.wxBookId,
-                "chapter_no": this.data.recentBook.novelChapterId,
-                "uuid": app.globalData.uuid
-            });
-            goToBookDetail({
-                bookId: this.data.recentBook.novelId,
-                wxBookId: this.data.recentBook.wxBookId,
-                chapterId: this.data.recentBook.novelChapterId
-            });
-        }
-    },
-
-    // 加载所有数据
-    loadAllData() {
-        wx.showLoading({
-            title: '加载中...'
+      }
+    } catch (error) {
+      console.error("获取最近阅读失败:", error);
+      this.setData({
+        showRecentBook: false,
+      });
+    }
+  },
+
+  // 跳转到最近阅读的书籍
+  goToRecentBook() {
+    if (this.data.recentBook) {
+      SendEvent("click_bookmall_recently_read", {
+        video_id: this.data.recentBook.novelId,
+        wx_book_id: this.data.recentBook.wxBookId,
+        chapter_no: this.data.recentBook.novelChapterId,
+        uuid: app.globalData.uuid,
+      });
+      goToBookDetail({
+        bookId: this.data.recentBook.novelId,
+        wxBookId: this.data.recentBook.wxBookId,
+        chapterId: this.data.recentBook.novelChapterId,
+      });
+    }
+  },
+
+  // 加载所有数据
+  loadAllData() {
+    wx.showLoading({
+      title: "加载中...",
+    });
+
+    // 并行请求数据
+    Promise.all([this.getBannerList(), this.getCardNovels()]).finally(() => {
+      wx.hideLoading();
+    });
+  },
+
+  // 切换性别分类
+  switchGender: function (e) {
+    const { gender } = e.detail;
+    // 如果性别没有改变，直接返回
+    if (this.data.gender === gender) {
+      return;
+    }
+
+    // 保存性别设置到本地存储
+    wx.setStorageSync("gender", gender);
+    this.setData({
+      gender,
+    });
+    SendEvent("click_bookmall_classify", {
+      gender: gender,
+      uuid: app.globalData.uuid,
+    });
+    // 重新加载数据
+    this.loadAllData();
+  },
+
+  // 跳转到搜索页面
+  goToSearch: function () {
+    // SendEvent('click_bookmall_classify', {});
+    wx.navigateTo({
+      url: "/pages/search/search",
+    });
+  },
+
+  // 跳转到书籍详情页
+  goToBookDetail: function (e) {
+    const bookId = e.currentTarget.dataset.bookId;
+    const wxBookId = e.currentTarget.dataset.wxBookId;
+    const chapterId = e.currentTarget.dataset.chapterId;
+
+    console.log("bookId", bookId);
+    console.log("wxBookId", wxBookId);
+    console.log("chapterId", chapterId);
+
+    goToBookDetail({
+      bookId,
+      wxBookId,
+      chapterId,
+    });
+  },
+
+  // 跳转到功能页面
+  goToFeature: function (e) {
+    const feature = e.currentTarget.dataset.feature;
+
+    switch (feature) {
+      case "recent":
+        // 修改为跳转到书架页面的阅读历史标签
+        SendEvent("click_shelf_tab", { uuid: app.globalData.uuid });
+        wx.switchTab({
+          url: "/pages/bookshelf/bookshelf",
         });
-
-        // 并行请求数据
-        Promise.all([
-            this.getBannerList(),
-            this.getCardNovels()
-        ]).finally(() => {
-            wx.hideLoading();
+        break;
+      case "user":
+        // 修改为跳转到我的页面
+        SendEvent("click_mine_tab", { uuid: app.globalData.uuid });
+        wx.switchTab({
+          url: "/pages/mine/mine",
         });
-    },
-
-    // 切换性别分类
-    switchGender: function (e) {
-        const {
-            gender
-        } = e.detail;
-        // 如果性别没有改变，直接返回
-        if (this.data.gender === gender) {
-            return;
-        }
-
-        // 保存性别设置到本地存储
-        wx.setStorageSync('gender', gender);
-        this.setData({
-            gender
+        break;
+      case "category":
+        // 修改为跳转到分类页面
+        SendEvent("click_classify_tab", { uuid: app.globalData.uuid });
+        wx.switchTab({
+          url: "/pages/category/category",
         });
-        SendEvent('click_bookmall_classify', {
-            "gender": gender, "uuid": app.globalData.uuid
+        break;
+      case "hot":
+        SendEvent("click_bookmall_classify", { uuid: app.globalData.uuid });
+        wx.navigateTo({
+          url: "/pages/book/list?type=hot",
         });
-        // 重新加载数据
-        this.loadAllData();
-    },
-
-    // 跳转到搜索页面
-    goToSearch: function () {
-        // SendEvent('click_bookmall_classify', {});
+        break;
+      case "recommend":
+        SendEvent("click_bookmall_classify", { uuid: app.globalData.uuid });
         wx.navigateTo({
-            url: '/pages/search/search',
+          url: "/pages/book/list?type=recommend",
         });
-    },
-
-    // 跳转到书籍详情页
-    goToBookDetail: function (e) {
-        const bookId = e.currentTarget.dataset.bookId;
-        const wxBookId = e.currentTarget.dataset.wxBookId;
-        const chapterId = e.currentTarget.dataset.chapterId;
-
-        console.log('bookId', bookId);
-        console.log('wxBookId', wxBookId);
-        console.log('chapterId', chapterId);
-
-        goToBookDetail({
-            bookId,
-            wxBookId,
-            chapterId
+        break;
+      default:
+        break;
+    }
+  },
+
+  bindViewTap() {
+    wx.navigateTo({
+      url: "../logs/logs",
+    });
+  },
+
+  onChooseAvatar(e) {
+    const { avatarUrl } = e.detail;
+    const { nickName } = this.data.userInfo;
+    this.setData({
+      "userInfo.avatarUrl": avatarUrl,
+      hasUserInfo: nickName && avatarUrl && avatarUrl !== defaultAvatarUrl,
+    });
+  },
+
+  onInputChange(e) {
+    const nickName = e.detail.value;
+    const { avatarUrl } = this.data.userInfo;
+    this.setData({
+      "userInfo.nickName": nickName,
+      hasUserInfo: nickName && avatarUrl && avatarUrl !== defaultAvatarUrl,
+    });
+  },
+
+  getUserProfile(e) {
+    // 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认，开发者妥善保管用户快速填写的头像昵称，避免重复弹窗
+    wx.getUserProfile({
+      desc: "展示用户信息", // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+      success: (res) => {
+        console.log(res);
+        this.setData({
+          userInfo: res.userInfo,
+          hasUserInfo: true,
         });
-    },
-
-    // 跳转到功能页面
-    goToFeature: function (e) {
-        const feature = e.currentTarget.dataset.feature;
-
-        switch (feature) {
-            case 'recent':
-                // 修改为跳转到书架页面的阅读历史标签
-                SendEvent('click_shelf_tab', { 'uuid': app.globalData.uuid })
-                wx.switchTab({
-                    url: '/pages/bookshelf/bookshelf'
-                });
-                break;
-            case 'user':
-                // 修改为跳转到我的页面
-                SendEvent('click_mine_tab', { 'uuid': app.globalData.uuid })
-                wx.switchTab({
-                    url: '/pages/mine/mine'
-                });
-                break;
-            case 'category':
-                // 修改为跳转到分类页面
-                SendEvent('click_classify_tab', { 'uuid': app.globalData.uuid })
-                wx.switchTab({
-                    url: '/pages/category/category'
-                });
-                break;
-            case 'hot':
-                SendEvent('click_bookmall_classify', { 'uuid': app.globalData.uuid })
-                wx.navigateTo({
-                    url: '/pages/book/list?type=hot'
-                });
-                break;
-            case 'recommend':
-                SendEvent('click_bookmall_classify', { 'uuid': app.globalData.uuid })
-                wx.navigateTo({
-                    url: '/pages/book/list?type=recommend'
-                });
-                break;
-            default:
-                break;
-        }
-    },
-
-    bindViewTap() {
-        wx.navigateTo({
-            url: '../logs/logs'
-        })
-    },
-
-    onChooseAvatar(e) {
-        const {
-            avatarUrl
-        } = e.detail
-        const {
-            nickName
-        } = this.data.userInfo
+      },
+    });
+  },
+
+  // 获取banner列表
+  async getBannerList() {
+    try {
+      const channel = this.data.gender === "male" ? 1 : 2;
+      const bannerList = await getBannerList(channel);
+      this.setData({
+        bannerList,
+      });
+      return bannerList;
+    } catch (error) {
+      console.error("获取banner失败:", error);
+      wx.showToast({
+        title: "获取banner失败",
+        icon: "none",
+      });
+      return [];
+    }
+  },
+
+  async getCardNovels() {
+    try {
+      const channel = this.data.gender === "male" ? 1 : 2;
+      const cardNovels = await getCardNovels(channel);
+      this.setData({
+        cardNovels,
+      });
+
+      // 处理主编推荐数据
+      if (cardNovels[0]) {
+        const [firstBook, ...restBooks] = cardNovels[0].novelList;
         this.setData({
-            "userInfo.avatarUrl": avatarUrl,
-            hasUserInfo: nickName && avatarUrl && avatarUrl !== defaultAvatarUrl,
-        })
-    },
+          recommendBooks: firstBook
+            ? [
+                {
+                  id: firstBook.id,
+                  title: firstBook.title,
+                  desc: firstBook.brief,
+                  stats: `近期收藏${firstBook.readingNumber}`,
+                  cover: firstBook.cover,
+                  wxBookId: firstBook.wxBookId,
+                  chapterId: firstBook.chapterId,
+                },
+              ]
+            : [],
+          bookList: restBooks.slice(0, 4).map((novel) => ({
+            id: novel.id,
+            title: novel.title,
+            cover: novel.cover,
+            wxBookId: novel.wxBookId,
+            chapterId: novel.chapterId,
+          })),
+          editorTitle: cardNovels[0].name, // 设置实际的标题
+        });
+      }
 
-    onInputChange(e) {
-        const nickName = e.detail.value
-        const {
-            avatarUrl
-        } = this.data.userInfo
+      // 处理全网热推数据
+      if (cardNovels[1]) {
         this.setData({
-            "userInfo.nickName": nickName,
-            hasUserInfo: nickName && avatarUrl && avatarUrl !== defaultAvatarUrl,
-        })
-    },
-
-    getUserProfile(e) {
-        // 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认，开发者妥善保管用户快速填写的头像昵称，避免重复弹窗
-        wx.getUserProfile({
-            desc: '展示用户信息', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
-            success: (res) => {
-                console.log(res)
-                this.setData({
-                    userInfo: res.userInfo,
-                    hasUserInfo: true
-                })
-            }
-        })
-    },
-
-    // 获取banner列表
-    async getBannerList() {
-        try {
-            const channel = this.data.gender === 'male' ? 1 : 2;
-            const bannerList = await getBannerList(channel);
-            this.setData({
-                bannerList
-            });
-            return bannerList;
-        } catch (error) {
-            console.error('获取banner失败:', error);
-            wx.showToast({
-                title: '获取banner失败',
-                icon: 'none'
-            });
-            return [];
-        }
-    },
+          hotBooks: cardNovels[1].novelList.map((novel) => ({
+            id: novel.id,
+            title: novel.title,
+            desc: novel.brief,
+            stats: `${novel.readingNumber}人看过`,
+            cover: novel.cover,
+            wxBookId: novel.wxBookId,
+            chapterId: novel.chapterId,
+          })),
+          hotTitle: cardNovels[1].name, // 设置实际的标题
+        });
+      }
 
-    async getCardNovels() {
-        try {
-            const channel = this.data.gender === 'male' ? 1 : 2;
-            const cardNovels = await getCardNovels(channel);
-            this.setData({
-                cardNovels
-            });
-
-            // 处理主编推荐数据
-            if (cardNovels[0]) {
-                const [firstBook, ...restBooks] = cardNovels[0].novelList;
-                this.setData({
-                    recommendBooks: firstBook ? [{
-                        id: firstBook.id,
-                        title: firstBook.title,
-                        desc: firstBook.brief,
-                        stats: `近期收藏${firstBook.readingNumber}`,
-                        cover: firstBook.cover,
-                        wxBookId: firstBook.wxBookId,
-                        chapterId: firstBook.chapterId
-                    }] : [],
-                    bookList: restBooks.slice(0, 4).map(novel => ({
-                        id: novel.id,
-                        title: novel.title,
-                        cover: novel.cover,
-                        wxBookId: novel.wxBookId,
-                        chapterId: novel.chapterId
-                    })),
-                    editorTitle: cardNovels[0].name // 设置实际的标题
-                });
-            }
-
-            // 处理全网热推数据
-            if (cardNovels[1]) {
-                this.setData({
-                    hotBooks: cardNovels[1].novelList.map(novel => ({
-                        id: novel.id,
-                        title: novel.title,
-                        desc: novel.brief,
-                        stats: `${novel.readingNumber}人看过`,
-                        cover: novel.cover,
-                        wxBookId: novel.wxBookId,
-                        chapterId: novel.chapterId
-                    })),
-                    hotTitle: cardNovels[1].name // 设置实际的标题
-                });
-            }
-
-            // 处理强力推荐数据
-            if (cardNovels[2] && cardNovels[2].novelList.length > 0) {
-                this.setData({
-                    strongBooks: cardNovels[2].novelList.slice(0, 4).map(novel => ({
-                        id: novel.id,
-                        title: novel.title,
-                        cover: novel.cover,
-                        wxBookId: novel.wxBookId,
-                        chapterId: novel.chapterId
-                    })),
-                    showStrongRecommend: true
-                });
-            } else {
-                // 如果没有第三组数据，隐藏强力推荐模块
-                this.setData({
-                    strongBooks: [],
-                    showStrongRecommend: false
-                });
-            }
-
-            return cardNovels;
-        } catch (error) {
-            console.error('获取卡片小说失败:', error);
-            wx.showToast({
-                title: '获取卡片小说失败',
-                icon: 'none'
-            });
-            return [];
-        }
-    },
+      // 处理强力推荐数据
+      if (cardNovels[2] && cardNovels[2].novelList.length > 0) {
+        this.setData({
+          strongBooks: cardNovels[2].novelList.slice(0, 4).map((novel) => ({
+            id: novel.id,
+            title: novel.title,
+            cover: novel.cover,
+            wxBookId: novel.wxBookId,
+            chapterId: novel.chapterId,
+          })),
+          showStrongRecommend: true,
+        });
+      } else {
+        // 如果没有第三组数据，隐藏强力推荐模块
+        this.setData({
+          strongBooks: [],
+          showStrongRecommend: false,
+        });
+      }
+
+      return cardNovels;
+    } catch (error) {
+      console.error("获取卡片小说失败:", error);
+      wx.showToast({
+        title: "获取卡片小说失败",
+        icon: "none",
+      });
+      return [];
+    }
+  },
+
+  // 处理banner点击
+  onBannerTap(e) {
+    const banner = e.currentTarget.dataset.item;
+    if (banner.linkUrl) {
+      SendEvent("banner_click", {
+        banner_id: banner.id,
+        banner_title: banner.title,
+        uuid: app.globalData.uuid,
+      });
+      wx.navigateTo({
+        url: banner.linkUrl,
+      });
+    }
+  },
+});
 
-    // 处理banner点击
-    onBannerTap(e) {
-        const banner = e.currentTarget.dataset.item;
-        if (banner.linkUrl) {
-            SendEvent('banner_click', {
-                "banner_id": banner.id,
-                "banner_title": banner.title,
-                "uuid": app.globalData.uuid
-            });
-            wx.navigateTo({
-                url: banner.linkUrl
-            });
-        }
-    },
-})

pages/mine/mine.js

@@ -1,100 +1,96 @@
 // pages/mine/mine.js
-import {
-    apple
-} from '../../config/config'
+import { apple } from "../../config/config";
 
-import { SendEvent } from '../../utils/util'
+import { SendEvent } from "../../utils/util";
 
-let interstitialAd = null
+let interstitialAd = null;
 
-const app = getApp()
+const app = getApp();
 
 Page({
-    data: {
-        userInfo: {},
-        userCode: '', // 用户id
-    },
+  data: {
+    userInfo: {},
+    userCode: "", // 用户id
+  },
 
-    onLoad: function (options) {
-        this.autoLogin();
-    },
+  onLoad: function (options) {
+    this.autoLogin();
+  },
 
-    onShow() {
+  onShow() {},
 
-    },
+  onTabItemTap(item) {
+    setTimeout(() => {
+      this.interstitalPlayFn();
+    }, 1000);
+    console.log(item.index);
+  },
 
-    onTabItemTap(item) {
-        setTimeout(() => {
-            this.interstitalPlayFn()
-        }, 1000)
-        console.log(item.index)
-    },
+  // 自动登录
+  async autoLogin() {
+    try {
+      // 检查是否已经登录
+      if (app.globalData.accessToken) {
+        this.setData({
+          isLoggedIn: true,
+          userCode: app.globalData.userCode,
+        });
+        // 已经登录
+        console.log("已经登录");
+        // 页面首次加载时的处理
+        this.interstitalLoad();
+        return;
+      }
+      // 未登录，执行登录
+      const res = await app.login().then((res) => {
+        console.log("用户ID：", app.globalData.userCode);
+        this.setData({
+          isLoggedIn: true,
+          userCode: app.globalData.userCode,
+        });
+        console.log("重新登录", res);
+        this.interstitalLoad();
+      });
+    } catch (error) {
+      console.error("登录失败:", error);
+    }
+  },
 
-    // 自动登录
-    async autoLogin() {
-        try {
-            // 检查是否已经登录
-            const token = wx.getStorageSync('accessToken');
-            if (token) {
-                this.setData({
-                    isLoggedIn: true,
-                    userCode: app.globalData.userCode
-                });
-                // 已经登录
-                console.log('已经登录')
-                // 页面首次加载时的处理
-                this.interstitalLoad()
-                return;
-            }
-            // 未登录，执行登录
-            const res = await app.login().then(res => {
-                console.log('用户ID：', app.globalData.userCode)
-                this.setData({
-                    isLoggedIn: true,
-                    userCode: app.globalData.userCode
-                });
-                console.log('重新登录', res)
-                this.interstitalLoad();
-            });
-        } catch (error) {
-            console.error('登录失败:', error);
-        }
-    },
+  // 插屏广告加载
+  interstitalLoad() {
+    let adId = apple.ads.insertAdId;
+    interstitialAd = wx.createInterstitialAd({
+      adUnitId: adId,
+    });
+    interstitialAd.onLoad(() => {
+      console.log("我的页插屏广告onLoad");
+    });
+    interstitialAd.onError((err) => {
+      console.log("我的页插屏广告onError", err);
+    });
+    interstitialAd.onClose(() => {
+      console.log("我的页插屏广告onClose");
+    });
+  },
 
-    // 插屏广告加载
-    interstitalLoad() {
-        let adId = apple.ads.insertAdId
-        interstitialAd = wx.createInterstitialAd({
-            adUnitId: adId
-        })
-        interstitialAd.onLoad(() => {
-            console.log('我的页插屏广告onLoad')
-        })
-        interstitialAd.onError((err) => {
-            console.log('我的页插屏广告onError', err)
-        })
-        interstitialAd.onClose(() => {
-            console.log('我的页插屏广告onClose')
-        })
-    },
+  // 插屏广告展示
+  interstitalPlayFn() {
+    if (interstitialAd) {
+      interstitialAd.show().catch((err) => {
+        console.error("我的页插屏显错误", err);
+      });
+    }
+  },
 
-    // 插屏广告展示
-    interstitalPlayFn() {
-        if (interstitialAd) {
-            interstitialAd.show().catch((err) => {
-                console.error('我的页插屏显错误', err)
-            })
-        }
-    },
+  // onTabItemTap(item) {
+  //     console.log(item.index)
+  // },
 
-    // onTabItemTap(item) {
-    //     console.log(item.index)
-    // },
+  goToReadingHistory() {
+    SendEvent("mine_reading_history", { uuid: app.globalData.uuid });
+    wx.switchTab({
+      url: "/pages/bookshelf/bookshelf",
+    });
+  },
+});
 
-    goToReadingHistory() {
-        SendEvent('mine_reading_history', { "uuid": app.globalData.uuid });
-        wx.switchTab({
-            url: '/pages/bookshelf/bookshelf'
-        });
-    }
-})

utils/request.js

@@ -96,7 +96,8 @@ export const requestLogin = (data) => {
   console.log("开始登录请求，参数：", data);
   return new Promise((resolve, reject) => {
     // 检查是否已经有token
-    const existingToken = wx.getStorageSync("accessToken");
+    const app = getApp();
+    const existingToken = app.globalData.accessToken;
     if (existingToken) {
       console.log("已存在token，跳过登录");
       return resolve({ accessToken: existingToken });
@@ -111,7 +112,9 @@ export const requestLogin = (data) => {
       success: function (res) {
         if (res.data.code == 200) {
           console.log("登录成功，保存token");
+          const app = getApp();
           wx.setStorageSync("accessToken", res.data.data.accessToken);
+          app.globalData.accessToken = res.data.data.accessToken;
           resolve(res.data.data);
         } else {
           console.log("登录失败，错误信息：", res.data);
@@ -153,7 +156,8 @@ export const requestAll = (
   // 封装请求函数
   const doRequest = () => {
     return new Promise((resolve, reject) => {
-      const token = wx.getStorageSync("accessToken") || "";
+      const app = getApp();
+      const token = app.globalData.accessToken || "";
 
       wx.request({
         url: url,
@@ -204,8 +208,10 @@ export const requestAll = (
       try {
         // 使用单例登录Promise
         if (!loginPromise) {
+          const app = getApp();
           wx.removeStorageSync("accessToken");
-          loginPromise = getApp().login();
+          app.globalData.accessToken = "";
+          loginPromise = app.login();
         }
         await loginPromise;
 
@@ -215,7 +221,8 @@ export const requestAll = (
 
         // 执行所有请求
         if (pendingRequests.length > 0) {
-          console.log(wx.getStorageSync("accessToken"));
+          const app = getApp();
+          console.log(app.globalData.accessToken);
           pendingRequests.push(() => doRequest());
           return executePendingRequests();
         }