tj

RuoYi-App/App.vue

@@ -382,9 +382,9 @@ export default {
           }
           
           if (this.$router) {
-            this.$router.push('/pages/login');
+            this.$router.push('/pages/login/index');
           } else if (uni && uni.navigateTo) {
-            uni.navigateTo({ url: '/pages/login' });
+            uni.navigateTo({ url: '/pages/login/index' });
           }
         }
       }

RuoYi-App/api/login.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 登录方法
+// 登录方法 - 修复版
 export function login(username, password, code, uuid) {
   const data = {
     username,
@@ -9,12 +9,24 @@ export function login(username, password, code, uuid) {
     uuid
   }
   return request({
-    'url': '/login',
+    url: '/login',
+    method: 'post',
+    data: data,
+    headers: {
+      isToken: false
+    }
+  })
+}
+
+// 获取验证码
+export function getCodeImg() {
+  return request({
+    url: '/captchaImage',
+    method: 'get',
     headers: {
       isToken: false
     },
-    'method': 'post',
-    'data': data
+    timeout: 20000
   })
 }
 
@@ -22,38 +34,26 @@ export function login(username, password, code, uuid) {
 export function register(data) {
   return request({
     url: '/register',
+    method: 'post',
+    data: data,
     headers: {
       isToken: false
-    },
-    method: 'post',
-    data: data
+    }
   })
 }
 
-// 获取用户详细信息
+// 获取用户信息
 export function getInfo() {
   return request({
-    'url': '/getInfo',
-    'method': 'get'
+    url: '/getInfo',
+    method: 'get'
   })
 }
 
-// 退出方法
+// 退出登录
 export function logout() {
   return request({
-    'url': '/logout',
-    'method': 'post'
-  })
-}
-
-// 获取验证码
-export function getCodeImg() {
-  return request({
-    'url': '/captchaImage',
-    headers: {
-      isToken: false
-    },
-    method: 'get',
-    timeout: 20000
+    url: '/logout',
+    method: 'post'
   })
 }

RuoYi-App/main.js

@@ -33,4 +33,15 @@ new Vue({
       router.push('/pages/novel/list')
     }
   }
-}).$mount('#app')
+}).$mount('#app')
+
+Vue.config.errorHandler = function (err, vm, info) {
+  console.error('Vue错误:', err);
+  console.error('错误信息:', info);
+}
+
+// 全局未处理的Promise拒绝
+window.addEventListener('unhandledrejection', function (event) {
+  console.error('未处理的Promise拒绝:', event.reason);
+  event.preventDefault();
+});

RuoYi-App/pages.json

@@ -8,76 +8,82 @@
       }
     },
     {
-      "path": "pages/bookshelf/index",
+      "path": "pages/novel/list",
       "style": {
-        "navigationBarTitleText": "我的书架"
+        "navigationBarTitleText": "小说",
+        "enablePullDownRefresh": false
       }
     },
     {
-      "path": "pages/me/index",
+      "path": "pages/bookshelf/index",
       "style": {
-        "navigationBarTitleText": "个人中心"
+        "navigationBarTitleText": "我的书架"
       }
     },
     {
-      "path": "pages/novel/list", // 移动到tabBar页面组后面
+      "path": "pages/me/index",
       "style": {
-        "navigationBarTitleText": "小说",
-        "enablePullDownRefresh": false
+        "navigationBarTitleText": "个人中心"
       }
     },
     {
-      "path": "pages/novel/reader",  // 添加阅读器页面配置
+      "path": "pages/novel/reader",
       "style": {
-        "navigationBarTitleText": "阅读",
+        "navigationBarTitleText": "阅读器",
         "enablePullDownRefresh": false,
-        "navigationStyle": "custom",  // 自定义导航栏
+        "navigationStyle": "custom",
         "app-plus": {
-          "titleNView": false  // 禁用原生导航栏
+          "titleNView": false
         }
       }
     },
     {
-      "path": "pages/login",
+      "path": "pages/login/index",
       "style": {
-        "navigationBarTitleText": "登录"
+        "navigationBarTitleText": "登录",
+        "navigationStyle": "custom"
       }
     },
     {
-      "path": "pages/register",
+      "path": "pages/register/index",
       "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": "我的"
-    }
-  ]
-},
+  "tabBar": {
+    "color": "#7a7e83",
+    "selectedColor": "#3a8ee6",
+    "backgroundColor": "#ffffff",
+    "borderStyle": "black",
+    "height": "120rpx",
+    "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": "哎呀免费小说",
@@ -87,4 +93,4 @@
       "titleNView": false
     }
   }
-}
+}

RuoYi-App/pages/index/index.vue

@@ -235,7 +235,7 @@ export default {
       if (this.$store.getters.token) {
         uni.navigateTo({ url: '/pages/user/index' })
       } else {
-        uni.navigateTo({ url: '/pages/login' })
+        uni.navigateTo({ url: '/pages/login/index' })
       }
     },
     
@@ -244,7 +244,7 @@ export default {
     },
     
     goToLogin() {
-      uni.navigateTo({ url: '/pages/login' })
+      uni.navigateTo({ url: '/pages/login/index' })
     },
     // 下一章
     nextChapter() {
@@ -273,7 +273,7 @@ export default {
     // 跳转登录页
     goToLogin() {
       uni.navigateTo({
-        url: '/pages/login'
+        url: '/pages/login/index'
       })
     },
     

RuoYi-App/pages/login.vue

@@ -1,9 +1,15 @@
 <template>
   <view class="normal-login-container">
+
+
     <view class="logo-content align-center justify-center flex">
-      <text class="title">哎呀免费小说登录</text>
+      <image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
+      </image>
+      <text class="title">哎呀电子小说2</text>
     </view>
+
     <view class="login-form-content">
+      <!-- 用户名密码登录 -->
       <view class="input-item flex align-center">
         <view class="iconfont icon-user icon"></view>
         <input v-model="loginForm.username" class="input" type="text" placeholder="请输入账号" maxlength="30" />
@@ -19,9 +25,19 @@
           <image :src="codeUrl" @click="getCode" class="login-code-img"></image>
         </view>
       </view>
+
       <view class="action-btn">
-        <button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">登录</button>
+        <button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">账号登录</button>
+      </view>
+
+      <!-- 微信一键登录 -->
+      <view class="wechat-login-section">
+        <button class="wechat-login-btn" @click="handleWechatLogin">
+          <image src="/static/icons/wechat.png" class="wechat-icon"></image>
+          <text>微信一键登录</text>
+        </button>
       </view>
+
       <view class="reg text-center" v-if="register">
         <text class="text-grey1">没有账号？</text>
         <text @click="handleUserRegister" class="text-blue">立即注册</text>
@@ -31,235 +47,626 @@
         <text @click="handleUserAgrement" class="text-blue">《用户协议》</text>
         <text @click="handlePrivacy" class="text-blue">《隐私协议》</text>
       </view>
-    </view>
-    <view class="reading-tips">
-      <text class="tip-text">登录后即可：</text>
-      <view class="benefits">
-        <text>✓ 继续阅读精彩章节</text>
-        <text>✓ 加入书架保存进度</text>
-        <text>✓ 获得每日阅读奖励</text>
+      
+      <!-- 备案信息 - 只在H5环境中显示 -->
+      <!-- #ifdef H5 -->
+      <view class="beian-info">
+        <view class="beian-links">
+          <a href="https://beian.miit.gov.cn" target="_blank" class="beian-link">陕ICP备2024057340号-2</a>
+<!--          <a href="http://www.beian.gov.cn" target="_blank" class="beian-link">
+            <img src="/static/icons/police-beian.png" class="police-icon" />
+            京公网安备 11010502034567号
+          </a> -->
+        </view>
+        <view class="copyright">
+          © 2025 哎呀电子小说 * 哎呀电子 版权所有
+        </view>
       </view>
+      <!-- #endif -->
+    </view>
+    <!-- 广告组件保持不变 -->
+<!--    <ad-interstitial adpid="1433929280" :loadnext="true" v-slot:default="{loading, error}" @load="onadload" @close="onadclose" @error="onaderror">
+      <button :disabled="loading" :loading="loading">点击广告获取奖励</button>
+      <view v-if="error">{{error}}</view>
+    </ad-interstitial>
+    <view class="ad-view">
+      <ad adpid="1325240772" @load="onload" @close="onclose" @error="onerror"></ad>
     </view>
+    <view class="ad-view">
+      <ad adpid="1695714925" @load="onload1" @close="onclose1" @error="onerror1"></ad>
+    </view> -->
   </view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      codeUrl: "",
-      captchaEnabled: false, // 默认不开启验证码
-      register: false,
-      // 安全的全局配置访问方式
-      globalConfig: {
-        appInfo: {
-          logo: "",
-          agreements: []
+  import { getCodeImg } from '@/api/login'
+import { getToken, setToken, removeToken } from '@/utils/auth'
+  export default {
+    data() {
+      return {
+        codeUrl: "",
+        captchaEnabled: true,
+        // 用户注册开关
+        register: true,
+        wxCode: "", // 添加这个变量来保存微信code
+        globalConfig: {
+          appInfo: {
+            logo: '/static/logo.png',
+            agreements: []
+          }
+        },
+        loginForm: {
+          username: "",
+          password: "",
+          code: "",
+          uuid: ''
         }
-      },
-      loginForm: {
-        username: "",
-        password: "",
-        code: "",
-        uuid: ""
       }
-    }
-  },
-  created() {
-    // 安全地获取全局配置
-    this.safeInit();
-  },
-  onLoad() {
-    // 如果全局配置已设置，则使用全局配置
-    if (this.$config) {
-      this.globalConfig = this.$config;
-    }
-  },
-  methods: {
-    // 安全的初始化方法
-    safeInit() {
-      try {
-        // 安全地获取全局配置
-        if (typeof getApp === 'function') {
-          const app = getApp();
+    },
+    created() {
+      this.safeInitConfig()
+      this.getCode()
+    },
+    methods: {
+      // 安全初始化配置
+      safeInitConfig() {
+        try {
+          const app = getApp()
           if (app && app.globalData && app.globalData.config) {
-            this.globalConfig = app.globalData.config;
+            this.globalConfig = app.globalData.config
+          } else {
+            this.globalConfig = {
+              appInfo: {
+                logo: '/static/logo.png',
+                name: '恋爱圈',
+                agreements: [
+                  { title: '隐私协议', url: 'https://www.aiyadianzi.cn/privacy' },
+                  { title: '用户协议', url: 'https://www.aiyadianzi.cn/agreement' }
+                ]
+              }
+            }
+          }
+        } catch (error) {
+          console.warn('获取全局配置失败:', error)
+          this.globalConfig = {
+            appInfo: {
+              logo: '/static/logo.png',
+              name: '哎呀电子',
+              agreements: []
+            }
           }
         }
+      },
+      
+      // 广告相关方法
+      onadload(e) { console.log('广告数据加载成功') },
+      onadclose(e) { console.log("onadclose",e) },
+      onaderror(e) { console.log("onaderror: ", e.detail) },
+      onload(e) { console.log("onload") },
+      onclose(e) { console.log("onclose: " + e.detail) },
+      onerror(e) { console.log("onerror: " + e.detail.errCode + " message:: " + e.detail.errMsg) },
+      onload1(e) { console.log("onload") },
+      onclose1(e) { console.log("onclose: " + e.detail) },
+      onerror1(e) { console.log("onerror: " + e.detail.errCode + " message:: " + e.detail.errMsg) },
+
+      // 微信登录 - 修复版
+      async handleWechatLogin() {
+        console.log('开始微信登录流程')
         
-        // 尝试获取验证码
-        this.getCodeSafe();
-      } catch (error) {
-        console.error('初始化失败:', error);
-      }
-    },
-    
-    // 安全的获取验证码方法
-    async getCodeSafe() {
-      try {
-        await this.getCode();
-      } catch (error) {
-        console.error('获取验证码失败:', error);
-        // 可以设置默认行为，比如不显示验证码
-        this.captchaEnabled = false;
-      }
-    },
+        try {
+          
+          // 1. 先检查网络状态
+          const networkState = await this.checkNetworkState()
+          if (!networkState) {
+            uni.showToast({
+              title: '网络连接不可用，请检查网络',
+              icon: 'none'
+            })
+            return
+          }
+          
+          // 2. 先获取微信code
+          const loginRes = await this.getWxLoginCode()
+          console.log('微信login结果:', loginRes)
+
+          if (loginRes.errMsg !== 'login:ok' || !loginRes.code) {
+            uni.showToast({
+              title: '获取微信登录凭证失败',
+              icon: 'none'
+            })
+            return
+          }
+          
+          // 保存code，用于后续请求
+          this.wxCode = loginRes.code
+
+          // 3. 显示确认授权弹窗，然后获取用户信息
+          uni.showModal({
+            title: '授权确认',
+            content: '需要获取您的用户信息以完成登录',
+            confirmText: '允许',
+            cancelText: '拒绝',
+            success: async (res) => {
+              if (res.confirm) {
+                // 用户确认授权，获取用户信息
+                await this.getUserInfoAndLogin()
+              } else {
+                uni.showToast({
+                  title: '授权已取消',
+                  icon: 'none'
+                })
+              }
+            }
+          })
+          
+        } catch (error) {
+          console.error('微信登录流程失败:', error)
+          
+          let errorMsg = '登录失败，请重试'
+          if (error.errMsg) {
+            errorMsg = error.errMsg
+          } else if (error.message) {
+            errorMsg = error.message
+          }
+          
+          uni.showToast({
+            title: errorMsg,
+            icon: 'none',
+            duration: 3000
+          })
+        }
+      },
+
+      // 获取用户信息并登录
+      async getUserInfoAndLogin() {
+        try {
+          uni.showLoading({
+            title: '获取用户信息...',
+            mask: true
+          })
+          
+          // 直接调用getUserProfile，确保在用户交互中
+          const userProfileRes = await new Promise((resolve, reject) => {
+            uni.getUserProfile({
+              desc: '用于完善会员资料',
+              success: resolve,
+              fail: reject
+            })
+          })
+          
+          console.log('用户信息获取结果:', userProfileRes)
+          
+          if (userProfileRes.errMsg !== 'getUserProfile:ok') {
+            uni.hideLoading()
+            uni.showToast({
+              title: '获取用户信息失败',
+              icon: 'none'
+            })
+            return
+          }
+          
+          const userInfo = userProfileRes.userInfo
+          uni.hideLoading()
+
+          // 调用后端登录接口
+          await this.sendLoginRequest(this.wxCode, userInfo)
+          
+        } catch (error) {
+          uni.hideLoading()
+          console.error('获取用户信息失败:', error)
+          
+          let errorMsg = '获取用户信息失败'
+          if (error.errMsg) {
+            if (error.errMsg.includes('getUserProfile:fail')) {
+              errorMsg = '用户拒绝授权'
+            } else {
+              errorMsg = error.errMsg
+            }
+          }
+          
+          uni.showToast({
+            title: errorMsg,
+            icon: 'none',
+            duration: 3000
+          })
+        }
+      },
+
+      // 发送登录请求到后端 - 修复版
+      async sendLoginRequest(code, userInfo) {
+        uni.showLoading({
+          title: '登录中...',
+          mask: true
+        })
+        try {
+          const loginData = {
+            code: code,
+            userInfo: {
+              nickName: userInfo.nickName,
+              avatarUrl: userInfo.avatarUrl,
+              gender: userInfo.gender,
+              country: userInfo.country,
+              province: userInfo.province,
+              city: userInfo.city
+            }
+          }
+          
+          console.log('发送登录数据:', loginData)
+          
+          // 使用配置中的baseUrl
+          const baseUrl = this.getBaseUrl()
+          const requestUrl = `${baseUrl}/wxLogin`
+          
+          console.log('请求URL:', requestUrl)
     
-    // 获取验证码
-    async getCode() {
-      // 确保$http对象可用
-      if (!this.$http || typeof this.$http.get !== 'function') {
-        console.warn('$http未定义或不可用');
-        return;
+    const res = await new Promise((resolve, reject) => {
+      uni.request({
+              url: requestUrl,
+              method: 'POST',
+              data: loginData,
+              header: {
+                'content-type': 'application/json',
+              },
+              success: (res) => {
+                console.log('请求成功，状态码:', res.statusCode)
+                console.log('响应数据:', res.data)
+                resolve(res.data)
+              },
+              fail: (err) => {
+                console.error('请求失败:', err)
+                reject(err)
+              }
+            })
+          })
+          
+          uni.hideLoading()
+          console.log('后端登录响应:', res)
+          
+          if (res.code === 200) {
+      // 修复：使用正确的 token 存储方式
+      const token = res.data.token
+      const user = res.data.user
+      
+      console.log('解析出的token:', token)
+      console.log('解析出的user:', user)
+      
+      if (!token) {
+        throw new Error('后端返回的token为空')
       }
       
+      // 修复：使用 auth.js 中的方法存储 token
       try {
-        const res = await this.$http.get('/captchaImage');
-        if (res.code === 200) {
-          this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
-          if (this.captchaEnabled) {
-            this.codeUrl = 'data:image/png;base64,' + res.data.img;
-            this.loginForm.uuid = res.data.uuid;
+        // 使用 setToken 方法存储 token（key 为 'App-Token'）
+        setToken(token)
+        
+        // 存储用户信息到本地存储
+        uni.setStorageSync('userInfo', user)
+        
+        // 验证存储是否成功
+        const storedToken = getToken()  // 使用 getToken 方法获取
+        const storedUserInfo = uni.getStorageSync('userInfo')
+        
+        console.log('存储验证 - token:', storedToken ? '成功' : '失败')
+        console.log('存储验证 - userInfo:', storedUserInfo ? '成功' : '失败')
+        
+        if (!storedToken) {
+          throw new Error('token存储失败')
+        }
+        
+        // 尝试更新 Vuex 状态（如果存在）
+        if (this.$store) {
+          try {
+            // 使用 user.js 中的 mutation 更新状态
+            if (this.$store._mutations && this.$store._mutations['user/SET_TOKEN']) {
+              this.$store.commit('user/SET_TOKEN', token)
+            }
+            
+            if (user && this.$store._mutations && this.$store._mutations['user/SET_NAME']) {
+              const userName = user.nickName || user.userName
+              this.$store.commit('user/SET_NAME', userName)
+            }
+            
+            if (user && user.avatar && this.$store._mutations && this.$store._mutations['user/SET_AVATAR']) {
+              this.$store.commit('user/SET_AVATAR', user.avatar)
+            }
+          } catch (error) {
+            console.warn('Vuex状态更新失败，但不影响登录:', error)
           }
-        } else {
-          console.error('验证码获取失败:', res.msg);
         }
-      } catch (error) {
-        console.error('验证码请求失败:', error);
-        throw error;
+        
+      } catch (storageError) {
+        console.error('存储数据失败:', storageError)
+        throw new Error('登录状态保存失败')
       }
-    },
-    
-    // 用户注册
-    handleUserRegister() {
-      this.$router.push('/pages/register');
-    },
+      
+      // 触发全局用户信息更新事件
+      uni.$emit('userInfoUpdate', user)
+      uni.$emit('loginStatusUpdate', { 
+        isLoggedIn: true, 
+        userInfo: user 
+      })
+      
+      uni.showToast({
+        title: '登录成功',
+        icon: 'success'
+      })
+      
+      // 立即跳转页面
+      setTimeout(() => {
+        this.loginSuccess()
+      }, 500)
+      
+    } else {
+      uni.showToast({
+        title: res.msg || '登录失败，请重试',
+        icon: 'none',
+        duration: 3000
+      })
+    }
     
-    // 隐私协议
-    handlePrivacy() {
-      // 简化处理，直接跳转到webview页面
-      this.$router.push('/pages/common/webview?title=隐私协议&url=https://example.com/privacy');
-    },
+  } catch (error) {
+    uni.hideLoading()
+    console.error('登录请求失败:', error)
     
-    // 用户协议
-    handleUserAgrement() {
-      // 简化处理，直接跳转到webview页面
-      this.$router.push('/pages/common/webview?title=用户协议&url=https://example.com/agreement');
-    },
+    let errorMsg = '登录失败，请重试'
+    if (error.message) {
+      errorMsg = error.message
+    }
     
-    // 登录方法
-    async handleLogin() {
-      if (!this.loginForm.username) {
-        this.$modal.msgError("请输入账号");
-        return;
-      }
+    uni.showToast({
+      title: errorMsg,
+      icon: 'none',
+      duration: 3000
+    })
+  }
+},
+
+      // 获取微信登录code
+      getWxLoginCode() {
+        return new Promise((resolve, reject) => {
+          uni.login({
+            provider: 'weixin',
+            success: resolve,
+            fail: reject
+          })
+        })
+      },
+
+      // 检查网络状态
+      checkNetworkState() {
+        return new Promise((resolve) => {
+          uni.getNetworkType({
+            success: (res) => {
+              if (res.networkType === 'none') {
+                resolve(false)
+              } else {
+                resolve(true)
+              }
+            },
+            fail: () => {
+              resolve(true) // 如果获取网络状态失败，默认继续执行
+            }
+          })
+        })
+      },
+
+      // 获取基础URL - 使用你的配置
+      getBaseUrl() {
+        // 直接从配置中获取baseUrl
+        try {
+          // 方式1: 从全局配置获取
+          const app = getApp()
+          if (app && app.globalData && app.globalData.config && app.globalData.config.baseUrl) {
+            return app.globalData.config.baseUrl
+          }
+          
+          // 方式2: 从Vue原型获取
+          if (this.$config && this.$config.baseUrl) {
+            return this.$config.baseUrl
+          }
+          
+          // 方式3: 使用你的配置中的默认值
+          return 'https://love.aiyadianzi.cn/prod-api' // 使用你配置的生产环境地址
+        } catch (error) {
+          console.warn('获取baseUrl失败，使用默认值:', error)
+          return 'https://love.aiyadianzi.cn/prod-api'
+        }
+      },
+
+      // 原有方法保持不变
+      handleUserRegister() {
+        this.$tab.redirectTo(`/pages/register/index`)
+      },
+      // 隐私协议
+      handlePrivacy() {
+        const site = this.globalConfig.appInfo.agreements[0] || { title: '隐私协议', url: '' }
+        this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`)
+      },
+      // 用户协议
+      handleUserAgrement() {
+        const site = this.globalConfig.appInfo.agreements[1] || { title: '用户协议', url: '' }
+        this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`)
+      },
+      // 获取图形验证码
+      getCode() {
+        getCodeImg().then(res => {
+          this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
+          if (this.captchaEnabled) {
+            this.codeUrl = 'data:image/gif;base64,' + res.img
+            this.loginForm.uuid = res.uuid
+          }
+        }).catch(error => {
+          console.error('获取验证码失败:', error)
+          // 如果API调用失败，使用默认验证码
+          this.captchaEnabled = false
+        })
+      },
+      // 登录方法 - 使用原有的若依登录逻辑
+async handleLogin() {
+  if (!this.loginForm.username) {
+    this.$modal.msgError("请输入您的账号")
+    return
+  }
+  if (!this.loginForm.password) {
+    this.$modal.msgError("请输入您的密码")
+    return
+  }
+  if (this.captchaEnabled && !this.loginForm.code) {
+    this.$modal.msgError("请输入验证码")
+    return
+  }
+
+  this.$modal.loading("登录中，请耐心等待...")
+  
+  try {
+    // 使用原有的Login action
+    await this.$store.dispatch('Login', this.loginForm)
+          
+    // 获取用户信息 - 添加详细的错误处理
+    try {
+      await this.$store.dispatch('GetInfo')
       
-      if (!this.loginForm.password) {
-        this.$modal.msgError("请输入密码");
-        return;
-      }
+      // 确保用户信息正确存储
+      const userInfo = this.$store.state.user
+      console.log('Vuex用户信息:', userInfo)
       
-      if (this.captchaEnabled && !this.loginForm.code) {
-        this.$modal.msgError("请输入验证码");
-        return;
+      // 手动存储用户信息到本地存储，确保一致性
+      if (userInfo && userInfo.name) {
+        uni.setStorageSync('userInfo', {
+          userName: userInfo.name,
+          nickName: userInfo.name,
+          avatar: userInfo.avatar
+        })
       }
       
-      this.$modal.loading("登录中，请耐心等待...");
+      this.$modal.msgSuccess("登录成功")
       
-      try {
-        await this.pwdLogin();
-      } catch (error) {
-        this.$modal.closeLoading();
-        this.$modal.msgError(error.message || '登录失败');
-        
-        // 刷新验证码
-        if (this.captchaEnabled) {
-          this.getCodeSafe();
-        }
-      }
-    },
+      // 立即触发全局状态更新
+      uni.$emit('userInfoUpdate', userInfo)
+      uni.$emit('loginStatusUpdate', { 
+        isLoggedIn: true, 
+        userInfo: userInfo 
+      })
+      
+      // 登录成功处理 - 使用延时确保状态更新完成
+      setTimeout(() => {
+        this.loginSuccess()
+      }, 1000)
+      
+    } catch (infoError) {
+      console.error('获取用户信息失败:', infoError)
+      // 即使获取用户信息失败，只要登录成功就继续
+      this.$modal.msgSuccess("登录成功")
+      setTimeout(() => {
+        this.loginSuccess()
+      }, 1000)
+    }
     
-    // 密码登录
-    async pwdLogin() {
-      try {
-        // 使用安全的API调用方式
-        if (this.$store && this.$store.dispatch) {
-          await this.$store.dispatch('Login', this.loginForm);
-          this.$modal.closeLoading();
-          this.loginSuccess();
-        } else {
-          throw new Error('存储系统不可用');
-        }
-      } catch (error) {
-        console.error('登录失败:', error);
-        throw error;
-      }
-    },
+  } catch (error) {
+    this.$modal.closeLoading()
+    console.error('登录失败:', error)
     
-    // 登录成功后，处理函数
-    loginSuccess() {
-      // 设置用户信息
-      if (this.$store && this.$store.dispatch) {
-        this.$store.dispatch('GetInfo').then(() => {
-          this.$router.replace('/pages/index');
-        }).catch(error => {
-          console.error('获取用户信息失败:', error);
-          this.$router.replace('/pages/index');
-        });
-      } else {
-        this.$router.replace('/pages/index');
-      }
+    let errorMsg = '登录失败'
+    if (error.message) {
+      errorMsg = error.message
+    } else if (error.msg) {
+      errorMsg = error.msg
+    }
+    
+    this.$modal.msgError(errorMsg)
+    
+    if (this.captchaEnabled) {
+      this.getCode()
     }
   }
+},
+
+// 登录成功处理 - 增强版
+loginSuccess() {
+  console.log('执行登录成功跳转')
+  
+  // 多重验证登录状态
+  const token = getToken()
+  const vuexUser = this.$store.state.user
+  const storedUserInfo = uni.getStorageSync('userInfo')
+  
+  console.log('跳转前状态检查:')
+  console.log('- token:', token ? '存在' : '不存在')
+  console.log('- vuex用户:', vuexUser)
+  console.log('- 存储用户:', storedUserInfo)
+  
+  if (token) {
+    console.log('Token存在，允许跳转')
+    
+    // 即使没有完整的用户信息，只要token存在就允许访问
+    uni.switchTab({
+      url: '/pages/user/index',
+      success: () => {
+        console.log('跳转个人中心成功')
+        // 强制刷新页面数据
+        setTimeout(() => {
+          uni.$emit('forceRefreshUserInfo')
+        }, 500)
+      },
+      fail: (err) => {
+        console.error('跳转失败:', err)
+        // 备用跳转方案
+        uni.switchTab({
+          url: '/pages/index/index'
+        })
+      }
+    })
+  } else {
+    console.error('跳转时Token不存在')
+    uni.showToast({
+      title: '登录状态异常，请重新登录',
+      icon: 'none',
+      duration: 3000
+    })
+  }
 }
+    }
+  }
 </script>
 
-<style lang="scss" scoped>
-  /* 保持原有样式不变 */
+<style lang="scss">
   page {
     background-color: #ffffff;
   }
-  
-  .reading-tips {
-    margin-top: 40rpx;
-    padding: 20rpx;
-    background-color: #f9f9f9;
-    border-radius: 10rpx;
-  }
-  
-  .tip-text {
-    font-size: 32rpx;
-    font-weight: bold;
-    display: block;
-    margin-bottom: 20rpx;
-  }
-  
-  .benefits text {
-    display: block;
-    font-size: 28rpx;
-    margin: 10rpx 0;
-    color: #2c3e50;
-  }
-  
+
   .normal-login-container {
     width: 100%;
+    min-height: 100vh;
+    padding: 40rpx;
 
     .logo-content {
       width: 100%;
       font-size: 21px;
       text-align: center;
       padding-top: 15%;
-      
+      flex-direction: column;
+
+      image {
+        border-radius: 4px;
+      }
+
       .title {
-        margin-left: 10px;
+        margin: 10px 0;
+        font-size: 24px;
+        color: #e94f87;
+      }
+      
+      .subtitle {
+        font-size: 14px;
+        color: #999;
       }
     }
 
     .login-form-content {
       text-align: center;
       margin: 20px auto;
-      margin-top: 15%;
-      width: 80%;
+      margin-top: 10%;
+      width: 100%;
 
       .input-item {
         margin: 20px auto;
@@ -280,35 +687,109 @@ export default {
           text-align: left;
           padding-left: 15px;
         }
-
       }
 
       .login-btn {
         margin-top: 40px;
         height: 45px;
+        background: #e94f87 !important;
+        color: #fff;
+        border-radius: 25px;
+        font-size: 16px;
+      }
+      
+      .wechat-login-section {
+        margin: 20px 0;
+      }
+      
+      .wechat-login-btn {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: #07c160;
+        color: #fff;
+        border: none;
+        border-radius: 25px;
+        padding: 12px;
+        font-size: 16px;
+        width: 100%;
+        
+        .wechat-icon {
+          width: 20px;
+          height: 20px;
+          margin-right: 10px;
+        }
       }
       
       .reg {
         margin-top: 15px;
+        font-size: 14px;
       }
       
       .xieyi {
         color: #333;
         margin-top: 20px;
+        font-size: 12px;
       }
       
       .login-code {
         height: 38px;
-        float: right;
-      
+        position: absolute;
+        right: 10px;
+        
         .login-code-img {
           height: 38px;
-          position: absolute;
-          margin-left: 10px;
-          width: 200rpx;
+          width: 100px;
         }
       }
+      
+      /* 备案信息样式 - 只在H5环境中生效 */
+      /* #ifdef H5 */
+      .beian-info {
+        margin-top: 40px;
+        padding-top: 20px;
+        border-top: 1px solid #f0f0f0;
+        text-align: center;
+        color: #999;
+        font-size: 12px;
+        
+        .beian-links {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          flex-wrap: wrap;
+          gap: 15px;
+          margin-bottom: 8px;
+          
+          .beian-link {
+            color: #999;
+            text-decoration: none;
+            display: flex;
+            align-items: center;
+            transition: color 0.3s;
+            
+            &:hover {
+              color: #e94f87;
+            }
+            
+            .police-icon {
+              width: 14px;
+              height: 14px;
+              margin-right: 4px;
+            }
+          }
+        }
+        
+        .copyright {
+          color: #999;
+        }
+      }
+      /* #endif */
     }
   }
-
+  
+  .ad-view {
+    background-color: #FFFFFF;
+    margin-bottom: 20px;
+  }
 </style>

RuoYi-App/pages/login/index.vue

@@ -0,0 +1,300 @@
+<template>
+  <view class="normal-login-container">
+    <view class="logo-content align-center justify-center flex">
+      <image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
+      </image>
+      <text class="title">哎呀电子小说</text>
+    </view>
+
+    <view class="login-form-content">
+      <!-- 用户名密码登录 -->
+      <view class="input-item flex align-center">
+        <view class="iconfont icon-user icon"></view>
+        <input v-model="loginForm.username" class="input" type="text" placeholder="请输入账号" maxlength="30" />
+      </view>
+      <view class="input-item flex align-center">
+        <view class="iconfont icon-password icon"></view>
+        <input v-model="loginForm.password" type="password" class="input" placeholder="请输入密码" maxlength="20" />
+      </view>
+      
+      <!-- 修复验证码显示 -->
+      <view class="input-item flex align-center" v-if="captchaEnabled">
+        <view class="iconfont icon-code icon"></view>
+        <input v-model="loginForm.code" type="text" class="input" placeholder="请输入验证码" maxlength="4" />
+        <view class="login-code"> 
+          <image :src="codeUrl" @click="getCode" class="login-code-img" mode="widthFix"></image>
+        </view>
+      </view>
+
+      <view class="action-btn">
+        <button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">账号登录</button>
+      </view>
+
+      <view class="reg text-center" v-if="register">
+        <text class="text-grey1">没有账号？</text>
+        <text @click="handleUserRegister" class="text-blue">立即注册</text>
+      </view>
+      <view class="xieyi text-center">
+        <text class="text-grey1">登录即代表同意</text>
+        <text @click="handleUserAgrement" class="text-blue">《用户协议》</text>
+        <text @click="handlePrivacy" class="text-blue">《隐私协议》</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { getCodeImg, login } from '@/api/login'
+import { setToken } from '@/utils/auth'
+
+export default {
+  data() {
+    return {
+      codeUrl: "",
+      captchaEnabled: true,
+      register: true,
+      globalConfig: {
+        appInfo: {
+          logo: '/static/logo.png',
+          agreements: []
+        }
+      },
+      loginForm: {
+        username: "",
+        password: "",
+        code: "",
+        uuid: ''
+      }
+    }
+  },
+  onLoad(options) {
+    console.log('登录页面参数:', options)
+    this.redirectUrl = options.redirect || ''
+    this.safeInitConfig()
+    this.getCode()
+  },
+  methods: {
+    // 安全初始化配置
+    safeInitConfig() {
+      try {
+        const app = getApp()
+        if (app && app.globalData && app.globalData.config) {
+          this.globalConfig = app.globalData.config
+        }
+      } catch (error) {
+        console.warn('获取全局配置失败:', error)
+      }
+    },
+
+    // 获取图形验证码
+    async getCode() {
+      try {
+        const res = await getCodeImg()
+        console.log('验证码响应:', res)
+        
+        this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
+        if (this.captchaEnabled) {
+          this.codeUrl = 'data:image/gif;base64,' + res.img
+          this.loginForm.uuid = res.uuid
+          console.log('验证码URL设置成功')
+        }
+      } catch (error) {
+        console.error('获取验证码失败:', error)
+        this.captchaEnabled = false
+        this.$modal.msgError("验证码加载失败")
+      }
+    },
+
+    // 登录方法 - 简化版
+    async handleLogin() {
+      if (!this.loginForm.username) {
+        this.$modal.msgError("请输入您的账号")
+        return
+      }
+      if (!this.loginForm.password) {
+        this.$modal.msgError("请输入您的密码")
+        return
+      }
+      if (this.captchaEnabled && !this.loginForm.code) {
+        this.$modal.msgError("请输入验证码")
+        return
+      }
+
+      this.$modal.loading("登录中，请耐心等待...")
+      
+      try {
+        // 直接调用登录API
+        const res = await login(
+          this.loginForm.username,
+          this.loginForm.password,
+          this.loginForm.code,
+          this.loginForm.uuid
+        )
+        
+        console.log('登录响应:', res)
+        
+        if (res.code === 200 && res.token) {
+          // 存储token
+          setToken(res.token)
+          
+          this.$modal.msgSuccess("登录成功")
+          
+          // 触发全局登录状态更新
+          uni.$emit('loginStatusUpdate', { isLoggedIn: true })
+          
+          // 跳转逻辑
+          setTimeout(() => {
+            this.loginSuccess()
+          }, 1000)
+          
+        } else {
+          this.$modal.msgError(res.msg || '登录失败')
+          if (this.captchaEnabled) {
+            this.getCode()
+          }
+        }
+        
+      } catch (error) {
+        console.error('登录失败:', error)
+        this.$modal.msgError(error.msg || '登录失败，请重试')
+        if (this.captchaEnabled) {
+          this.getCode()
+        }
+      } finally {
+        this.$modal.closeLoading()
+      }
+    },
+
+    // 登录成功处理
+    loginSuccess() {
+      console.log('登录成功，准备跳转')
+      
+      // 如果有重定向URL，跳转到指定页面
+      if (this.redirectUrl) {
+        console.log('跳转到重定向页面:', this.redirectUrl)
+        uni.redirectTo({
+          url: this.redirectUrl
+        })
+      } else {
+        // 默认跳转到首页
+        console.log('跳转到首页')
+        uni.switchTab({
+          url: '/pages/index/index'
+        })
+      }
+    },
+
+    // 其他方法保持不变
+    handleUserRegister() {
+      uni.navigateTo({
+        url: '/pages/register/index'
+      })
+    },
+    
+    handlePrivacy() {
+      const site = this.globalConfig.appInfo.agreements[0] || { title: '隐私协议', url: '' }
+      uni.navigateTo({
+        url: `/pages/common/webview/index?title=${site.title}&url=${site.url}`
+      })
+    },
+    
+    handleUserAgrement() {
+      const site = this.globalConfig.appInfo.agreements[1] || { title: '用户协议', url: '' }
+      uni.navigateTo({
+        url: `/pages/common/webview/index?title=${site.title}&url=${site.url}`
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+page {
+  background-color: #ffffff;
+}
+
+.normal-login-container {
+  width: 100%;
+  min-height: 100vh;
+  padding: 40rpx;
+
+  .logo-content {
+    width: 100%;
+    font-size: 21px;
+    text-align: center;
+    padding-top: 15%;
+    flex-direction: column;
+
+    image {
+      border-radius: 4px;
+    }
+
+    .title {
+      margin: 10px 0;
+      font-size: 24px;
+      color: #e94f87;
+    }
+  }
+
+  .login-form-content {
+    text-align: center;
+    margin: 20px auto;
+    margin-top: 10%;
+    width: 100%;
+
+    .input-item {
+      margin: 20px auto;
+      background-color: #f5f6f7;
+      height: 45px;
+      border-radius: 20px;
+      display: flex;
+      align-items: center;
+      padding: 0 15px;
+
+      .icon {
+        font-size: 20px;
+        color: #999;
+        margin-right: 10px;
+      }
+
+      .input {
+        flex: 1;
+        font-size: 14px;
+        line-height: 20px;
+        text-align: left;
+        background: transparent;
+      }
+    }
+
+    .login-btn {
+      margin-top: 40px;
+      height: 45px;
+      background: #e94f87 !important;
+      color: #fff;
+      border-radius: 25px;
+      font-size: 16px;
+    }
+    
+    .reg {
+      margin-top: 15px;
+      font-size: 14px;
+    }
+    
+    .xieyi {
+      color: #333;
+      margin-top: 20px;
+      font-size: 12px;
+    }
+    
+    .login-code {
+      margin-left: 10px;
+      
+      .login-code-img {
+        height: 38px;
+        width: 100px;
+        border-radius: 4px;
+      }
+    }
+  }
+}
+</style>

RuoYi-App/pages/me/index.vue

@@ -93,7 +93,7 @@ export default {
     
     goToLogin() {
       uni.navigateTo({
-        url: '/pages/login'
+        url: '/pages/login/index'
       })
     },
     

RuoYi-App/pages/novel/detail.vue

@@ -1,114 +1,753 @@
 <template>
-  <view>
-    <!-- 章节间广告 -->
-    <ad-banner v-if="showMidAd" :ads="midAds" />
-    
-    <scroll-view scroll-y>
-      <!-- 章节内容 -->
-      <view v-for="chapter in chapters" :key="chapter.id">
-        <text>{{ chapter.title }}</text>
-        <rich-text :nodes="chapter.content" />
+  <view class="detail-container">
+    <!-- 调试信息 -->
+    <view v-if="debugInfo" class="debug-info">
+      <text>调试信息: novelId={{novelId}}, loading={{loading}}, error={{error}}</text>
+    </view>
+    
+    <!-- 加载状态 -->
+    <view v-if="loading" class="loading-container">
+      <uni-icons type="spinner-cycle" size="36" color="var(--primary-color)" class="loading-icon" />
+      <text>加载中...</text>
+    </view>
+    
+    <!-- 错误状态 -->
+    <view v-else-if="error" class="error-container">
+      <uni-icons type="info" size="48" color="var(--error-color)" />
+      <text class="error-text">{{ error }}</text>
+      <button class="btn-retry" @click="initDetail">重新加载</button>
+    </view>
+    
+    <!-- 内容区域 -->
+    <view v-else class="content-container">
+      <!-- 小说封面和基本信息 -->
+      <view class="novel-header">
+        <!-- 修改封面图片绑定 -->
+        <image 
+          :src="getSafeCoverUrl(novel.coverImg)" 
+          class="novel-cover"
+          mode="aspectFill"
+          @error="handleCoverError"
+        />
+        <view class="novel-info">
+          <text class="update-time">
+            更新时间: {{ formatTime(novel.updateTime) }}
+          </text>
+          <text class="novel-title">{{ novel.title || '未知小说' }}</text>
+          <text class="novel-author">{{ novel.author || '未知作者' }}</text>
+          <text class="novel-meta">{{ novel.categoryName || '未知分类' }} · {{ novel.statusText || '连载中' }}</text>
+          <text class="novel-meta">{{ (novel.wordCount || 0) }}字 · {{ (novel.readCount || 0) }}阅读</text>
+        </view>
       </view>
       
-      <!-- 章节底部广告 -->
-      <ad-banner :ads="chapterAds" />
-    </scroll-view>
-    
-    <!-- 底部操作栏 -->
-    <view class="action-bar">
-      <button @click="prevChapter">上一章</button>
-      <button @click="showCatalog">目录</button>
-      <button @click="nextChapter">下一章</button>
+      <!-- 小说描述 -->
+      <view class="description-section">
+        <text class="section-title">作品简介</text>
+        <text class="novel-description">{{ novel.description || '暂无简介' }}</text>
+      </view>
+      
+      <!-- 操作按钮 -->
+      <view class="action-buttons">
+        <button 
+          class="btn-add-bookshelf" 
+          :class="{ 'in-bookshelf': isInBookshelf }"
+          @click="addToBookshelf"
+        >
+          {{ isInBookshelf ? '已在书架' : '加入书架' }}
+        </button>
+        <button class="btn-start-reading" @click="startReading">
+          开始阅读
+        </button>
+      </view>
+      
+      <!-- 章节列表 -->
+      <view class="chapter-preview">
+        <view class="section-header">
+          <text class="section-title">章节列表</text>
+          <text class="section-more" @click="showAllChapters = !showAllChapters">
+            {{ showAllChapters ? '收起' : '展开' }}
+          </text>
+        </view>
+        <view v-if="displayedChapters.length > 0" class="chapter-list">
+          <view 
+            v-for="chapter in displayedChapters" 
+            :key="chapter.id" 
+            class="chapter-item"
+            @click="readChapter(chapter)"
+          >
+            <text class="chapter-title">{{ chapter.title }}</text>
+            <text class="chapter-time">
+              {{ formatTime(chapter.updateTime, 'MM-DD HH:mm') }}
+            </text>
+          </view>
+        </view>
+        <view v-else class="empty-chapters">
+          <text>暂无章节</text>
+        </view>
+      </view>
     </view>
   </view>
 </template>
 
 <script>
-import AdBanner from '@/components/AdBanner';
+// 导入 request 模块
+import request from '@/utils/request'
+import { getToken, setToken, removeToken } from '@/utils/auth'
 
 export default {
-  components: { AdBanner },
   data() {
     return {
+      novelId: null,
       novel: {},
       chapters: [],
-      currentChapter: 0,
-      // 确保数组初始化
-      midAds: [],
-      chapterAds: [],
-      showMidAd: false
-    };
+      loading: true,
+      error: null,
+      isInBookshelf: false,
+      showAllChapters: false,
+      debugInfo: true
+    }
+  },
+  
+  computed: {
+    // 显示前5章或全部章节
+    displayedChapters() {
+      if (this.showAllChapters) {
+        return this.chapters;
+      }
+      return this.chapters.slice(0, 5);
+    }
   },
+  
   onLoad(options) {
-    this.novelId = options.id;
-    this.loadNovelData();
-    this.scheduleMidAd();
+    console.log('🚨 DETAIL onLoad 开始执行');
+    this.novelId = options.id || this.$route.params.id;
+    console.log('🔍 最终 novelId:', this.novelId);
+    
+    if (!this.novelId) {
+      this.error = '无法获取小说信息';
+      this.loading = false;
+      return;
+    }
+    
+    this.initDetail();
   },
-  methods: {
-    async loadNovelData() {
-      // 加载小说详情
-      const novelRes = await this.$http.get(`/novel/detail/${this.novelId}`);
-      if (novelRes.data) {
-        this.novel = novelRes.data;
+  
+  mounted() {
+    // 检查 uni 对象是否可用
+    if (typeof uni === 'undefined') {
+      console.warn('⚠️ uni 对象未定义，使用 Vue Router 进行导航');
+    } else {
+      console.log('✅ uni 对象可用:', typeof uni.navigateTo);
+    }
+    console.log('🚨 DETAIL mounted 执行');
+    // 备选方案：如果onLoad没有获取到参数，在这里再次尝试
+    if (!this.novelId) {
+      console.log('🔄 mounted中重新获取参数');
+      this.novelId = this.$route.params.id;
+      if (this.novelId) {
+        this.initDetail();
       }
+    }
+  },
+  
+  methods: {
+    // 格式化时间
+    formatTime(time, format = 'YYYY-MM-DD HH:mm') {
+      if (!time) return ''
       
-      // 加载章节列表
-      const chapterRes = await this.$http.get(`/chapter/list/${this.novelId}`);
-      if (chapterRes.rows && Array.isArray(chapterRes.rows)) {
-        this.chapters = chapterRes.rows;
-      }
+      const date = new Date(time)
+      const year = date.getFullYear()
+      const month = String(date.getMonth() + 1).padStart(2, '0')
+      const day = String(date.getDate()).padStart(2, '0')
+      const hour = String(date.getHours()).padStart(2, '0')
+      const minute = String(date.getMinutes()).padStart(2, '0')
+      const second = String(date.getSeconds()).padStart(2, '0')
       
-      // 加载当前章节内容
-      if (this.chapters.length > 0) {
-        await this.loadChapterContent(0);
+      return format
+        .replace('YYYY', year)
+        .replace('MM', month)
+        .replace('DD', day)
+        .replace('HH', hour)
+        .replace('mm', minute)
+        .replace('ss', second)
+    },
+    
+    // 或者使用更简单的时间格式化
+    formatTimeSimple(time) {
+      if (!time) return ''
+      const date = new Date(time)
+      return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`
+    },
+    
+    async initDetail() {
+      try {
+        console.log('🎬 initDetail 开始执行，novelId:', this.novelId)
+        this.loading = true
+        this.error = null
+        
+        // 并行请求小说详情和章节列表
+        const [detailRes, chaptersRes] = await Promise.allSettled([
+          this.loadNovelDetail(),
+          this.loadChapters()
+        ])
+        
+        // 处理结果
+        if (detailRes.status === 'fulfilled') {
+          console.log('✅ 小说详情加载完成')
+        } else {
+          console.error('❌ 小说详情加载失败:', detailRes.reason)
+        }
+        
+        if (chaptersRes.status === 'fulfilled') {
+          console.log('✅ 章节列表加载完成')
+        } else {
+          console.error('❌ 章节列表加载失败:', chaptersRes.reason)
+        }
+        
+        // 检查书架状态
+        this.checkBookshelfStatus()
+        
+      } catch (error) {
+        console.error('🎬 initDetail 执行失败:', error)
+        this.error = '加载失败，请重试'
+      } finally {
+        this.loading = false
+      }
+    },
+    
+    async loadNovelDetail() {
+      try {
+        console.log('📚 开始加载小说详情...')
+        // 明确设置不携带token
+        const res = await request.get(`/novel/detail/${this.novelId}`, {}, {
+          header: {
+            isToken: false
+          }
+        })
+        
+        console.log('✅ 小说详情API响应:', res)
+        
+        if (res && res.code === 200 && res.data) {
+          this.novel = res.data
+          console.log('📖 小说详情数据:', this.novel)
+        } else {
+          console.warn('⚠️ 小说详情接口返回数据异常，使用模拟数据')
+          // 使用模拟数据的逻辑
+          this.useMockData()
+        }
+      } catch (error) {
+        console.error('❌ 加载小说详情失败:', error)
+        console.warn('⚠️ 网络请求失败，使用模拟数据')
+        this.useMockData()
       }
-      
-      // 加载章节广告
-      const adRes = await this.$http.get('/ad/position?code=CHAPTER_FOOTER');
-      this.chapterAds = adRes.data;
     },
     
-    async loadChapterContent(index) {
-      if (index < 0 || index >= this.chapters.length) return;
+// detail.vue 中修改 loadChapters 方法
+async loadChapters() {
+  try {
+    console.log('📑 开始加载章节列表...');
+    
+    // 尝试获取token
+    const token = uni.getStorageSync('token');
+    console.log('🔑 当前token状态:', token ? '已存在' : '不存在');
+    
+    let requestConfig = {
+      header: {
+        isToken: false
+      }
+    };
+    
+    // 如果有token，使用token请求
+    if (token) {
+      requestConfig = {
+        header: {
+          'Authorization': 'Bearer ' + token,
+          isToken: true
+        }
+      };
+      console.log('🔐 使用token请求章节列表');
+    } else {
+      console.log('👤 使用公开API请求章节列表');
+    }
+    
+    // 尝试请求真实数据
+    const res = await request.get(`/chapter/list/${this.novelId}`, {}, requestConfig);
+    
+    console.log('✅ 章节列表API响应:', res);
+    
+    if (res && res.code === 200 && res.rows) {
+      // 注意：后端返回的是 res.rows，不是 res.data
+      this.chapters = res.rows;
+      console.log('📑 章节列表数据:', this.chapters);
+    } else if (res && res.rows) {
+      // 如果直接返回 rows 数组
+      this.chapters = res.rows;
+      console.log('📑 章节列表数据(rows):', this.chapters);
+    } else {
+      console.warn('⚠️ 章节列表接口返回异常，使用模拟数据');
+      this.useMockChapters();
+    }
+  } catch (error) {
+    console.error('❌ 加载章节列表失败:', error);
+    
+    // 如果是401错误，提示用户登录
+    if (error.message && error.message.includes('认证失败')) {
+      uni.showToast({
+        title: '请登录后查看章节',
+        icon: 'none'
+      });
+    }
+    
+    console.warn('⚠️ 网络请求失败，使用模拟章节数据');
+    this.useMockChapters();
+  }
+},
+
+// 改进模拟数据生成
+useMockChapters() {
+  console.log('🎭 生成模拟章节数据');
+  const mockChapters = [];
+  const chapterTitles = [
+    '初遇异能者', '白冰的身世', '小队集结', '首次任务', '危机四伏',
+    '突破极限', '新的伙伴', '黑暗组织', '真相大白', '最终决战'
+  ];
+  
+  // 生成更真实的模拟数据
+  for (let i = 0; i < 15; i++) {
+    const chapterNum = i + 1;
+    const titleIndex = i % chapterTitles.length;
+    mockChapters.push({
+      id: chapterNum,
+      title: `第${chapterNum}章 ${chapterTitles[titleIndex]}`,
+      updateTime: new Date(Date.now() - (15 - i) * 24 * 60 * 60 * 1000),
+      content: `这是第${chapterNum}章的内容...`,
+      wordCount: Math.floor(Math.random() * 3000) + 1500
+    });
+  }
+  
+  this.chapters = mockChapters;
+  console.log('📚 模拟章节数据生成完成:', this.chapters.length + '章');
+},
+
+    
+    useMockChapters() {
+      // 你的模拟章节数据逻辑
+      this.chapters = [
+        { id: 1, title: '第一章 初遇', updateTime: new Date(Date.now() - 2 * 24 * 60 * 60 * 1000) },
+        { id: 2, title: '第二章 相识', updateTime: new Date(Date.now() - 1 * 24 * 60 * 60 * 1000) },
+        { id: 3, title: '第三章 冒险开始', updateTime: new Date() }
+      ]
+    },
+    
+    // 其他方法保持不变...
+    getSafeCoverUrl(coverImg) {
+      if (!coverImg) return '/static/default-cover.jpg';
+      if (coverImg && !coverImg.includes('ishuquge.org') && !coverImg.includes('xshuquge.net')) {
+        return coverImg;
+      }
+      return '/static/default-cover.jpg';
+    },
+    
+    handleCoverError(event) {
+      console.log('封面图片加载失败，使用默认图片');
+      // 注意：在小程序中，可能需要使用不同的方式处理图片错误
+      this.novel.coverImg = '/static/default-cover.jpg';
+    },
+    
+    // 检查书架状态
+    checkBookshelfStatus() {
+      try {
+        const bookshelf = uni.getStorageSync('user_bookshelf') || [];
+        this.isInBookshelf = bookshelf.some(item => item.novelId == this.novelId);
+        console.log('📚 书架状态:', this.isInBookshelf ? '已在书架' : '未在书架');
+      } catch (error) {
+        console.error('检查书架状态失败:', error);
+      }
+    },
+    
+    // 加入书架
+    addToBookshelf() {
+      console.log('📚 加入书架 clicked');
       
-      const chapterId = this.chapters[index].id;
-      const res = await this.$http.get(`/chapter/content/${chapterId}`);
+      // 立即更新状态
+      this.isInBookshelf = true;
       
-      // 更新章节内容
-      if (res.data) {
-        this.$set(this.chapters, index, {
-          ...this.chapters[index],
-          content: res.data.content
+      // 保存到本地存储
+      try {
+        const bookshelf = uni.getStorageSync('user_bookshelf') || [];
+        const existingIndex = bookshelf.findIndex(item => item.novelId == this.novelId);
+        
+        if (existingIndex === -1) {
+          bookshelf.push({
+            novelId: this.novelId,
+            novel: this.novel,
+            addTime: new Date().getTime(),
+            lastReadChapter: 0
+          });
+          uni.setStorageSync('user_bookshelf', bookshelf);
+        }
+        
+        uni.showToast({
+          title: '加入书架成功',
+          icon: 'success',
+          duration: 2000
         });
-        this.currentChapter = index;
-      }}
-,
-    
-    // 定时显示中间广告
-    scheduleMidAd() {
-      setTimeout(async () => {
-        const res = await this.$http.get('/ad/position?code=MID_CHAPTER');
-        this.midAds = res.data;
-        this.showMidAd = true;
         
-        // 10秒后隐藏
-        setTimeout(() => this.showMidAd = false, 10000);
-      }, 30000); // 30秒后显示
+        console.log('✅ 加入书架成功');
+        
+      } catch (error) {
+        console.error('保存到书架失败:', error);
+        uni.showToast({
+          title: '加入书架失败',
+          icon: 'none'
+        });
+      }
     },
     
-    prevChapter() {
-      this.loadChapterContent(this.currentChapter - 1);
+    // 开始阅读
+    startReading() {
+      console.log('📖 开始阅读 clicked, novelId:', this.novelId);
+      
+      if (this.chapters.length === 0) {
+        uni.showToast({
+          title: '暂无章节',
+          icon: 'none'
+        });
+        return;
+      }
+      
+      const firstChapterId = this.chapters[0].id || 1;
+      
+      console.log('🎯 跳转到阅读器，参数:', {
+        novelId: this.novelId,
+        chapterId: firstChapterId
+      });
+      
+      // 安全跳转方法
+      this.safeNavigateToReader(this.novelId, firstChapterId);
     },
     
-    nextChapter() {
-      this.loadChapterContent(this.currentChapter + 1);
+    // 阅读指定章节
+    readChapter(chapter) {
+      console.log('阅读章节:', chapter);
+      const chapterId = chapter.id;
+      
+      this.safeNavigateToReader(this.novelId, chapterId);
     },
     
-    showCatalog() {
-      uni.navigateTo({
-        url: `/pages/novel/catalog?id=${this.novelId}`
+    // 安全跳转到阅读器
+// 安全跳转到阅读器
+safeNavigateToReader(novelId, chapterId) {
+  console.log('🔒 安全跳转: novelId=' + novelId + ', chapterId=' + chapterId);
+  
+  // 方法1: 使用 uni.navigateTo (小程序环境)
+  try {
+    console.log('🔄 尝试使用 uni.navigateTo 跳转...');
+    
+    // 检查目标页面是否存在
+    const pages = getCurrentPages();
+    console.log('📄 当前页面栈:', pages.length);
+    
+    // 构建跳转URL - 确保路径正确
+    const targetUrl = `/pages/novel/reader?novelId=${novelId}&chapterId=${chapterId}`;
+    console.log('🎯 跳转目标URL:', targetUrl);
+    
+    uni.navigateTo({
+      url: targetUrl,
+      success: (res) => {
+        console.log('✅ uni.navigateTo 跳转成功', res);
+      },
+      fail: (err) => {
+        console.error('❌ uni.navigateTo 跳转失败:', err);
+        this.fallbackNavigate(novelId, chapterId);
+      }
+    });
+    
+  } catch (uniError) {
+    console.error('❌ uni.navigateTo 异常:', uniError);
+    this.fallbackNavigate(novelId, chapterId);
+  }
+},
+
+// 备选跳转方案
+fallbackNavigate(novelId, chapterId) {
+  console.log('🔄 启动备选跳转方案');
+  
+  // 方法2: 直接使用 Vue Router (H5环境)
+  try {
+    console.log('🔄 尝试使用 Vue Router 跳转...');
+    if (this.$router) {
+      this.$router.push({
+        path: '/pages/novel/reader',
+        query: {
+          novelId: novelId,
+          chapterId: chapterId
+        }
       });
+      console.log('✅ Vue Router 跳转成功');
+      return;
     }
+  } catch (routerError) {
+    console.error('❌ Vue Router 跳转失败:', routerError);
   }
+  
+  // 方法3: 使用相对路径
+  try {
+    console.log('🔄 尝试使用相对路径跳转...');
+    const currentPath = window.location.pathname;
+    const basePath = currentPath.substring(0, currentPath.lastIndexOf('/'));
+    const targetUrl = `${basePath}/reader?novelId=${novelId}&chapterId=${chapterId}`;
+    
+    window.location.href = targetUrl;
+    console.log('✅ 相对路径跳转成功');
+    return;
+  } catch (locationError) {
+    console.error('❌ 相对路径跳转失败:', locationError);
+  }
+  
+  // 所有方法都失败
+  console.error('💥 所有跳转方法都失败了');
+  uni.showToast({
+    title: '跳转失败，请检查阅读器页面是否存在',
+    icon: 'none',
+    duration: 3000
+  });
+},
+      
+
+
+      
+
+    // 生成模拟小说数据
+    useMockNovelData() {
+      this.novel = {
+        title: '曦与她的冰姐姐',
+        author: '旺旺碎冰冰big',
+        categoryName: '都市言情',
+        statusText: '已完结',
+        wordCount: 118383,
+        readCount: 9972,
+        description: '这是一个异能者的世界。孤曦和白冰都可谓同年龄天才。十岁的相遇。十五岁同队。这是一个小队成长的故事。白冰又有什么样的身世呢。变异生物和人类最终的大结局会是怎样？内多人物。'
+      };
+    },
+    
+    // 生成模拟章节数据
+    generateMockChapters() {
+      const chapters = [];
+      const chapterTitles = [
+        '初遇', '相识', '冒险开始', '新的伙伴', '危机降临',
+        '突破', '成长', '离别', '重逢', '最终决战'
+      ];
+      
+      for (let i = 0; i < 10; i++) {
+        chapters.push({
+          id: i + 1,
+          title: `第${i + 1}章 ${chapterTitles[i] || '新的篇章'}`,
+          updateTime: new Date(Date.now() - (10 - i) * 24 * 60 * 60 * 1000)
+        });
+      }
+      return chapters;
+    }
+  }
+}
+</script>
+
+<style scoped>
+.detail-container {
+  padding: 20rpx;
+  min-height: 100vh;
+  background-color: #f5f5f5;
+}
+
+/* 调试信息样式 */
+.debug-info {
+  background: #ffeb3b;
+  color: #333;
+  padding: 10rpx;
+  font-size: 24rpx;
+  text-align: center;
+  border-bottom: 1rpx solid #ffc107;
+}
+
+.loading-container, .error-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 200rpx 0;
+  text-align: center;
+}
+
+.loading-icon {
+  animation: rotate 1s linear infinite;
+  margin-bottom: 20rpx;
+}
+
+@keyframes rotate {
+  from { transform: rotate(0deg); }
+  to { transform: rotate(360deg); }
+}
+
+.error-text {
+  font-size: 32rpx;
+  color: var(--error-color);
+  margin: 20rpx 0;
+}
+
+.btn-retry {
+  background-color: var(--primary-color);
+  color: white;
+  padding: 20rpx 40rpx;
+  border-radius: 10rpx;
+  margin-top: 20rpx;
+}
+
+.novel-header {
+  display: flex;
+  background: white;
+  padding: 30rpx;
+  border-radius: 16rpx;
+  margin-bottom: 30rpx;
+}
+
+.novel-cover {
+  width: 200rpx;
+  height: 280rpx;
+  border-radius: 12rpx;
+  margin-right: 30rpx;
+  background-color: #f0f0f0;
+}
+
+.novel-info {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+}
+
+.novel-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  margin-bottom: 15rpx;
+  line-height: 1.4;
+}
+
+.novel-author {
+  font-size: 30rpx;
+  color: #666;
+  margin-bottom: 10rpx;
+}
+
+.novel-meta {
+  font-size: 26rpx;
+  color: #888;
+  margin-bottom: 8rpx;
+}
+
+.description-section {
+  background: white;
+  padding: 30rpx;
+  border-radius: 16rpx;
+  margin-bottom: 30rpx;
+}
+
+.section-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  margin-bottom: 20rpx;
+  display: block;
+}
+
+.novel-description {
+  font-size: 28rpx;
+  line-height: 1.6;
+  color: #666;
+}
+
+.action-buttons {
+  display: flex;
+  gap: 20rpx;
+  margin-bottom: 30rpx;
+}
+
+.btn-add-bookshelf, .btn-start-reading {
+  flex: 1;
+  padding: 25rpx;
+  border-radius: 12rpx;
+  font-size: 30rpx;
+  text-align: center;
+  transition: all 0.3s;
+}
+
+.btn-add-bookshelf {
+  background-color: #f8f9fa;
+  color: var(--primary-color);
+  border: 2rpx solid var(--primary-color);
+}
+
+.btn-add-bookshelf.in-bookshelf {
+  background-color: #e8f5e8;
+  color: #67c23a;
+  border-color: #67c23a;
+}
+
+.btn-start-reading {
+  background-color: var(--primary-color);
+  color: white;
+}
+
+.btn-start-reading:active {
+  opacity: 0.8;
+}
+
+.chapter-preview {
+  background: white;
+  padding: 30rpx;
+  border-radius: 16rpx;
+}
+
+.section-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20rpx;
+}
+
+.section-more {
+  font-size: 26rpx;
+  color: var(--primary-color);
+}
+
+.chapter-list {
+  margin-bottom: 20rpx;
+}
+
+.chapter-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx 0;
+  border-bottom: 1rpx solid #f0f0f0;
+  cursor: pointer;
+}
+
+.chapter-item:last-child {
+  border-bottom: none;
+}
+
+.chapter-title {
+  font-size: 28rpx;
+  color: #333;
+  flex: 1;
+}
+
+.chapter-time {
+  font-size: 24rpx;
+  color: #999;
+}
+
+.empty-chapters {
+  text-align: center;
+  padding: 40rpx;
+  color: #999;
 }
-</script>
+</style>

RuoYi-App/pages/novel/list.vue

@@ -241,11 +241,12 @@ useVueRouterFallback(url) {
 // 在 list.vue 中修改 openNovel 方法
 openNovel(novel) {
   try {
-    console.log('准备打开小说:', novel);
+    console.log('📖 准备打开小说:', novel);
     
-    const novelId = novel.id || novel.novelId || novel.bookId;
+    // 确保获取到正确的小说ID
+    const novelId = novel.id || novel.novelId;
     if (!novelId) {
-      console.error('无法获取小说ID:', novel);
+      console.error('❌ 无法获取小说ID:', novel);
       uni.showToast({
         title: '小说ID不存在',
         icon: 'none'
@@ -253,21 +254,23 @@ openNovel(novel) {
       return;
     }
     
-    console.log('跳转到阅读页面，小说ID:', novelId);
+    console.log('🎯 跳转到详情页，小说ID:', novelId);
     
-    // 使用若依框架的标准导航方式
+    // 使用动态路由参数
     this.$router.push({
-      path: '/pages/novel/reader',
-      query: { 
-        novelId: novelId,
-        chapterId: 1
+      name: 'NovelDetail',
+      params: { 
+        id: novelId
       }
     });
   } catch (error) {
-    console.error('openNovel方法执行异常:', error);
-    uni.showToast({
-      title: '发生未知错误',
-      icon: 'none'
+    console.error('💥 openNovel方法执行异常:', error);
+    
+    // 备选方案：使用查询参数
+    const novelId = novel.id || novel.novelId;
+    this.$router.push({
+      path: '/pages/novel/detail',
+      query: { novelId }
     });
   }
 },
@@ -674,7 +677,7 @@ fallbackNavigate(novelId) {
     applyAuthor() {
       if (!this.$store.getters.token) {
         uni.showToast({ title: '请先登录', icon: 'none' });
-        uni.navigateTo({ url: '/pages/login' });
+        uni.navigateTo({ url: '/pages/login/index' });
         return;
       }
       uni.navigateTo({ url: '/pages/author/apply' });

RuoYi-App/pages/novel/read.vue

@@ -1,155 +0,0 @@
-<template>
-  <view class="reading-container">
-    <!-- 顶部章节信息 -->
-    <view class="chapter-header">
-      <text class="chapter-title">{{ chapter.title }}</text>
-    </view>
-    
-    <!-- 小说内容 -->
-    <scroll-view scroll-y class="content-container">
-      <rich-text :nodes="chapter.content" class="content-text"></rich-text>
-    </scroll-view>
-    
-    <!-- 底部操作栏 -->
-    <view class="action-bar">
-      <button @click="prevChapter">上一章</button>
-      <button @click="showCatalog">目录</button>
-      <button @click="nextChapter">下一章</button>
-    </view>
-    
-    <!-- 章节间广告 -->
-    <ad-banner v-if="showAd" :ads="midAds" />
-  </view>
-</template>
-
-<script>
-import AdBanner from '@/components/AdBanner';
-
-export default {
-  components: { AdBanner },
-  data() {
-    return {
-      novelId: null,
-      chapterId: null,
-      chapter: {},
-      chapters: [],
-      showAd: false,
-      midAds: []
-    };
-  },
-  onLoad(options) {
-    this.novelId = options.novelId;
-    this.chapterId = options.chapterId;
-    this.loadChapterData();
-    this.scheduleAd();
-  },
-  methods: {
-    async loadChapterData() {
-      try {
-        // 加载章节列表
-        const chaptersRes = await this.$http.get(`/novel/${this.novelId}/chapters`);
-        this.chapters = chaptersRes.data;
-        
-        // 加载当前章节内容
-        await this.loadChapterContent(this.chapterId || this.chapters[0].id);
-      } catch (e) {
-        uni.showToast({ title: '加载失败', icon: 'none' });
-      }
-    },
-    async loadChapterContent(chapterId) {
-      const res = await this.$http.get(`/novel/chapter/${chapterId}`);
-      this.chapter = res.data;
-      this.chapterId = chapterId;
-      
-      // 保存阅读进度
-      this.saveReadingProgress();
-    },
-    saveReadingProgress() {
-      const progress = {
-        novelId: this.novelId,
-        chapterId: this.chapterId,
-        timestamp: Date.now()
-      };
-      uni.setStorageSync('readingProgress', progress);
-      
-      // 同步到后台
-      if (this.$store.getters.token) {
-        this.$http.post('/user/reading-progress', progress);
-      }
-    },
-    prevChapter() {
-      const currentIndex = this.chapters.findIndex(c => c.id === this.chapterId);
-      if (currentIndex > 0) {
-        this.loadChapterContent(this.chapters[currentIndex - 1].id);
-      }
-    },
-    nextChapter() {
-      const currentIndex = this.chapters.findIndex(c => c.id === this.chapterId);
-      if (currentIndex < this.chapters.length - 1) {
-        this.loadChapterContent(this.chapters[currentIndex + 1].id);
-      }
-    },
-    showCatalog() {
-      uni.navigateTo({
-        url: `/pages/novel/catalog?novelId=${this.novelId}`
-      });
-    },
-    async scheduleAd() {
-      // 30秒后显示广告
-      setTimeout(async () => {
-        const res = await this.$http.get('/ad/position?code=CHAPTER_MID');
-        this.midAds = res.data;
-        this.showAd = true;
-        
-        // 10秒后隐藏
-        setTimeout(() => this.showAd = false, 10000);
-      }, 30000);
-    }
-  }
-}
-</script>
-
-<style scoped>
-.reading-container {
-  padding: 20rpx;
-  padding-bottom: 120rpx; /* 为操作栏留空间 */
-}
-
-.chapter-header {
-  padding: 20rpx 0;
-  border-bottom: 1rpx solid #eee;
-}
-
-.chapter-title {
-  font-size: 36rpx;
-  font-weight: bold;
-}
-
-.content-container {
-  height: calc(100vh - 300rpx);
-  padding: 30rpx 0;
-}
-
-.content-text {
-  font-size: 32rpx;
-  line-height: 1.8;
-}
-
-.action-bar {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  display: flex;
-  background: white;
-  padding: 20rpx;
-  box-shadow: 0 -2rpx 10rpx rgba(0,0,0,0.1);
-  z-index: 999;
-}
-
-.action-bar button {
-  flex: 1;
-  margin: 0 10rpx;
-  font-size: 28rpx;
-}
-</style>

RuoYi-App/pages/novel/reader.vue

@@ -1,412 +1,554 @@
 <template>
-  <view class="reader-container" :class="{ 'night-mode': nightMode }">
-    <!-- 顶部导航栏 -->
-    <view class="reader-header" v-if="showHeader">
-      <view class="header-left">
-        <text class="iconfont icon-back" @click="goBack"></text>
-        <text class="novel-title">{{novelTitle}}</text>
-      </view>
-      <view class="header-right">
-        <text class="iconfont icon-menu" @click="showMenu"></text>
-      </view>
+  <view class="reader-container">
+    <!-- 登录提示 -->
+    <view v-if="requireLogin" class="login-prompt">
+      <text>免费章节已结束，登录后继续阅读</text>
+      <button class="btn-login" @click="showLoginPrompt">立即登录</button>
     </view>
-
-    <!-- 阅读内容区域 -->
-    <scroll-view 
-      class="reader-content" 
-      scroll-y 
-      :scroll-top="scrollTop"
-      @scroll="onScroll"
-      @touchstart="onTouchStart"
-      @touchend="onTouchEnd"
-    >
-      <view class="chapter-title">{{chapterTitle}}</view>
-      <view class="content-text">
-        <text>{{content}}</text>
+    
+    <!-- 广告提示 -->
+    <view v-if="showAd" class="ad-prompt">
+      <text>VIP用户免广告，开通VIP享受更好的阅读体验</text>
+    </view>
+    <!-- 加载状态 -->
+    <view v-if="loading" class="loading-container">
+      <uni-icons type="spinner-cycle" size="36" color="var(--primary-color)" class="loading-icon" />
+      <text>加载中...</text>
+    </view>
+    
+    <!-- 错误状态 -->
+    <view v-else-if="error" class="error-container">
+      <uni-icons type="info" size="48" color="var(--error-color)" />
+      <text class="error-text">{{ error }}</text>
+      <button class="btn-retry" @click="retryLoad">重新加载</button>
+    </view>
+    
+    <!-- 内容区域 -->
+    <view v-else class="content-container">
+      <!-- 小说标题 -->
+      <view class="novel-header">
+        <text class="novel-title">{{ novel.title || '加载中...' }}</text>
+        <text class="novel-author">{{ novel.author || '未知作者' }}</text>
       </view>
       
-      <!-- 加载状态 -->
-      <view v-if="loading" class="loading-container">
-        <text>加载中...</text>
+      <!-- 章节标题 -->
+      <view class="chapter-header">
+        <text class="chapter-title">{{ currentChapter.title || '第一章' }}</text>
       </view>
       
-      <!-- 错误状态 -->
-      <view v-if="error" class="error-container">
-        <text>{{error}}</text>
-        <button @click="loadChapterContent">重试</button>
-      </view>
-    </scroll-view>
-
-    <!-- 底部控制栏 -->
-    <view class="reader-footer" v-if="showFooter">
-      <view class="progress-text">
-        第{{currentChapter}}章 {{progress}}%
-      </view>
-      <view class="control-buttons">
-        <text class="iconfont icon-catalog" @click="showCatalog"></text>
-        <text class="iconfont icon-font" @click="showFontSettings"></text>
-        <text class="iconfont icon-night" @click="toggleNightMode"></text>
-        <text class="iconfont icon-download" @click="downloadChapter"></text>
-      </view>
-    </view>
-
-    <!-- 广告位 -->
-    <ad v-if="showAd" unit-id="您的广告单元ID" class="reader-ad"></ad>
-
-    <!-- 设置面板 -->
-    <view class="settings-panel" v-if="showSettings">
-      <view class="font-size-controls">
-        <text class="iconfont icon-font-small" @click="decreaseFontSize"></text>
-        <text>字体大小: {{fontSize}}px</text>
-        <text class="iconfont icon-font-large" @click="increaseFontSize"></text>
-      </view>
-      <view class="background-options">
-        <view 
-          v-for="bg in backgroundOptions" 
-          :key="bg.value"
-          class="bg-option"
-          :class="{ active: backgroundColor === bg.value }"
-          :style="{ backgroundColor: bg.value }"
-          @click="changeBackground(bg.value)"
-        ></view>
-      </view>
-    </view>
-
-    <!-- 目录面板 -->
-    <view class="catalog-panel" v-if="showCatalogPanel">
-      <view class="catalog-header">
-        <text class="catalog-title">目录</text>
-        <text class="iconfont icon-close" @click="showCatalogPanel = false"></text>
-      </view>
-      <scroll-view class="chapter-list" scroll-y>
-        <view 
-          v-for="chapter in chapterList" 
-          :key="chapter.id"
-          class="chapter-item"
-          :class="{ active: chapter.id === chapterId }"
-          @click="selectChapter(chapter.id)"
-        >
-          <text>{{chapter.title}}</text>
-        </view>
+      <!-- 章节内容 -->
+      <scroll-view scroll-y class="chapter-content">
+        <text class="content-text">
+          {{ chapterContent || '正在加载章节内容...' }}
+        </text>
       </scroll-view>
+      
+      <!-- 底部操作栏 -->
+      <view class="action-bar">
+        <button class="btn-action" @click="prevChapter" :disabled="!hasPrevChapter">
+          上一章
+        </button>
+        <button class="btn-action" @click="showCatalog">
+          目录
+        </button>
+        <button class="btn-action" @click="nextChapter" :disabled="!hasNextChapter">
+          下一章
+        </button>
+      </view>
     </view>
   </view>
 </template>
 
 <script>
+import request from '@/utils/request'
+import { getToken, setToken, removeToken } from '@/utils/auth'
+
 export default {
   data() {
     return {
-      novelId: '',
-      chapterId: '',
-      novelTitle: '加载中...',
-      chapterTitle: '加载中...',
-      content: '正在加载内容...',
-      currentChapter: 1,
-      totalChapters: 0,
-      progress: 0,
-      scrollTop: 0,
-      showHeader: false,
-      showFooter: false,
-      showSettings: false,
-      showCatalogPanel: false,
-      showAd: false,
-      nightMode: false,
-      touchStartX: 0,
-      touchStartY: 0,
-      lastScrollPosition: 0,
-      loading: false,
+      novelId: null,
+      novel: {},
+      chapters: [],
+      currentChapter: {},
+      chapterContent: '',
+      loading: true,
       error: null,
-      fontSize: 18,
-      backgroundColor: '#f5f0e1',
-      backgroundOptions: [
-        { value: '#f5f0e1', name: '羊皮纸' },
-        { value: '#e8f5e9', name: '护眼绿' },
-        { value: '#e3f2fd', name: '天空蓝' },
-        { value: '#fce4ec', name: '粉红' },
-        { value: '#1a1a1a', name: '夜间' }
-      ],
-      chapterList: []
+      currentChapterIndex: 0,
+          // 新增字段
+    freeChapters: 5, // 免费章节数
+    adStartChapter: 15, // 开始显示广告的章节
+    isVip: false,
+    isLoggedIn: false,
+    showLoginModal: false
+    }
+  },
+  
+  computed: {
+    // 计算当前章节是否需要登录
+  requireLogin() {
+    return this.currentChapterIndex >= this.freeChapters && !this.isLoggedIn;
+  },
+  
+  // 计算当前章节是否需要显示广告
+  showAd() {
+    return this.currentChapterIndex >= this.adStartChapter && !this.isVip;
+  },
+    hasPrevChapter() {
+      return this.currentChapterIndex > 0;
+    },
+    hasNextChapter() {
+      return this.currentChapterIndex < this.chapters.length - 1;
     }
   },
-  onLoad(options) {
-    console.log('阅读器页面加载，参数:', options);
+  
+  // 使用 uni-app 生命周期
+onLoad(options) {
+  console.log('📥 READER onLoad 参数:', options);
+  console.log('📍 READER 路由信息:', this.$route);
+  
+  // 简化参数获取
+  this.novelId = options.novelId || this.$route.query.novelId;
+  const chapterId = options.chapterId || this.$route.query.chapterId;
+  
+  console.log('🔍 READER 最终参数 - novelId:', this.novelId, 'chapterId:', chapterId);
+  
+  if (!this.novelId) {
+    console.error('❌ READER: 无法获取小说ID');
+    this.error = '无法获取小说信息';
+    this.loading = false;
+    return;
+  }
+  
+  this.initReader();
+},
+// reader.vue - 添加 onShow 方法
+onShow() {
+  console.log('🔍 onShow 生命周期');
+  // 再次检查参数，确保不会漏掉
+  if (!this.novelId && this.$route.query.novelId) {
+    console.log('🔄 onShow 中检测到参数，重新初始化');
+    this.initReader(this.$route.query);
+  }
+},
+  // 同时使用 Vue 生命周期作为备选
+mounted() {
+  console.log('🔄 mounted 生命周期');
+  // 如果 onLoad 没有获取到参数，尝试从路由获取
+  if (!this.novelId) {
+    const route = this.$route;
+    console.log('🔄 从 $route 获取参数:', route);
     
-    // 确保参数获取方式正确
-    this.novelId = options.novelId || '';
-    this.chapterId = options.chapterId || '1';
+    // 合并所有可能的参数来源
+    const allParams = {
+      ...(route.params || {}),
+      ...(route.query || {}),
+      novelId: route.query.novelId // 确保novelId被单独提取
+    };
     
-    console.log('novelId:', this.novelId, 'chapterId:', this.chapterId);
+    this.initReader(allParams);
+  }
+},
+
+  
+  methods: {
+  // 检查用户状态
+  checkUserStatus() {
+    const token = uni.getStorageSync('token');
+    this.isLoggedIn = !!token;
     
-    if (!this.novelId) {
-      console.error('小说ID参数缺失');
-      this.error = '小说ID参数缺失';
+    // 这里可以调用API检查VIP状态
+    // const userInfo = uni.getStorageSync('userInfo');
+    // this.isVip = userInfo && userInfo.isVip;
+  },
+  
+  // 修改下一章方法，添加限制
+  async nextChapter() {
+    if (!this.hasNextChapter) {
       uni.showToast({
-        title: '小说ID参数缺失',
+        title: '已经是最后一章了',
         icon: 'none'
       });
       return;
     }
     
-    // 显示加载提示
-    uni.showLoading({
-      title: '加载中...',
-      mask: true
-    });
+    // 检查是否需要登录
+    if (this.currentChapterIndex + 1 >= this.freeChapters && !this.isLoggedIn) {
+      this.showLoginPrompt();
+      return;
+    }
     
-    this.loadChapterContent();
-  },
-  onShow() {
-    console.log('reader onShow');
+    // 正常跳转到下一章
+    this.currentChapterIndex++;
+    this.currentChapter = this.chapters[this.currentChapterIndex];
+    await this.loadChapterContent(this.currentChapter.id);
     
-    // 确保页面显示时也能处理参数
-    const pages = getCurrentPages();
-    const currentPage = pages[pages.length - 1];
-    if (currentPage && currentPage.options) {
-      const options = currentPage.options;
-      console.log('当前页面参数:', options);
-      
-      if (options.novelId && (!this.novelId || this.novelId !== options.novelId)) {
-        this.novelId = options.novelId;
-        this.chapterId = options.chapterId || '1';
-        this.loadChapterContent();
-      }
+    // 检查是否需要显示广告
+    if (this.showAd) {
+      this.showChapterAd();
     }
   },
-  // 添加所有生命周期钩子进行调试
-  beforeCreate() {
-    console.log('reader beforeCreate');
-  },
-  created() {
-    console.log('reader created');
-  },
-  beforeMount() {
-    console.log('reader beforeMount');
-  },
-  mounted() {
-    console.log('reader mounted');
-  },
-  onReady() {
-    console.log('reader onReady');
-  },
-  onHide() {
-    console.log('reader onHide');
+  // 显示登录提示
+  showLoginPrompt() {
+    uni.showModal({
+      title: '登录提示',
+      content: `免费阅读前${this.freeChapters}章，第${this.currentChapterIndex + 2}章需要登录后阅读\n是否立即登录？`,
+      confirmText: '去登录',
+      cancelText: '取消',
+      success: (res) => {
+        if (res.confirm) {
+          uni.navigateTo({
+            url: '/pages/login/index'
+          });
+        }
+      }
+    });
   },
-  onUnload() {
-    console.log('reader onUnload');
+  
+  // 显示章节广告
+  showChapterAd() {
+    // 这里可以集成广告SDK
+    console.log('显示章节广告');
+    uni.showToast({
+      title: '广告展示中...',
+      icon: 'none'
+    });
   },
-  methods: {
-    async loadChapterContent() {
-      console.log('开始加载章节内容');
+  
+  // 在初始化时检查用户状态
+    async initReader(params) {
+      console.log('🎬 初始化阅读器，参数:', params);
+    console.log('📍 当前路由查询参数:', this.$route.query);
       
-      this.loading = true;
-      this.error = null;
+    // 修复参数获取逻辑 - 从多个位置获取novelId
+    this.novelId = params.novelId || 
+                   params.id || 
+                   this.$route.query.novelId || 
+                   this.$route.query.id ||
+                   (this.$route.params && this.$route.params.id);
       
+      console.log('🔍 最终获取到的小说ID:', this.novelId);
+          // 检查用户状态
+    this.checkUserStatus();
+    // 如果还是没有获取到，从URL中解析
+    if (!this.novelId) {
+      console.log('🔄 尝试从URL解析参数...');
+      const urlParams = new URLSearchParams(window.location.search);
+      this.novelId = urlParams.get('novelId') || urlParams.get('id');
+      console.log('🔍 从URL解析到的小说ID:', this.novelId);
+    }
+    
+    if (!this.novelId) {
+      this.error = '无法获取小说ID，请返回重新选择';
+      this.loading = false;
+      console.error('❌ 小说ID为空，所有获取方式都失败了');
+      console.error('📋 可用参数:', {
+        params: params,
+        routeQuery: this.$route.query,
+        routeParams: this.$route.params,
+        fullPath: this.$route.fullPath
+      });
+      return;
+    }
+    
+      
+      try {
+        await this.loadNovelDetail();
+        await this.loadChapters();
+        await this.loadFirstChapterContent();
+      } catch (error) {
+        console.error('💥 初始化失败:', error);
+        this.error = '加载失败: ' + (error.message || '未知错误');
+      } finally {
+        this.loading = false;
+      }
+    },
+    
+    // 加载小说详情
+    async loadNovelDetail() {
+      console.log('📚 加载小说详情，ID:', this.novelId);
       try {
-        console.log('开始请求章节内容，章节ID:', this.chapterId);
+      // 使用导入的 request，而不是 this.$http
+      const res = await request.get(`/novel/detail/${this.novelId}`, {}, {
+        header: { isToken: false }
+      });
+      console.log('✅ 小说详情响应:', res);
+      
+      if (res && res.code === 200 && res.data) {
+        this.novel = res.data;
+        console.log('✅ 成功加载小说详情:', this.novel.title);
+      } else {
+        console.warn('⚠️ 小说详情接口返回异常:', res);
+        this.useMockNovelData();
+      }
+      } catch (error) {
+        console.error('❌ 加载小说详情失败:', error);
+    // 使用模拟数据继续流程
+    this.useMockNovelData();
+  }
+},
+    useMockNovelData() {
+  this.novel = {
+    title: '加载中的小说',
+    author: '加载中...',
+    description: '正在加载小说信息...'
+  };
+},
+    // 加载章节列表
+    async loadChapters() {
+      console.log('📑 加载章节列表，小说ID:', this.novelId);
+      try {
+      const token = getToken();
+      let requestConfig = {
+        header: { isToken: false }
+      };
+      
+      if (token) {
+        requestConfig.header = {
+          'Authorization': 'Bearer ' + token,
+          isToken: true
+        };
+      }
+      const res = await request.get(`/chapter/list/${this.novelId}`, {}, requestConfig);
+      console.log('✅ 章节列表响应:', res);
+        
+        let chapters = [];
         
-    // 确保$http对象可用
-    if (!this.$http || typeof this.$http.get !== 'function') {
-      throw new Error('网络请求不可用');
+      if (res && res.code === 200 && res.rows) {
+        chapters = res.rows;
+      } else if (res && res.rows) {
+        chapters = res.rows;
+      }
+      
+      if (chapters.length > 0) {
+        this.chapters = chapters;
+        console.log(`✅ 成功加载 ${chapters.length} 个章节`);
+      } else {
+        this.useMockChapters();
+        console.log('⚠️ 使用模拟章节数据');
+      }
+      } catch (error) {
+      console.error('❌ 加载章节列表失败:', error);
+      this.useMockChapters();
     }
+    },
     
-    // 使用若依框架的API调用方式
-    const res = await this.$http.get(`/novel/chapter/${this.chapterId}`);
-    console.log('章节内容响应:', res);
+    // 加载第一章内容
+    async loadFirstChapterContent() {
+      if (this.chapters.length > 0) {
+        this.currentChapterIndex = 0;
+        this.currentChapter = this.chapters[0];
+        await this.loadChapterContent(this.chapters[0].id);
+      }
+    },
     
-    if (res.code === 200) {
-      this.novelTitle = res.data.novelTitle || '未知小说';
-      this.chapterTitle = res.data.chapterTitle || '未知章节';
-      this.content = res.data.content || '';
-      this.currentChapter = res.data.chapterIndex || 1;
-      this.totalChapters = res.data.totalChapters || 0;
+    // 加载章节内容
+    async loadChapterContent(chapterId) {
+      console.log('📖 加载章节内容，章节ID:', chapterId);
       
+      if (!chapterId) {
+        console.error('❌ 章节ID为空');
+        return;
+      }
+      
+      this.loading = true;
+      
+      try {
+      const token = getToken();
+      let requestConfig = {
+        header: { isToken: false }
+      };
+      
+      if (token) {
+        requestConfig.header = {
+          'Authorization': 'Bearer ' + token,
+          isToken: true
+        };
+      }
+      const res = await request.get(`/chapter/content/${chapterId}`, {}, requestConfig);
+      console.log('✅ 章节内容响应:', res);
+      
+      if (res && res.code === 200 && res.data) {
+        // 后端返回的数据在 res.data 中
+        this.chapterContent = res.data.content || '本章节内容为空';
+        console.log('✅ 成功加载章节内容');
+      } else if (res && res.content) {
+        // 或者直接返回 content
+        this.chapterContent = res.content;
+        console.log('✅ 成功加载章节内容(direct)');
+      } else {
+          // 模拟章节内容
+          this.chapterContent = `这是第${this.currentChapterIndex + 1}章的示例内容。\n\n这是一个美丽的春天，主人公开始了他的冒险旅程...\n\n本章内容正在努力加载中，请稍后查看完整内容。`;
+          console.log('⚠️ 使用模拟章节内容');
+        }
+      } catch (error) {
+        console.error('❌ 加载章节内容失败:', error);
+        // 模拟错误时的内容
+        this.chapterContent = `第${this.currentChapterIndex + 1}章内容加载失败，请检查网络连接后重试。\n\n错误信息: ${error.message}`;
+      } finally {
+        this.loading = false;
+      }
+    },
+      // 添加模拟章节方法
+  useMockChapters() {
+    this.chapters = [
+      { id: 1, title: '第一章 开始', content: null },
+      { id: 2, title: '第二章 发展', content: null },
+      { id: 3, title: '第三章 结束', content: null }
+    ];
+  },
+    // 上一章
+    async prevChapter() {
+      if (this.hasPrevChapter) {
+        this.currentChapterIndex--;
+        this.currentChapter = this.chapters[this.currentChapterIndex];
+        await this.loadChapterContent(this.currentChapter.id);
+      }
+    },
+    
+
+    
+    // 显示目录
+    showCatalog() {
       uni.showToast({
-        title: '加载成功',
-        icon: 'success',
-        duration: 1500
-      });
-    } else {
-      console.error('API返回错误状态码:', res.code);
-      this.error = '加载失败: ' + (res.msg || '未知错误');
-      uni.showToast({
-        title: res.msg || '加载失败',
+        title: '目录功能开发中',
         icon: 'none'
       });
+    },
+    
+    // 重新加载
+    retryLoad() {
+      this.loading = true;
+      this.error = null;
+      this.initReader({ id: this.novelId });
     }
-  } catch (error) {
-    console.error('加载章节内容失败:', error);
-    this.error = '加载失败，请检查网络连接';
-    uni.showToast({
-      title: '加载失败，请检查网络连接',
-      icon: 'none'
-    });
-  } finally {
-    this.loading = false;
-    uni.hideLoading();
   }
 }
-}}
 </script>
 
-<style>
+<style scoped>
 .reader-container {
-  position: relative;
-  height: 100vh;
-  display: flex;
-  flex-direction: column;
-  background-color: v-bind(backgroundColor);
-  transition: background-color 0.3s ease;
+  padding: 20rpx;
+  min-height: 100vh;
+  background-color: #f5f5f5;
 }
 
-.reader-header {
-  height: 44px;
-  padding: 0 15px;
+.loading-container, .error-container {
   display: flex;
-  justify-content: space-between;
+  flex-direction: column;
   align-items: center;
-  background: rgba(0, 0, 0, 0.8);
-  color: white;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 1000;
-}
-
-.reader-content {
-  flex: 1;
-  padding: 20px;
-  box-sizing: border-box;
-  line-height: 1.8;
-  font-size: v-bind(fontSize + 'px');
-  color: #333;
-  margin-top: 44px;
-  margin-bottom: 50px;
-}
-
-.chapter-title {
+  justify-content: center;
+  padding: 200rpx 0;
   text-align: center;
-  font-size: 20px;
-  font-weight: bold;
-  margin-bottom: 20px;
 }
 
-.content-text {
-  text-indent: 2em;
-  line-height: 1.8;
-}
-
-.reader-footer {
-  height: 50px;
-  padding: 0 15px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  background: rgba(0, 0, 0, 0.8);
-  color: white;
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  z-index: 1000;
+.loading-icon {
+  animation: rotate 1s linear infinite;
+  margin-bottom: 20rpx;
 }
 
-.reader-ad {
-  height: 90px;
-  margin-bottom: 10px;
+@keyframes rotate {
+  from { transform: rotate(0deg); }
+  to { transform: rotate(360deg); }
 }
 
-.loading-container, .error-container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding: 50px 0;
+.error-text {
+  font-size: 32rpx;
+  color: var(--error-color);
+  margin: 20rpx 0;
+  text-align: center;
 }
 
-.error-container button {
-  margin-top: 20px;
+.btn-retry {
   background-color: var(--primary-color);
   color: white;
-  border: none;
-  padding: 10px 20px;
-  border-radius: 5px;
+  padding: 20rpx 40rpx;
+  border-radius: 10rpx;
+  margin-top: 20rpx;
 }
 
-.settings-panel {
-  position: fixed;
-  bottom: 50px;
-  left: 0;
-  right: 0;
-  background: rgba(255, 255, 255, 0.95);
-  padding: 20px;
-  z-index: 999;
-  box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.1);
+.novel-header {
+  text-align: center;
+  padding: 30rpx 0;
+  border-bottom: 1rpx solid #eee;
+  margin-bottom: 30rpx;
 }
 
-.font-size-controls {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 20px;
+.novel-title {
+  display: block;
+  font-size: 36rpx;
+  font-weight: bold;
+  margin-bottom: 10rpx;
 }
 
-.background-options {
-  display: flex;
-  justify-content: space-around;
+.novel-author {
+  display: block;
+  font-size: 28rpx;
+  color: #666;
 }
 
-.bg-option {
-  width: 40px;
-  height: 40px;
-  border-radius: 50%;
-  border: 2px solid transparent;
-  cursor: pointer;
+.chapter-header {
+  padding: 20rpx 0;
+  border-bottom: 1rpx solid #eee;
+  margin-bottom: 30rpx;
 }
 
-.bg-option.active {
-  border-color: var(--primary-color);
+.chapter-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
 }
 
-.catalog-panel {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
+.chapter-content {
+  height: 70vh;
+  padding: 30rpx;
   background: white;
-  z-index: 1001;
+  border-radius: 10rpx;
+  margin-bottom: 30rpx;
 }
 
-.catalog-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 15px;
-  border-bottom: 1px solid #eee;
+.content-text {
+  font-size: 32rpx;
+  line-height: 1.8;
+  color: #333;
 }
 
-.chapter-list {
-  height: calc(100vh - 60px);
+.action-bar {
+  display: flex;
+  justify-content: space-between;
+  padding: 20rpx 0;
+  background: white;
+  border-radius: 10rpx;
 }
 
-.chapter-item {
-  padding: 15px;
-  border-bottom: 1px solid #eee;
+.btn-action {
+  flex: 1;
+  margin: 0 10rpx;
+  padding: 20rpx;
+  background-color: var(--primary-color);
+  color: white;
+  border-radius: 8rpx;
+  font-size: 28rpx;
 }
 
-.chapter-item.active {
-  color: var(--primary-color);
-  font-weight: bold;
+.btn-action:disabled {
+  background-color: #ccc;
+  color: #666;
 }
-
-/* 夜间模式样式 */
-.night-mode .reader-content {
-  color: #888;
+.login-prompt, .ad-prompt {
+  background: #fff3cd;
+  border: 1px solid #ffeaa7;
+  padding: 20rpx;
+  margin: 20rpx;
+  border-radius: 8rpx;
+  text-align: center;
 }
 
-.night-mode .content-text {
-  color: #888;
+.btn-login {
+  background: var(--primary-color);
+  color: white;
+  padding: 10rpx 20rpx;
+  border-radius: 6rpx;
+  margin-top: 10rpx;
+  font-size: 26rpx;
 }
 </style>

RuoYi-App/pages/register.vue

@@ -59,7 +59,7 @@
     methods: {
       // 用户登录
       handleUserLogin() {
-        this.$tab.navigateTo(`/pages/login`)
+        this.$tab.navigateTo(`/pages/login/index`)
       },
       // 获取图形验证码
       getCode() {
@@ -97,7 +97,7 @@
           	content: "恭喜你，您的账号 " + this.registerForm.username + " 注册成功！",
           	success: function (res) {
           		if (res.confirm) {
-                uni.redirectTo({ url: `/pages/login` });
+                uni.redirectTo({ url: `/pages/login/index` });
           		}
           	}
           })

RuoYi-App/pages/register/index.vue

@@ -0,0 +1,306 @@
+<template>
+  <view class="normal-login-container">
+    <view class="logo-content align-center justify-center flex">
+      <image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
+      </image>
+      <text class="title">哎呀电子注册</text>
+    </view>
+    
+    <view class="login-form-content">
+      <view class="input-item flex align-center">
+        <view class="iconfont icon-user icon"></view>
+        <input v-model="registerForm.username" class="input" type="text" placeholder="请输入账号" maxlength="30" />
+      </view>
+      <view class="input-item flex align-center">
+        <view class="iconfont icon-password icon"></view>
+        <input v-model="registerForm.password" type="password" class="input" placeholder="请输入密码" maxlength="20" />
+      </view>
+      <view class="input-item flex align-center">
+        <view class="iconfont icon-password icon"></view>
+        <input v-model="registerForm.confirmPassword" type="password" class="input" placeholder="请再次输入密码" maxlength="20" />
+      </view>
+      <view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
+        <view class="iconfont icon-code icon"></view>
+        <input v-model="registerForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
+        <view class="login-code"> 
+          <image :src="codeUrl" @click="getCode" class="login-code-img"></image>
+        </view>
+      </view>
+      
+      <!-- 用户协议 - 优化后的样式 -->
+      <view class="agreement-section">
+        <view class="agreement-item" @click="toggleAgreement">
+          <view class="checkbox-wrapper">
+            <view class="custom-checkbox" :class="{ checked: agreementChecked }">
+              <text class="checkmark" v-if="agreementChecked">✓</text>
+            </view>
+          </view>
+          <view class="agreement-text">
+            <text>我已阅读并同意</text>
+            <text class="agreement-link" @click.stop="handleUserAgrement">《用户协议》</text>
+            <text>和</text>
+            <text class="agreement-link" @click.stop="handlePrivacy">《隐私协议》</text>
+          </view>
+        </view>
+      </view>
+      
+      <view class="action-btn">
+        <button @click="handleRegister()" class="register-btn cu-btn block bg-blue lg round" :class="{ disabled: !agreementChecked }" :disabled="!agreementChecked">注册</button>
+      </view>
+    </view>
+    
+    <view class="login-link text-center">
+      <text @click="handleUserLogin" class="text-blue">使用已有账号登录</text>
+    </view>
+  </view>
+</template>
+
+<script>
+  import { getCodeImg, register } from '@/api/login'
+
+  export default {
+    data() {
+      return {
+        codeUrl: "",
+        captchaEnabled: true,
+        agreementChecked: false,
+        globalConfig: getApp().globalData.config,
+        registerForm: {
+          username: "",
+          password: "",
+          confirmPassword: "",
+          code: "",
+          uuid: ''
+        }
+      }
+    },
+    created() {
+      this.getCode()
+    },
+    methods: {
+      // 用户登录
+      handleUserLogin() {
+        this.$tab.navigateTo(`/pages/login/index`)
+      },
+      
+      // 协议相关
+      handlePrivacy() {
+        let site = this.globalConfig.appInfo.agreements[0]
+        this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`)
+      },
+      handleUserAgrement() {
+        let site = this.globalConfig.appInfo.agreements[1]
+        this.$tab.navigateTo(`/pages/common/webview/index?title=${site.title}&url=${site.url}`)
+      },
+      toggleAgreement() {
+        this.agreementChecked = !this.agreementChecked
+      },
+      
+      // 获取图形验证码
+      getCode() {
+        getCodeImg().then(res => {
+          this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled
+          if (this.captchaEnabled) {
+            this.codeUrl = 'data:image/gif;base64,' + res.img
+            this.registerForm.uuid = res.uuid
+          }
+        })
+      },
+      
+      // 注册方法
+      async handleRegister() {
+        if (!this.agreementChecked) {
+          this.$modal.msgError("请先同意用户协议和隐私协议")
+          return
+        }
+        
+        if (this.registerForm.username === "") {
+          this.$modal.msgError("请输入您的账号")
+        } else if (this.registerForm.password === "") {
+          this.$modal.msgError("请输入您的密码")
+        } else if (this.registerForm.confirmPassword === "") {
+          this.$modal.msgError("请再次输入您的密码")
+        } else if (this.registerForm.password !== this.registerForm.confirmPassword) {
+          this.$modal.msgError("两次输入的密码不一致")
+        } else if (this.registerForm.code === "" && this.captchaEnabled) {
+          this.$modal.msgError("请输入验证码")
+        } else {
+          this.$modal.loading("注册中，请耐心等待...")
+          this.register()
+        }
+      },
+      
+      // 用户注册
+      async register() {
+        register(this.registerForm).then(res => {
+          this.$modal.closeLoading()
+          uni.showModal({
+            title: "系统提示",
+            content: "恭喜你，您的账号 " + this.registerForm.username + " 注册成功！",
+            success: (res) => {
+              if (res.confirm) {
+                uni.redirectTo({ url: `/pages/login/index` });
+              }
+            }
+          })
+        }).catch(() => {
+          if (this.captchaEnabled) {
+            this.getCode()
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  page {
+    background-color: #ffffff;
+  }
+
+  .normal-login-container {
+    width: 100%;
+
+    .logo-content {
+      width: 100%;
+      font-size: 21px;
+      text-align: center;
+      padding-top: 15%;
+      flex-direction: column;
+
+      image {
+        border-radius: 4px;
+      }
+
+      .title {
+        margin: 10px 0;
+        font-size: 24px;
+        color: #e94f87;
+      }
+    }
+
+    .login-form-content {
+      text-align: center;
+      margin: 20px auto;
+      margin-top: 10%;
+      width: 80%;
+
+      .input-item {
+        margin: 20px auto;
+        background-color: #f5f6f7;
+        height: 45px;
+        border-radius: 20px;
+
+        .icon {
+          font-size: 38rpx;
+          margin-left: 10px;
+          color: #999;
+        }
+
+        .input {
+          width: 100%;
+          font-size: 14px;
+          line-height: 20px;
+          text-align: left;
+          padding-left: 15px;
+        }
+      }
+      
+      /* 优化后的协议区域样式 */
+      .agreement-section {
+        margin: 25px 0;
+        padding: 0 10px;
+      }
+      
+      .agreement-item {
+        display: flex;
+        align-items: flex-start;
+        justify-content: flex-start;
+        text-align: left;
+        font-size: 14px;
+        color: #666;
+        line-height: 1.5;
+      }
+      
+      .checkbox-wrapper {
+        margin-right: 10px;
+        margin-top: 2px;
+        flex-shrink: 0;
+      }
+      
+      .custom-checkbox {
+        width: 20px;
+        height: 20px;
+        border: 2px solid #ddd;
+        border-radius: 4px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        transition: all 0.3s ease;
+        background-color: #fff;
+      }
+      
+      .custom-checkbox.checked {
+        border-color: #e94f87;
+        background-color: #e94f87;
+      }
+      
+      .checkmark {
+        color: #fff;
+        font-size: 14px;
+        font-weight: bold;
+      }
+      
+      .agreement-text {
+        flex: 1;
+        display: flex;
+        flex-wrap: wrap;
+        align-items: center;
+      }
+      
+      .agreement-link {
+        color: #e94f87;
+        margin: 0 3px;
+        text-decoration: underline;
+      }
+      
+      .agreement-link:active {
+        opacity: 0.7;
+      }
+
+      .register-btn {
+        margin-top: 20px;
+        height: 45px;
+        background: #e94f87 !important;
+        color: #fff;
+        border-radius: 25px;
+        font-size: 16px;
+      }
+      
+      .register-btn.disabled {
+        background: #ccc !important;
+        color: #999;
+      }
+
+      .login-code {
+        height: 38px;
+        float: right;
+      
+        .login-code-img {
+          height: 38px;
+          position: absolute;
+          margin-left: 10px;
+          width: 200rpx;
+        }
+      }
+    }
+    
+    .login-link {
+      margin-top: 30px;
+      
+      .text-blue {
+        color: #e94f87;
+      }
+    }
+  }
+</style>

RuoYi-App/pages/user/index.vue

@@ -0,0 +1,205 @@
+<template>
+  <view class="user-center">
+    <!-- 用户信息 -->
+    <view class="user-info">
+      <image :src="user.avatar || '/static/default-avatar.png'" class="avatar" />
+      <view class="info">
+        <text class="name">{{ user.nickName || '未登录用户' }}</text>
+        <text class="vip">普通用户</text>
+      </view>
+      <button v-if="!isLogin" class="login-btn" @click="goToLogin">登录/注册</button>
+      <uni-icons v-else type="gear" size="28" color="#333" @click="goToSettings"></uni-icons>
+    </view>
+    
+    <!-- 功能列表 -->
+    <view class="menu-list">
+      <view class="menu-item" @click="goToMyBooks">
+        <uni-icons type="star" size="24" color="#2a5caa" />
+        <text>我的收藏</text>
+        <uni-icons type="right" size="18" color="#999" />
+      </view>
+      <view class="menu-item" @click="goToHistory">
+        <uni-icons type="time" size="24" color="#2a5caa" />
+        <text>阅读历史</text>
+        <uni-icons type="right" size="18" color="#999" />
+      </view>
+      <view class="menu-item" @click="goToSettings">
+        <uni-icons type="gear" size="24" color="#2a5caa" />
+        <text>设置</text>
+        <uni-icons type="right" size="18" color="#999" />
+      </view>
+    </view>
+    
+    <!-- 退出登录 -->
+    <button v-if="isLogin" class="btn-logout" @click="logout">退出登录</button>
+  </view>
+</template>
+
+<script>
+import { getToken } from '@/utils/auth'
+
+export default {
+  data() {
+    return {
+      user: {
+        avatar: '',
+        nickName: '',
+      },
+      isLogin: false
+    }
+  },
+  onShow() {
+    this.checkLoginStatus()
+    if (this.isLogin) {
+      this.loadUserInfo()
+    }
+  },
+  methods: {
+    checkLoginStatus() {
+      const token = getToken()
+      this.isLogin = !!token
+      if (!this.isLogin) {
+        this.user = {
+          avatar: '',
+          nickName: '未登录用户'
+        }
+      }
+    },
+    
+    async loadUserInfo() {
+      try {
+        const userInfo = uni.getStorageSync('userInfo')
+        if (userInfo) {
+          this.user = userInfo
+        }
+      } catch (error) {
+        console.error('获取用户信息失败', error)
+      }
+    },
+    
+    goToLogin() {
+      uni.navigateTo({
+        url: '/pages/login/index'
+      })
+    },
+    
+    logout() {
+      uni.removeStorageSync('token')
+      uni.removeStorageSync('userInfo')
+      this.isLogin = false
+      this.user = {
+        avatar: '',
+        nickName: '未登录用户'
+      }
+      uni.showToast({
+        title: '已退出登录',
+        icon: 'success'
+      })
+    },
+    
+    goToSettings() {
+      uni.showToast({
+        title: '设置功能开发中',
+        icon: 'none'
+      })
+    },
+    
+    goToMyBooks() {
+      uni.showToast({
+        title: '我的收藏开发中',
+        icon: 'none'
+      })
+    },
+    
+    goToHistory() {
+      uni.showToast({
+        title: '阅读历史开发中',
+        icon: 'none'
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.user-center {
+  padding: 20rpx;
+  background-color: #f5f5f5;
+  min-height: 100vh;
+}
+
+.user-info {
+  display: flex;
+  align-items: center;
+  padding: 30rpx;
+  background: white;
+  border-radius: 16rpx;
+  margin-bottom: 30rpx;
+}
+
+.avatar {
+  width: 120rpx;
+  height: 120rpx;
+  border-radius: 50%;
+  margin-right: 30rpx;
+}
+
+.info {
+  flex: 1;
+}
+
+.name {
+  font-size: 36rpx;
+  font-weight: bold;
+  display: block;
+  margin-bottom: 10rpx;
+}
+
+.vip {
+  font-size: 28rpx;
+  color: #e67e22;
+  background: #fef9e7;
+  padding: 5rpx 15rpx;
+  border-radius: 20rpx;
+}
+
+.login-btn {
+  background: #2a5caa;
+  color: white;
+  font-size: 28rpx;
+  padding: 10rpx 30rpx;
+  border-radius: 40rpx;
+}
+
+.menu-list {
+  background: white;
+  border-radius: 16rpx;
+  overflow: hidden;
+}
+
+.menu-item {
+  display: flex;
+  align-items: center;
+  padding: 30rpx;
+  border-bottom: 1rpx solid #f0f0f0;
+  
+  text {
+    flex: 1;
+    margin-left: 20rpx;
+    font-size: 32rpx;
+  }
+}
+
+.menu-item:last-child {
+  border-bottom: none;
+}
+
+.btn-logout {
+  margin-top: 50rpx;
+  background: white;
+  color: #e74c3c;
+  border: 1rpx solid #e74c3c;
+  border-radius: 40rpx;
+  padding: 20rpx;
+}
+</style>

RuoYi-App/permission.js

@@ -4,8 +4,8 @@ import { getToken } from '@/utils/auth'
 // 页面白名单
 const whiteList = [
   '/pages/index/index', // 首页无需登录
-  '/pages/login',
-  '/pages/register'
+  '/pages/login/index',
+  '/pages/register/index'
 ]
 
 // 检查地址白名单
@@ -29,7 +29,7 @@ list.forEach(item => {
         return true
       } else {
         // 非白名单页面重定向到登录
-        uni.reLaunch({ url: "/pages/login" })
+        uni.reLaunch({ url: "/pages/login/index" })
         return false
       }
     },

RuoYi-App/router/index.js

@@ -7,7 +7,7 @@ Vue.use(Router)
 const routes = [
   {
     path: '/',
-    redirect: '/pages/index/index'
+    redirect: '/pages/novel/list'
   },
   {
     path: '/pages/novel/list',
@@ -15,12 +15,21 @@ const routes = [
     component: () => import('@/pages/novel/list'),
     meta: { title: '小说列表' }
   },
-  {
-    path: '/pages/novel/reader',
+{
+    // 修复：添加动态路由参数
+    path: '/pages/novel/detail/:id?',
     name: 'NovelDetail',
+    component: () => import('@/pages/novel/detail.vue'),
+    meta: { title: '小说详情' },
+    props: true // 启用 props 接收参数
+},
+  {
+    path: '/pages/novel/reader/:id?',
+    name: 'NovelReader', 
     component: () => import('@/pages/novel/reader.vue'),
-    meta: { title: '小说详情' }
-  },
+    meta: { title: '阅读器' },
+    props: true
+},
   {
     path: '/pages/author/apply',
     name: 'AuthorApply',
@@ -28,15 +37,15 @@ const routes = [
     meta: { title: '作者申请', requiresAuth: true }
   },
   {
-    path: '/pages/login',
+    path: '/pages/login/index',
     name: 'Login',
-    component: () => import('@/pages/login'),
+    component: () => import('@/pages/login/index'),
     meta: { title: '登录' }
   },
   {
-    path: '/pages/register',
+    path: '/pages/register/index',
     name: 'Register',
-    component: () => import('@/pages/register'),
+    component: () => import('@/pages/register/index'),
     meta: { title: '注册' }
   },
   // 添加更多路由...
@@ -53,6 +62,10 @@ const router = new Router({
 
 // 添加简单的路由守卫
 router.beforeEach((to, from, next) => {
+  console.log('🚀 路由跳转:', from.path, '->', to.path)
+  console.log('📋 目标路由参数:', to.params)
+  console.log('🔍 目标路由查询:', to.query)
+  console.log('📍 完整路由对象:', to)
   // 设置页面标题
   if (to.meta.title) {
     document.title = to.meta.title
@@ -61,14 +74,16 @@ router.beforeEach((to, from, next) => {
   // 检查是否需要登录
   if (to.meta.requiresAuth) {
     if (!store.getters.token) {
-      next('/pages/login')
+      next('/pages/login/index')
       return
     }
   }
   
   next()
 })
-
+router.afterEach((to, from) => {
+  console.log('✅ 路由跳转完成:', to.path)
+})
 // 确保路由初始化
 router.onReady(() => {
   console.log('Router is ready');

RuoYi-App/utils/request.js

@@ -3,25 +3,31 @@ import config from '@/config'
 import { getToken, removeToken } from '@/utils/auth'
 import { toast, showConfirm, tansParams } from '@/utils/common'
 
-// 移除对 store 的依赖
 const request = (configObj = {}) => {
   // 确保配置对象有效
-  configObj.header = configObj.header || {}
+  configObj.header = configObj.header || {};
   
-  // 获取token - 只从本地存储获取
-  const token = getToken() || ''
+  // 判断是否为公开API
+  const isPublicApi = configObj.isToken === false || 
+                     configObj.url.includes('/novel/') || 
+                     configObj.url.includes('/chapter/') || 
+                     configObj.url.includes('/category/');
   
-  // 仅当token存在且未明确禁止时才添加
-  if (token && configObj.header.isToken !== false) {
-    configObj.header['Authorization'] = 'Bearer ' + token
-  } else if (!token) {
-    console.log('请求未携带Token: 未登录状态访问公开API', configObj.url)
+  // 获取token
+  const token = getToken() || '';
+  
+  // 仅当token存在且不是公开API时才添加token
+  if (token && !isPublicApi && configObj.header.isToken !== false) {
+    configObj.header['Authorization'] = 'Bearer ' + token;
+  } else if (isPublicApi) {
+    // 明确设置公开API不携带token
+    configObj.header.isToken = false;
   }
   
   // 完整URL处理
-  let fullUrl = configObj.url
+  let fullUrl = configObj.url;
   if (!fullUrl.startsWith('http')) {
-    fullUrl = (configObj.baseUrl || config.baseUrl || '') + fullUrl
+    fullUrl = (configObj.baseUrl || config.baseUrl || '') + fullUrl;
   }
   
   return new Promise((resolve, reject) => {
@@ -29,43 +35,59 @@ const request = (configObj = {}) => {
       method: configObj.method || 'get',
       url: fullUrl,
       data: configObj.data,
+      params: configObj.params,
       header: configObj.header,
       success: (res) => {
         // 处理401认证失败
         if (res.statusCode === 401) {
-          const errorMsg = res.data?.msg || '认证失败，请重新登录'
-          console.warn('认证失败:', configObj.url, errorMsg)
+          const errorMsg = res.data?.msg || '认证失败，请重新登录';
+          console.warn('认证失败:', configObj.url, errorMsg);
           
           // 清除无效token
-          removeToken()
+          removeToken();
           
           // 显示登录提示
-          toast(errorMsg)
+          toast(errorMsg);
           
           // 跳转到登录页面
-          uni.navigateTo({ url: '/pages/login' })
+          setTimeout(() => {
+            uni.navigateTo({ url: '/pages/login/index' });
+          }, 1500);
           
-          reject(new Error(errorMsg))
+          reject(new Error(errorMsg));
+          return;
         } 
         // 处理其他成功响应
         else if (res.statusCode >= 200 && res.statusCode < 300) {
-          resolve(res.data)
+          // 如果响应数据包含code字段，需要根据code判断业务状态
+          if (res.data && typeof res.data.code !== 'undefined') {
+            if (res.data.code === 200) {
+              resolve(res.data);
+            } else {
+              const errorMsg = res.data.msg || `请求失败 (${res.data.code})`;
+              toast(errorMsg);
+              reject(new Error(errorMsg));
+            }
+          } else {
+            // 没有code字段，直接返回数据
+            resolve(res.data);
+          }
         } 
         // 处理其他错误
         else {
-          const errorMsg = res.data?.msg || `请求失败 (${res.statusCode})`
-          toast(errorMsg)
-          reject(new Error(errorMsg))
+          const errorMsg = res.data?.msg || `请求失败 (${res.statusCode})`;
+          toast(errorMsg);
+          reject(new Error(errorMsg));
         }
       },
       fail: (err) => {
-        let message = '网络连接异常'
-        if (err.errMsg.includes('timeout')) message = '请求超时'
-        toast(message)
-        reject(err)
+        let message = '网络连接异常';
+        if (err.errMsg.includes('timeout')) message = '请求超时';
+        toast(message);
+        reject(err);
       }
-    })
-  })
+    });
+  });
 }
 
 // 添加便捷方法

RuoYi-App/utils/upload.js

@@ -38,7 +38,7 @@ const upload = config => {
             showConfirm("登录状态已过期，您可以继续留在该页面，或者重新登录?").then(res => {
               if (res.confirm) {
                 store.dispatch('LogOut').then(res => {
-                  uni.reLaunch({ url: '/pages/login/login' })
+                  uni.reLaunch({ url: '/pages/login/index' })
                 })
               }
             })

RuoYi-App/vue.config.js

@@ -4,10 +4,13 @@ const path = require('path');
 module.exports = {
   devServer: {
     proxy: {
-      // 统一代理配置
-      '/': {
+      '/api': {
         target: 'http://localhost:8080',
         changeOrigin: true,
+        pathRewrite: {
+          '^/api': '' // 根据后端接口路径决定是否重写
+        },
+        secure: false,
 		logLevel: 'debug' // 添加调试日志
       }
     }

RuoYi-Vue/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -130,7 +130,18 @@ public class SecurityConfig
                 // 权限配置
                 .authorizeHttpRequests(auth -> auth
                         .antMatchers(permitAllUrl.getUrls().toArray(new String[0])).permitAll()
-                        .antMatchers("/login", "/register", "/captchaImage").permitAll()
+                        .antMatchers(
+                                "/register",
+                                "/",
+                                "/login",
+                                "/logout",
+                                "/captchaImage",
+                                "/css/**",
+                                "/js/**",
+                                "/img/**",
+                                "/favicon.ico",
+                                "/webjars/**"
+                        ).permitAll()
                         .antMatchers(HttpMethod.GET,
                                 "/",
                                 "/*.html",
@@ -146,6 +157,10 @@ public class SecurityConfig
                                 "/*/api-docs",
                                 "/druid/**"
                         ).permitAll()
+                        // 2. 👍 核心：放行小说章节查询接口 - 请根据您的实际URL路径调整
+                        .antMatchers("/novel/chapter/**").permitAll() // 放行所有以 /novel/chapter/ 开头的请求
+                        // .antMatchers("/api/novel/**").permitAll() // 如果您的接口有统一的前缀，例如 /api，可以这样配置
+                        // 3. 对于其他所有请求，需要认证
                         .anyRequest().authenticated()
                 )
                 // 登出配置
@@ -155,13 +170,14 @@ public class SecurityConfig
                 )
                 // 添加JWT过滤器
                 .addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class)
-                // 添加CORS过滤器
-                //.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class)
-                ;
+        // 添加CORS过滤器
+        //.addFilterBefore(corsFilter, JwtAuthenticationTokenFilter.class)
+        ;
 
         return http.build();
     }
 
+
     // CORS配置
     private CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/controller/NovelController.java

@@ -113,24 +113,32 @@ public class NovelController extends BaseController {
     @PreAuthorize("@ss.hasPermi('novel:chapter:query')")
     @GetMapping("/chapter/{chapterId}")
     public AjaxResult getChapterContent(@PathVariable("chapterId") Long chapterId) {
-        //return AjaxResult.success(novelService.getChapterContent(chapterId));
+        try {
+            NovelChapter chapter = novelService.getChapterContent(chapterId);
+            if (chapter == null) {
+                return AjaxResult.error("章节不存在");
+            }
 
-        NovelChapter chapter = novelService.getChapterContent(chapterId);
-        if (chapter == null) {
-            return AjaxResult.error("章节不存在");
+            // 获取小说信息
+            Novel novel = novelService.selectNovelById(chapter.getNovelId());
+            String novelTitle = novel != null ? novel.getTitle() : "未知小说";
+
+            // 获取总章节数
+            int totalChapters = novelService.getChapterCount(chapter.getNovelId());
+
+            // 构建响应数据
+            Map<String, Object> data = new HashMap<>();
+            data.put("novelTitle", novelTitle);
+            data.put("chapterTitle", chapter.getTitle());
+            data.put("content", chapter.getContent());
+            data.put("chapterIndex", chapter.getChapterOrder());
+            data.put("totalChapters", totalChapters);
+
+            return AjaxResult.success(data);
+        } catch (Exception e) {
+            logger.error("获取章节内容失败，章节ID: " + chapterId, e);
+            return AjaxResult.error("获取章节内容失败: " + e.getMessage());
         }
-
-        // 构建响应数据
-        Map<String, Object> data = new HashMap<>();
-        Novel novel = novelService.selectNovelById(chapter.getNovelId());
-
-        data.put("novelTitle", novel.getTitle() != null ? novel.getTitle() : "");
-        data.put("chapterTitle", chapter.getTitle());
-        data.put("content", chapter.getContent());
-        data.put("chapterIndex", chapter.getChapterOrder());
-        data.put("totalChapters", novelService.getChapterCount(chapter.getNovelId()));
-
-        return AjaxResult.success(data);
     }
 
 

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/mapper/NovelMapper.java

@@ -22,7 +22,7 @@ public interface NovelMapper extends BaseMapper<Novel> {
     // 以下方法已由MyBatis-Plus实现，无需额外代码
     // int updateById(Novel novel);
     // int deleteBatchIds(@Param("ids") List<Long> ids);
-    // Novel selectById(Long id);
+     Novel selectById(Long id);
 
     // 自定义方法：根据分类ID查询小说
     @Select("SELECT * FROM novel WHERE category_id = #{categoryId}")

RuoYi-Vue/ruoyi-system/src/main/resources/mapper/novel/NovelMapper.xml

@@ -111,4 +111,10 @@
         </set>
         WHERE id = #{id}
     </update>
+
+    <!-- 根据ID查询章节 -->
+    <select id="selectById" parameterType="Long" resultMap="NovelResult">
+        <include refid="selectNovelVo"/>
+        where id = #{id}
+    </select>
 </mapper>