tj

RuoYi-App/App.vue

@@ -10,13 +10,18 @@ import { getToken } from '@/utils/auth'
 
 export default {
   onLaunch() {
-    // 检查阅读进度
-    this.checkReadingProgress()  
-    // 初始化主题（临时实现）
+    // 初始化主题
     this.initTheme()
+    
+    // 检查阅读进度
+    this.checkReadingProgress()
+    
+    // 初始化 store 状态
+    this.initStoreState()
     // 检查登录状态
     //this.checkLogin()
-    
+      console.log('App launched, store:', this.$store)
+      console.log('TabBar config:', uni.getTabBar())
 
   },
   onShow() {
@@ -26,11 +31,21 @@ export default {
     }
   },
   methods: {
+    // 初始化 store 状态
+    initStoreState() {
+      // 从本地存储恢复状态
+      const token = uni.getStorageSync('token')
+      const readingProgress = uni.getStorageSync('readingProgress') || 1
+      
+      // 提交到 store
+      this.$store.commit('SET_TOKEN', token)
+      this.$store.commit('SET_READING_PROGRESS', readingProgress)
+    },
     // 检查阅读进度
     checkReadingProgress() {
+      // 直接从本地存储读取
       const chapter = uni.getStorageSync('readingProgress') || 1
       
-      // 如果用户阅读超过5章但未登录，提示登录
       if (chapter > 5 && !uni.getStorageSync('token')) {
         uni.showModal({
           title: '登录提示',
@@ -38,30 +53,37 @@ export default {
           confirmText: '立即登录',
           success: (res) => {
             if (res.confirm) {
-              uni.navigateTo({
-                url: '/pages/login'
-              })
+              uni.navigateTo({ url: '/pages/login' })
             }
           }
         })
-		}
-	},
-  async syncReadingProgress() {
-    try {
-      const res = await this.$api.getReadingProgress()
-      const cloudChapter = res.data.chapter
-      const localChapter = uni.getStorageSync('readingProgress') || 1
-      
-      // 使用最新的阅读进度
-      if (cloudChapter > localChapter) {
-        uni.setStorageSync('readingProgress', cloudChapter)
-      } else if (localChapter > cloudChapter) {
-        await this.$api.saveReadingProgress(localChapter)
       }
-    } catch (err) {
-      console.error('同步阅读进度失败', err)
-    }
-  },
+    },
+    // 同步阅读进度 (修改后)
+    async syncReadingProgress() {
+      try {
+        // 安全访问 store
+        if (!this.$store) {
+          console.warn('Store 未初始化，无法同步阅读进度')
+          return
+        }
+        
+        const token = this.$store.getters.token
+        if (!token) {
+          console.log('用户未登录，跳过同步')
+          return
+        }
+        
+        // 从本地存储获取进度
+        const localChapter = uni.getStorageSync('readingProgress') || 1
+        
+        // 调用 API 同步
+        const res = await this.$api.saveReadingProgress(localChapter)
+        console.log('进度同步成功:', res.data)
+      } catch (err) {
+        console.error('同步阅读进度失败', err)
+      }
+    },
     // 添加 checkLogin 方法
     // checkLogin() {
     //   // 这里写登录检查逻辑
@@ -124,6 +146,27 @@ export default {
 </script>
 
 <style lang="scss">
+/* 确保tabbar显示 */
+uni-tabbar {
+  display: flex !important;
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 9999;
+  background-color: #fff;
+  box-shadow: 0 -2px 10px rgba(0,0,0,0.1);
+}
+
+/* 修复高度问题 */
+uni-tabbar .uni-tabbar {
+  height: 50px !important;
+}
+
+/* 页面内容区域 */
+.page-content {
+  padding-bottom: 60px !important;
+}
 /* 保留原有样式 */
 uni-tabbar {
   z-index: 999;

RuoYi-App/main.js

@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import App from './App'
-import store from './store' // store
+import store from './store' // 确保路径正确
+
 import plugins from './plugins' // plugins
 import './permission' // permission
 import { getDicts } from "@/api/system/dict/data"
@@ -11,13 +12,14 @@ Vue.use(http)
 Vue.use(plugins)
 
 Vue.config.productionTip = false
+// 全局挂载 store
 Vue.prototype.$store = store
 Vue.prototype.getDicts = getDicts
 
 App.mpType = 'app'
 
 const app = new Vue({
+  store, // 关键：注入 store
   ...App
 })
-
 app.$mount()

RuoYi-App/pages.json

@@ -7,13 +7,6 @@
         "enablePullDownRefresh": false
       }
     },
-	      {
-	        "path": "pages/novel/list",
-	        "style": {
-	                "navigationBarTitleText": "小说",
-	                "enablePullDownRefresh": false
-	              }
-	      },
     {
       "path": "pages/bookshelf/index",
       "style": {
@@ -27,56 +20,60 @@
       }
     },
     {
+      "path": "pages/novel/list", // 移动到tabBar页面组后面
+      "style": {
+        "navigationBarTitleText": "小说",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
       "path": "pages/login",
       "style": {
         "navigationBarTitleText": "登录"
       }
-    }, 
+    },
     {
-    "path": "pages/register",
-    "style": {
-      "navigationBarTitleText": "注册"
-		}
-	}
-  ],
-  "tabBar": {
-    "color": "#7A7E83",
-    "selectedColor": "#2a5caa", // 使用主色调
-    "borderStyle": "white",
-    "backgroundColor": "#ffffff",
-    "height": "50px",
-    "list": [
-      {
-        "pagePath": "pages/index/index",
-        "iconPath": "static/images/tabbar/home.png",
-        "selectedIconPath": "static/tabbar/home_.png",
-        "text": "首页"
-      },
-	        {
-	          "pagePath": "pages/novel/list",
-	          "text": "小说"
-	        },
-      {
-        "pagePath": "pages/bookshelf/index",
-        "iconPath": "static/images/tabbar/work.png",
-        "selectedIconPath": "static/images/tabbar/work_.png",
-        "text": "书架"
-      },
-      {
-        "pagePath": "pages/me/index",
-        "iconPath": "static/images/tabbar/mine.png",
-        "selectedIconPath": "static/images/tabbar/mine_.png",
-        "text": "我的"
+      "path": "pages/register",
+      "style": {
+        "navigationBarTitleText": "注册"
       }
-    ]
-  },
+    }
+  ],
+"tabBar": {
+  "list": [
+    {
+      "pagePath": "pages/index/index",
+      "iconPath": "/static/tabbar/home.png",
+      "selectedIconPath": "/static/tabbar/home_selected.png",
+      "text": "首页"
+    },
+    {
+      "pagePath": "pages/novel/list",
+      "iconPath": "/static/tabbar/novel.png",
+      "selectedIconPath": "/static/tabbar/novel_selected.png",
+      "text": "小说"
+    },
+    {
+      "pagePath": "pages/bookshelf/index",
+      "iconPath": "/static/tabbar/bookshelf.png",
+      "selectedIconPath": "/static/tabbar/bookshelf_selected.png",
+      "text": "书架"
+    },
+    {
+      "pagePath": "pages/me/index",
+      "iconPath": "/static/tabbar/mine.png",
+      "selectedIconPath": "/static/tabbar/mine_selected.png",
+      "text": "我的"
+    }
+  ]
+},
   "globalStyle": {
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "哎呀免费小说",
     "navigationBarBackgroundColor": "#FFFFFF",
     "backgroundColor": "#F5F5F5",
     "app-plus": {
-      "titleNView": false // 禁用原生导航栏
+      "titleNView": false
     }
   }
-}
+}

RuoYi-App/pages/index/index.vue

@@ -75,7 +75,7 @@ export default {
       recommendedBooks: [],
       serialBooks: [],
       currentReading: null,
-      showLoginPrompt: false,
+      //showLoginPrompt: false,
       maxFreeChapters: 5,
       freeChaptersRead: 0,
       currentChapter: 1, // 当前阅读章节

RuoYi-App/pages/novel/list.vue

@@ -60,4 +60,9 @@ export default {
     }
   }
 }
-</script>
+</script>
+<style scoped>
+.novel-list-page {
+  padding-bottom: 120rpx !important;
+}
+</style>

RuoYi-App/services/api.js

@@ -0,0 +1,20 @@
+import request from '@/utils/request'
+
+export default {
+  // 保存阅读进度
+  saveReadingProgress(chapter) {
+    return request({
+      url: '/java-api/reading/progress',
+      method: 'post',
+      data: { chapter }
+    })
+  },
+  
+  // 获取阅读进度
+  getReadingProgress() {
+    return request({
+      url: '/java-api/reading/progress',
+      method: 'get'
+    })
+  }
+}

RuoYi-App/store/index.js

@@ -12,4 +12,23 @@ const store = new Vuex.Store({
   getters
 })
 
-export default store
+export default new Vuex.Store({
+  state: {
+    token: null,
+    readingProgress: 1
+  },
+  mutations: {
+    SET_TOKEN(state, token) {
+      state.token = token
+      uni.setStorageSync('token', token)
+    },
+    SET_READING_PROGRESS(state, progress) {
+      state.readingProgress = progress
+      uni.setStorageSync('readingProgress', progress)
+    }
+  },
+  getters: {
+    token: state => state.token,
+    getReadingProgress: state => state.readingProgress
+  }
+})

RuoYi-App/utils/request.js

@@ -1,5 +1,5 @@
 import config from '@/config'
-
+import store from '@/store'
 const baseUrl = config.baseUrl
 
 export const http = {