qd

RuoYi-App/App.vue

@@ -51,4 +51,94 @@ onLaunch(() => {
   background-color: var(--bg-color);
   color: var(--text-color);
 }
+
+/* 全局主题变量 */
+:root {
+  --primary-color: #1890ff;
+  --bg-color: #f8f9fa;
+  --text-color: #333;
+  --card-bg: #ffffff;
+  
+  /* 确保所有页面继承主题 */
+  background-color: var(--bg-color);
+  color: var(--text-color);
+}
+
+/* 哎呀科技蓝主题变量覆盖 */
+.theme-aydzBlue {
+  --primary-color: #2a5caa;
+  --bg-color: #e6f7ff;
+  --text-color: #1a3353;
+  --card-bg: #d0e8ff;
+}
+
+/* 深色模式主题变量覆盖 */
+.theme-darkMode {
+  --primary-color: #52c41a;
+  --bg-color: #1a1a1a;
+  --text-color: #e6e6e6;
+  --card-bg: #2a2a2a;
+}
+
+/* 公共组件样式 */
+.card {
+  background-color: var(--card-bg);
+  border-radius: 12px;
+  padding: 16px;
+  margin-bottom: 16px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.05);
+}
+
+.primary-button {
+  background-color: var(--primary-color);
+  color: white;
+  border: none;
+  border-radius: 24px;
+  padding: 10px 20px;
+  font-weight: bold;
+}/* 全局主题变量 */
+:root {
+  --primary-color: #1890ff;
+  --bg-color: #f8f9fa;
+  --text-color: #333;
+  --card-bg: #ffffff;
+  
+  /* 确保所有页面继承主题 */
+  background-color: var(--bg-color);
+  color: var(--text-color);
+}
+
+/* 哎呀科技蓝主题变量覆盖 */
+.theme-aydzBlue {
+  --primary-color: #2a5caa;
+  --bg-color: #e6f7ff;
+  --text-color: #1a3353;
+  --card-bg: #d0e8ff;
+}
+
+/* 深色模式主题变量覆盖 */
+.theme-darkMode {
+  --primary-color: #52c41a;
+  --bg-color: #1a1a1a;
+  --text-color: #e6e6e6;
+  --card-bg: #2a2a2a;
+}
+
+/* 公共组件样式 */
+.card {
+  background-color: var(--card-bg);
+  border-radius: 12px;
+  padding: 16px;
+  margin-bottom: 16px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.05);
+}
+
+.primary-button {
+  background-color: var(--primary-color);
+  color: white;
+  border: none;
+  border-radius: 24px;
+  padding: 10px 20px;
+  font-weight: bold;
+}
 </style>

RuoYi-App/api/vip.js

@@ -0,0 +1,36 @@
+import { request } from '@/utils/request'
+
+export const vipApi = {
+  // 获取会员状态
+  getStatus(userId) {
+    return request({
+      url: '/vip/status',
+      method: 'GET',
+      data: { userId },
+      headers: {
+        'Authorization': `Bearer ${uni.getStorageSync('token')}`
+      }
+    })
+  },
+  
+  // 购买会员
+  purchase(order) {
+    return request({
+      url: '/vip/purchase',
+      method: 'POST',
+      data: order,
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': `Bearer ${uni.getStorageSync('token')}`
+      }
+    })
+  },
+  
+  // 获取会员权益列表
+  getPrivileges() {
+    return request({
+      url: '/vip/privileges',
+      method: 'GET'
+    })
+  }
+}

RuoYi-App/components/NovelReader.vue

@@ -1,25 +1,65 @@
 <template>
   <view class="reader-container">
+    <!-- 顶部操作栏 -->
+    <view class="reader-header">
+      <view class="left-actions">
+        <button class="back-btn" @click="goBack">
+          <uni-icons type="arrowleft" size="24" color="#333"></uni-icons>
+        </button>
+        <text class="chapter-title">{{ chapterTitle }}</text>
+      </view>
+      <view class="right-actions">
+        <button class="action-btn" @click="toggleTheme">
+          <uni-icons type="color" size="20"></uni-icons>
+        </button>
+        <button class="action-btn" @click="toggleFontSize">
+          <uni-icons type="font" size="20"></uni-icons>
+        </button>
+        <button class="action-btn" @click="toggleMode">
+          <uni-icons :type="readingMode === 'scroll' ? 'list' : 'grid'" size="20"></uni-icons>
+        </button>
+      </view>
+    </view>
+
     <!-- 阅读模式选择器 -->
-    <view class="mode-selector">
-      <button @click="readingMode = 'scroll'" :class="{ active: readingMode === 'scroll' }">
-        滚动模式
-      </button>
-      <button @click="readingMode = 'page'" :class="{ active: readingMode === 'page' }">
-        翻页模式
+    <view v-if="showModeSelector" class="mode-selector">
+      <button 
+        v-for="mode in readingModes" 
+        :key="mode.value" 
+        :class="['mode-btn', { active: readingMode === mode.value }]"
+        @click="changeMode(mode.value)"
+      >
+        {{ mode.label }}
       </button>
     </view>
-    
+
+    <!-- 字体大小选择器 -->
+    <view v-if="showFontSizeSelector" class="font-size-selector">
+      <button class="size-btn" @click="decreaseFontSize">A-</button>
+      <slider 
+        :value="fontSize" 
+        min="14" 
+        max="24" 
+        step="2" 
+        @change="changeFontSize" 
+        class="font-slider"
+      />
+      <button class="size-btn" @click="increaseFontSize">A+</button>
+    </view>
+
     <!-- 滚动阅读模式 -->
     <scroll-view 
       v-if="readingMode === 'scroll'" 
       scroll-y 
       class="scroll-reader"
+      :style="{ fontSize: fontSize + 'px' }"
+      :scroll-top="scrollTop"
+      @scroll="onScroll"
       @scrolltolower="loadNextChapter"
     >
       <rich-text :nodes="formatContent(chapterContent)" />
     </scroll-view>
-    
+
     <!-- 翻页阅读模式 -->
     <swiper 
       v-else 
@@ -29,13 +69,22 @@
       @change="onPageChange"
     >
       <swiper-item v-for="(page, index) in paginatedContent" :key="index">
-        <rich-text :nodes="page" />
+        <view :style="{ fontSize: fontSize + 'px', padding: '20px' }">
+          <rich-text :nodes="page" />
+        </view>
       </swiper-item>
     </swiper>
-    
+
+    <!-- 底部操作栏 -->
+    <view class="reader-footer">
+      <button class="footer-btn" @click="prevChapter">上一章</button>
+      <button class="footer-btn" @click="showChapterList">目录</button>
+      <button class="footer-btn" @click="nextChapter">下一章</button>
+    </view>
+
     <!-- 底部广告 -->
-    <view v-if="feedAd" class="bottom-ad">
-      <ad :unit-id="feedAd.unitId" ad-type="feed" />
+    <view v-if="showBottomAd && !isVIP" class="bottom-ad">
+      <ad :unit-id="bottomAdUnitId" ad-type="feed" />
     </view>
   </view>
 </template>
@@ -44,141 +93,336 @@
 import { ref, computed, onMounted, watch } from 'vue'
 import { useAdManager } from '@/utils/adManager'
 import { useUserStore } from '@/stores/user'
+import { useThemeStore } from '@/stores/theme'
+import { useReadingProgress } from '@/composables/useReadingProgress'
+import { cleanNovelContent, paginateContent } from '@/utils/contentUtils'
 
 const props = defineProps({
-  chapterId: Number,
-  novelId: Number
+  chapterId: {
+    type: Number,
+    required: true
+  },
+  novelId: {
+    type: Number,
+    required: true
+  },
+  chapterTitle: {
+    type: String,
+    default: '加载中...'
+  }
 })
 
+const emit = defineEmits(['back', 'prev', 'next', 'show-chapters'])
+
 const userStore = useUserStore()
-const { showRewardAd, showFeedAd } = useAdManager()
+const themeStore = useThemeStore()
+const { showRewardAd } = useAdManager()
+const { saveProgress, loadProgress } = useReadingProgress()
 
 // 阅读状态
 const readingMode = ref('scroll') // 'scroll' | 'page'
-const currentPage = ref(0)
+const readingModes = ref([
+  { label: '滚动模式', value: 'scroll' },
+  { label: '翻页模式', value: 'page' }
+])
+const showModeSelector = ref(false)
+const showFontSizeSelector = ref(false)
+const fontSize = ref(18)
 const chapterContent = ref('')
 const paginatedContent = ref([])
-const lastReadPosition = ref(0)
-const feedAd = ref(null)
+const currentPage = ref(0)
+const scrollTop = ref(0)
+const lastScrollPosition = ref(0)
+const showBottomAd = ref(true)
+const bottomAdUnitId = ref('')
+const isVIP = computed(() => userStore.isVIP)
 
 // 获取章节内容
 const fetchChapterContent = async () => {
-  const res = await uni.request({
-    url: `https://php-backend.aiyadianzi.ltd/chapter/${props.chapterId}`,
-    method: 'GET'
-  })
-  
-  // 清洗内容
-  chapterContent.value = cleanContent(res.data.content)
-  
-  // 分页处理
-  paginatedContent.value = paginateContent(chapterContent.value)
-  
-  // 恢复阅读位置
-  if (userStore.isLoggedIn) {
-    const position = await getReadingPosition()
-    currentPage.value = position.page
-    lastReadPosition.value = position.scrollTop
+  try {
+    const res = await uni.request({
+      url: `https://php-backend.aiyadianzi.ltd/chapter/${props.chapterId}`,
+      method: 'GET'
+    })
+    
+    if (res.statusCode === 200) {
+      // 清洗内容并移除原始网站信息
+      chapterContent.value = cleanNovelContent(res.data.content)
+      
+      // 分页处理
+      paginatedContent.value = paginateContent(chapterContent.value, 800)
+      
+      // 恢复阅读位置
+      restoreReadingPosition()
+    } else {
+      throw new Error('章节加载失败')
+    }
+  } catch (error) {
+    uni.showToast({
+      title: error.message || '加载章节失败',
+      icon: 'none'
+    })
   }
 }
 
-// 内容清洗（移除原始网站信息）
-const cleanContent = (content) => {
-  return content
-    .replace(/最新网址[:：]?\s*[a-z0-9.-]+/gi, '')
-    .replace(/www\.[a-z0-9]+\.[a-z]{2,}/gi, '')
-}
-
-// 内容分页（每页800字符）
-const paginateContent = (content) => {
-  const pages = []
-  const pageSize = 800
-  let start = 0
+// 恢复阅读位置
+const restoreReadingPosition = async () => {
+  const progress = await loadProgress(props.novelId, props.chapterId)
   
-  while (start < content.length) {
-    pages.push(content.substring(start, start + pageSize))
-    start += pageSize
+  if (progress) {
+    if (readingMode.value === 'scroll') {
+      scrollTop.value = progress.scrollTop
+    } else {
+      currentPage.value = progress.page
+    }
   }
-  
-  return pages
 }
 
 // 翻页事件处理
 const onPageChange = (e) => {
   currentPage.value = e.detail.current
   saveReadingPosition()
-  showRewardAd(props.chapterId)
+  
+  // 每5页触发广告
+  if (currentPage.value % 5 === 0) {
+    showRewardAd(props.chapterId)
+  }
+}
+
+// 滚动事件处理
+const onScroll = (e) => {
+  lastScrollPosition.value = e.detail.scrollTop
+  saveReadingPosition()
 }
 
 // 保存阅读位置
 const saveReadingPosition = () => {
-  if (!userStore.isLoggedIn) return
-  
-  uni.request({
-    url: 'https://api.aiyadianzi.ltd/reading/progress',
-    method: 'POST',
-    data: {
-      userId: userStore.userId,
-      novelId: props.novelId,
-      chapterId: props.chapterId,
-      page: currentPage.value,
-      scrollTop: lastReadPosition.value
-    }
+  saveProgress(props.novelId, props.chapterId, {
+    page: currentPage.value,
+    scrollTop: lastScrollPosition.value
   })
 }
 
-// 初始化
-onMounted(async () => {
-  await fetchChapterContent()
-  feedAd.value = showFeedAd()
-})
+// 切换阅读模式
+const toggleMode = () => {
+  showModeSelector.value = !showModeSelector.value
+}
 
-// VIP状态变化时更新广告
-watch(() => userStore.isVIP, (isVip) => {
-  if (isVip) {
-    feedAd.value = null
-  } else {
-    feedAd.value = showFeedAd()
-  }
+// 改变阅读模式
+const changeMode = (mode) => {
+  readingMode.value = mode
+  showModeSelector.value = false
+  saveReadingPosition()
+}
+
+// 切换字体大小选择器
+const toggleFontSize = () => {
+  showFontSizeSelector.value = !showFontSizeSelector.value
+}
+
+// 改变字体大小
+const changeFontSize = (e) => {
+  fontSize.value = e.detail.value
+}
+
+// 增大字体
+const increaseFontSize = () => {
+  if (fontSize.value < 24) fontSize.value += 2
+}
+
+// 减小字体
+const decreaseFontSize = () => {
+  if (fontSize.value > 14) fontSize.value -= 2
+}
+
+// 切换主题
+const toggleTheme = () => {
+  const themes = Object.keys(themeStore.themes)
+  const currentIndex = themes.indexOf(themeStore.currentTheme)
+  const nextIndex = (currentIndex + 1) % themes.length
+  themeStore.setTheme(themes[nextIndex])
+}
+
+// 加载下一章
+const loadNextChapter = () => {
+  emit('next')
+}
+
+// 返回
+const goBack = () => {
+  emit('back')
+}
+
+// 上一章
+const prevChapter = () => {
+  emit('prev')
+}
+
+// 下一章
+const nextChapter = () => {
+  emit('next')
+}
+
+// 显示章节列表
+const showChapterList = () => {
+  emit('show-chapters')
+}
+
+// 初始化
+onMounted(() => {
+  fetchChapterContent()
+  
+  // 设置广告单元ID
+  // #ifdef MP-WEIXIN
+  bottomAdUnitId.value = 'wechat_feed_ad_123456'
+  // #endif
+  // #ifdef MP-TOUTIAO
+  bottomAdUnitId.value = 'douyin_feed_ad_654321'
+  // #endif
+  // #ifdef H5
+  bottomAdUnitId.value = 'h5_feed_ad_789012'
+  // #endif
+  
+  // 监听VIP状态变化
+  watch(() => userStore.isVIP, (isVip) => {
+    showBottomAd.value = !isVip
+  })
 })
 </script>
 
 <style scoped>
 .reader-container {
-  height: 100vh;
   display: flex;
   flex-direction: column;
+  height: 100vh;
+  background-color: var(--reader-bg-color);
+  color: var(--reader-text-color);
+}
+
+.reader-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px 15px;
+  background-color: var(--header-bg-color);
+  border-bottom: 1px solid var(--border-color);
+  height: 50px;
+  box-sizing: border-box;
+}
+
+.left-actions {
+  display: flex;
+  align-items: center;
+  flex: 1;
+}
+
+.back-btn {
+  margin-right: 15px;
+  background: none;
+  border: none;
+  padding: 0;
+}
+
+.chapter-title {
+  font-size: 16px;
+  font-weight: bold;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  max-width: 60vw;
+}
+
+.right-actions {
+  display: flex;
+}
+
+.action-btn {
+  background: none;
+  border: none;
+  padding: 5px 10px;
+  margin-left: 10px;
 }
 
 .mode-selector {
   display: flex;
   padding: 10px;
-  background: var(--header-bg);
-  
-  button {
-    flex: 1;
-    margin: 0 5px;
-    font-size: 14px;
-    
-    &.active {
-      background: var(--primary-color);
-      color: white;
-    }
-  }
+  background-color: var(--header-bg-color);
+  justify-content: center;
+  border-bottom: 1px solid var(--border-color);
+}
+
+.mode-btn {
+  margin: 0 10px;
+  padding: 5px 15px;
+  border-radius: 15px;
+  background-color: var(--button-bg);
+  color: var(--button-color);
+  border: none;
+  font-size: 14px;
+}
+
+.mode-btn.active {
+  background-color: var(--primary-color);
+  color: white;
+}
+
+.font-size-selector {
+  display: flex;
+  align-items: center;
+  padding: 10px 15px;
+  background-color: var(--header-bg-color);
+  border-bottom: 1px solid var(--border-color);
+}
+
+.size-btn {
+  background: none;
+  border: 1px solid var(--border-color);
+  border-radius: 4px;
+  width: 40px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-weight: bold;
+}
+
+.font-slider {
+  flex: 1;
+  margin: 0 15px;
 }
 
 .scroll-reader {
   flex: 1;
-  padding: 15px;
+  padding: 20px;
   overflow-y: auto;
+  line-height: 1.8;
 }
 
 .page-reader {
   flex: 1;
 }
 
+.reader-footer {
+  display: flex;
+  justify-content: space-between;
+  padding: 10px 15px;
+  background-color: var(--header-bg-color);
+  border-top: 1px solid var(--border-color);
+}
+
+.footer-btn {
+  flex: 1;
+  margin: 0 5px;
+  padding: 8px 0;
+  border-radius: 4px;
+  background-color: var(--button-bg);
+  color: var(--button-color);
+  border: none;
+  font-size: 14px;
+}
+
 .bottom-ad {
   height: 100px;
-  background: #f5f5f5;
+  background-color: #f5f5f5;
 }
 </style>

RuoYi-App/components/PartnerTask.vue

@@ -0,0 +1,183 @@
+<template>
+  <view class="partner-task">
+    <view class="header">
+      <text class="title">合作任务</text>
+      <text class="subtitle">完成任务赚金币</text>
+    </view>
+    
+    <scroll-view scroll-x class="task-scroll">
+      <view 
+        v-for="task in tasks" 
+        :key="task.id"
+        class="task-card"
+        @click="handleTask(task)"
+      >
+        <image :src="task.logo" class="logo" />
+        <view class="info">
+          <text class="name">{{ task.name }}</text>
+          <text class="reward">+{{ task.reward }}金币</text>
+        </view>
+        <button class="action-btn">{{ task.completed ? '已完成' : '去完成' }}</button>
+      </view>
+    </scroll-view>
+  </view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+
+// 合作任务数据
+const tasks = ref([
+  {
+    id: 1,
+    name: '百度地图签到',
+    logo: '/static/partners/baidu.png',
+    reward: 30,
+    completed: false,
+    handler: () => {
+      uni.navigateToMiniProgram({
+        appId: 'wx4f1b24bdc99fa23e',
+        path: 'pages/index/index',
+        success: () => console.log('跳转百度地图成功')
+      })
+    }
+  },
+  {
+    id: 2,
+    name: '快手看视频',
+    logo: '/static/partners/kuaishou.png',
+    reward: 50,
+    completed: false,
+    handler: () => {
+      uni.navigateToMiniProgram({
+        appId: 'wx9188fa3c6a2d1e87',
+        path: 'pages/index/index',
+        success: () => console.log('跳转快手成功')
+      })
+    }
+  },
+  {
+    id: 3,
+    name: '京东金融',
+    logo: '/static/partners/jd.png',
+    reward: 80,
+    completed: true,
+    handler: () => {
+      uni.navigateToMiniProgram({
+        appId: 'wx91d27dbf599dff74',
+        path: 'pages/index/index',
+        success: () => console.log('跳转京东金融成功')
+      })
+    }
+  },
+  {
+    id: 4,
+    name: '美团外卖',
+    logo: '/static/partners/meituan.png',
+    reward: 100,
+    completed: false,
+    handler: () => {
+      uni.navigateToMiniProgram({
+        appId: 'wxde8ac0a21135c07d',
+        path: 'pages/index/index',
+        success: () => console.log('跳转美团成功')
+      })
+    }
+  }
+])
+
+// 处理任务点击
+const handleTask = (task) => {
+  if (task.completed) {
+    uni.showToast({ title: '任务已完成', icon: 'none' })
+    return
+  }
+  
+  // 执行任务处理逻辑
+  task.handler()
+  
+  // 模拟完成任务
+  setTimeout(() => {
+    task.completed = true
+    uni.showToast({ title: `任务完成！获得${task.reward}金币`, icon: 'success' })
+  }, 2000)
+}
+</script>
+
+<style scoped>
+.partner-task {
+  background-color: var(--card-bg);
+  border-radius: 16px;
+  padding: 20px;
+  margin: 20px 0;
+}
+
+.header {
+  margin-bottom: 15px;
+}
+
+.title {
+  font-size: 18px;
+  font-weight: bold;
+  display: block;
+}
+
+.subtitle {
+  font-size: 14px;
+  color: #666;
+}
+
+.task-scroll {
+  white-space: nowrap;
+}
+
+.task-card {
+  display: inline-block;
+  width: 280px;
+  background: linear-gradient(135deg, #f9f9f9 0%, #ffffff 100%);
+  border-radius: 12px;
+  padding: 15px;
+  margin-right: 15px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.05);
+}
+
+.logo {
+  width: 50px;
+  height: 50px;
+  border-radius: 10px;
+  margin-right: 12px;
+  vertical-align: middle;
+}
+
+.info {
+  display: inline-block;
+  vertical-align: middle;
+  width: calc(100% - 120px);
+}
+
+.name {
+  font-size: 16px;
+  font-weight: 500;
+  display: block;
+}
+
+.reward {
+  font-size: 14px;
+  color: #f5222d;
+  display: block;
+}
+
+.action-btn {
+  display: inline-block;
+  vertical-align: middle;
+  background-color: var(--primary-color);
+  color: white;
+  border: none;
+  border-radius: 16px;
+  height: 36px;
+  line-height: 36px;
+  padding: 0 15px;
+  font-size: 14px;
+  margin-left: 10px;
+}
+</style>

RuoYi-App/components/ThemePicker.vue

@@ -0,0 +1,107 @@
+<template>
+  <view class="theme-picker">
+    <view class="current-theme" @click="showSelector = !showSelector">
+      <text>{{ themeStore.getThemeLabel(themeStore.currentTheme) }}</text>
+      <uni-icons :type="showSelector ? 'arrowup' : 'arrowdown'" size="16"></uni-icons>
+    </view>
+    
+    <view v-if="showSelector" class="theme-selector">
+      <view 
+        v-for="theme in themeStore.themeOptions"
+        :key="theme.name"
+        class="theme-item"
+        :class="{ active: theme.name === themeStore.currentTheme }"
+        @click="changeTheme(theme.name)"
+      >
+        <view class="color-preview">
+          <view 
+            v-for="(color, key) in theme.colors" 
+            v-if="key.includes('color')"
+            :key="key"
+            class="color-block"
+            :style="{ backgroundColor: color }"
+          ></view>
+        </view>
+        <text class="theme-label">{{ theme.label }}</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { useThemeStore } from '@/stores/theme'
+
+const themeStore = useThemeStore()
+const showSelector = ref(false)
+
+// 切换主题
+const changeTheme = (themeName) => {
+  themeStore.setTheme(themeName)
+  showSelector.value = false
+}
+</script>
+
+<style scoped>
+.theme-picker {
+  position: relative;
+  z-index: 100;
+}
+
+.current-theme {
+  display: flex;
+  align-items: center;
+  padding: 8px 12px;
+  background-color: var(--card-bg);
+  border-radius: 20px;
+  font-size: 14px;
+  cursor: pointer;
+}
+
+.theme-selector {
+  position: absolute;
+  top: 40px;
+  right: 0;
+  width: 180px;
+  background-color: var(--card-bg);
+  border-radius: 12px;
+  box-shadow: 0 4px 12px rgba(0,0,0,0.1);
+  padding: 10px;
+  z-index: 200;
+}
+
+.theme-item {
+  padding: 10px;
+  border-radius: 8px;
+  margin-bottom: 8px;
+  cursor: pointer;
+  transition: all 0.3s;
+}
+
+.theme-item.active {
+  background-color: rgba(42, 92, 170, 0.1);
+}
+
+.theme-item:hover {
+  background-color: rgba(0,0,0,0.05);
+}
+
+.color-preview {
+  display: flex;
+  height: 20px;
+  border-radius: 4px;
+  overflow: hidden;
+  margin-bottom: 6px;
+}
+
+.color-block {
+  flex: 1;
+  height: 100%;
+}
+
+.theme-label {
+  font-size: 13px;
+  text-align: center;
+  display: block;
+}
+</style>

RuoYi-App/composables/useReadingProgress.js

@@ -0,0 +1,73 @@
+import { ref } from 'vue'
+
+export function useReadingProgress() {
+  // 保存阅读进度
+  const saveProgress = (novelId, chapterId, progress) => {
+    try {
+      const key = `reading_progress_${novelId}_${chapterId}`
+      uni.setStorageSync(key, JSON.stringify(progress))
+      
+      // 同时保存到云端（如果有登录）
+      if (uni.getStorageSync('token')) {
+        uni.request({
+          url: 'https://api.aiyadianzi.ltd/reading/progress',
+          method: 'POST',
+          data: {
+            novelId,
+            chapterId,
+            ...progress
+          },
+          header: {
+            'Authorization': `Bearer ${uni.getStorageSync('token')}`
+          }
+        })
+      }
+    } catch (e) {
+      console.error('保存阅读进度失败', e)
+    }
+  }
+  
+  // 加载阅读进度
+  const loadProgress = (novelId, chapterId) => {
+    return new Promise((resolve) => {
+      try {
+        // 先尝试从本地加载
+        const key = `reading_progress_${novelId}_${chapterId}`
+        const localData = uni.getStorageSync(key)
+        if (localData) {
+          resolve(JSON.parse(localData))
+          return
+        }
+        
+        // 如果登录了，尝试从云端加载
+        if (uni.getStorageSync('token')) {
+          uni.request({
+            url: `https://api.aiyadianzi.ltd/reading/progress?novelId=${novelId}&chapterId=${chapterId}`,
+            method: 'GET',
+            header: {
+              'Authorization': `Bearer ${uni.getStorageSync('token')}`
+            },
+            success: (res) => {
+              if (res.data.success && res.data.data) {
+                resolve(res.data.data)
+              } else {
+                resolve(null)
+              }
+            },
+            fail: () => resolve(null)
+          })
+        } else {
+          resolve(null)
+        }
+      } catch (e) {
+        console.error('加载阅读进度失败', e)
+        resolve(null)
+      }
+    })
+  }
+  
+  return {
+    saveProgress,
+    loadProgress
+  }
+}

RuoYi-App/pages/vip/index.vue

@@ -0,0 +1,265 @@
+<template>
+  <view class="vip-page">
+    <!-- 会员状态卡片 -->
+    <view class="vip-card" :class="{'active': isVIP}">
+      <view class="card-header">
+        <text class="title">{{ isVIP ? `超级会员 · 有效期至${expireDate}` : '立即开通会员' }}</text>
+        <text v-if="!isVIP" class="tag">限时6折</text>
+      </view>
+      
+      <view class="privileges">
+        <view v-for="(item, index) in privileges" :key="index" class="privilege-item">
+          <uni-icons type="checkmark" size="16" color="#fff"></uni-icons>
+          <text>{{ item }}</text>
+        </view>
+      </view>
+      
+      <button v-if="!isVIP" class="purchase-btn" @click="showPlans">立即开通</button>
+      <button v-else class="renew-btn" @click="showPlans">续费会员</button>
+    </view>
+    
+    <!-- 会员套餐列表 -->
+    <view v-if="showPlanSelector" class="plan-container">
+      <view class="plan-header">
+        <text class="plan-title">选择套餐</text>
+        <uni-icons type="close" size="24" @click="showPlanSelector = false"></uni-icons>
+      </view>
+      
+      <view class="plan-list">
+        <view 
+          v-for="plan in vipPlans" 
+          :key="plan.id"
+          :class="['plan-item', { 'recommended': plan.recommended }]"
+          @click="selectPlan(plan)"
+        >
+          <view class="plan-top">
+            <text class="duration">{{ plan.duration }}个月</text>
+            <text v-if="plan.recommended" class="rec-tag">推荐</text>
+          </view>
+          <view class="price">
+            <text class="symbol">¥</text>
+            <text class="amount">{{ plan.price }}</text>
+            <text class="original">¥{{ plan.originalPrice }}</text>
+          </view>
+          <text class="daily">日均¥{{ (plan.price / (plan.duration * 30)).toFixed(2) }}</text>
+        </view>
+      </view>
+      
+      <button class="confirm-btn" @click="handlePurchase">确认支付</button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+import { useVipStore } from '@/stores/vip'
+
+const vipStore = useVipStore()
+const showPlanSelector = ref(false)
+const selectedPlan = ref(null)
+
+// 会员套餐配置
+const vipPlans = ref([
+  { id: 1, duration: 1, price: 15, originalPrice: 30, recommended: false },
+  { id: 2, duration: 3, price: 40, originalPrice: 90, recommended: true },
+  { id: 3, duration: 12, price: 120, originalPrice: 360, recommended: false }
+])
+
+// 计算到期日显示
+const expireDate = computed(() => {
+  if (!vipStore.expireTime) return ''
+  const date = new Date(vipStore.expireTime)
+  return `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`
+})
+
+// 显示套餐选择器
+const showPlans = () => {
+  showPlanSelector.value = true
+}
+
+// 选择套餐
+const selectPlan = (plan) => {
+  selectedPlan.value = plan
+}
+
+// 执行购买
+const handlePurchase = async () => {
+  if (!selectedPlan.value) {
+    uni.showToast({ title: '请选择套餐', icon: 'none' })
+    return
+  }
+  
+  const success = await vipStore.purchaseVip(selectedPlan.value)
+  if (success) {
+    showPlanSelector.value = false
+  }
+}
+</script>
+
+<style scoped>
+.vip-page {
+  padding: 20px;
+}
+
+.vip-card {
+  background: linear-gradient(135deg, #2a5caa 0%, #1a3353 100%);
+  border-radius: 16px;
+  padding: 24px;
+  color: white;
+  position: relative;
+  overflow: hidden;
+}
+
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px;
+}
+
+.title {
+  font-size: 20px;
+  font-weight: bold;
+}
+
+.tag {
+  background-color: #ffc53d;
+  color: #1a3353;
+  padding: 3px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+}
+
+.privileges {
+  margin-bottom: 24px;
+}
+
+.privilege-item {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+  font-size: 15px;
+}
+
+.privilege-item text {
+  margin-left: 8px;
+}
+
+.purchase-btn, .renew-btn {
+  background-color: #ffc53d;
+  color: #1a3353;
+  border: none;
+  border-radius: 24px;
+  height: 44px;
+  line-height: 44px;
+  font-weight: bold;
+}
+
+.plan-container {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background-color: #fff;
+  border-top-left-radius: 24px;
+  border-top-right-radius: 24px;
+  padding: 20px;
+  box-shadow: 0 -5px 20px rgba(0,0,0,0.1);
+  z-index: 100;
+}
+
+.plan-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px;
+}
+
+.plan-title {
+  font-size: 18px;
+  font-weight: bold;
+}
+
+.plan-list {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 24px;
+}
+
+.plan-item {
+  border: 1px solid #eee;
+  border-radius: 12px;
+  padding: 15px;
+  width: 30%;
+  text-align: center;
+}
+
+.plan-item.recommended {
+  border-color: #2a5caa;
+  background-color: #e6f7ff;
+  position: relative;
+}
+
+.rec-tag {
+  position: absolute;
+  top: -10px;
+  right: 10px;
+  background-color: #2a5caa;
+  color: white;
+  font-size: 12px;
+  padding: 2px 8px;
+  border-radius: 10px;
+}
+
+.plan-top {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.duration {
+  font-size: 16px;
+  font-weight: bold;
+}
+
+.price {
+  display: flex;
+  justify-content: center;
+  align-items: baseline;
+  margin-bottom: 5px;
+}
+
+.symbol {
+  font-size: 16px;
+  color: #f5222d;
+}
+
+.amount {
+  font-size: 24px;
+  font-weight: bold;
+  color: #f5222d;
+  margin: 0 3px;
+}
+
+.original {
+  font-size: 12px;
+  color: #999;
+  text-decoration: line-through;
+}
+
+.daily {
+  font-size: 12px;
+  color: #666;
+}
+
+.confirm-btn {
+  background: linear-gradient(to right, #2a5caa, #1a3353);
+  color: white;
+  border: none;
+  border-radius: 24px;
+  height: 44px;
+  line-height: 44px;
+  font-weight: bold;
+}
+</style>

RuoYi-App/store/theme.js

@@ -1,33 +1,35 @@
 import { defineStore } from 'pinia'
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
 
 export const useThemeStore = defineStore('theme', () => {
+  // 可用主题列表
   const themes = ref({
     default: {
       '--primary-color': '#1890ff',
       '--bg-color': '#f8f9fa',
       '--text-color': '#333',
-      '--header-bg': '#ffffff'
+      '--card-bg': '#ffffff'
     },
     aydzBlue: {
       '--primary-color': '#2a5caa',
       '--bg-color': '#e6f7ff',
       '--text-color': '#1a3353',
-      '--header-bg': '#2a5caa'
+      '--card-bg': '#d0e8ff'
     },
     darkMode: {
       '--primary-color': '#52c41a',
       '--bg-color': '#1a1a1a',
       '--text-color': '#e6e6e6',
-      '--header-bg': '#2a2a2a'
+      '--card-bg': '#2a2a2a'
     }
   })
   
-  const currentTheme = ref('default')
+  // 当前主题
+  const currentTheme = ref('aydzBlue')
   
   // 初始化主题
   const initTheme = () => {
-    const savedTheme = uni.getStorageSync('selectedTheme') || 'default'
+    const savedTheme = uni.getStorageSync('selectedTheme') || 'aydzBlue'
     setTheme(savedTheme)
   }
   
@@ -39,11 +41,57 @@ export const useThemeStore = defineStore('theme', () => {
     uni.setStorageSync('selectedTheme', themeName)
     
     // 应用CSS变量
+    const root = document.documentElement
     const themeVars = themes.value[themeName]
+    
     Object.keys(themeVars).forEach(key => {
-      document.documentElement.style.setProperty(key, themeVars[key])
+      root.style.setProperty(key, themeVars[key])
     })
+    
+    // 动态设置导航栏颜色
+    if (themeName === 'darkMode') {
+      uni.setNavigationBarColor({
+        frontColor: '#ffffff',
+        backgroundColor: '#1a1a1a'
+      })
+    } else if (themeName === 'aydzBlue') {
+      uni.setNavigationBarColor({
+        frontColor: '#ffffff',
+        backgroundColor: '#2a5caa'
+      })
+    } else {
+      uni.setNavigationBarColor({
+        frontColor: '#000000',
+        backgroundColor: '#f8f9fa'
+      })
+    }
   }
   
-  return { themes, currentTheme, initTheme, setTheme }
+  // 主题配置（用于UI显示）
+  const themeOptions = computed(() => {
+    return Object.keys(themes.value).map(key => ({
+      name: key,
+      label: getThemeLabel(key),
+      colors: themes.value[key]
+    }))
+  })
+  
+  // 获取主题显示名称
+  const getThemeLabel = (themeKey) => {
+    const labels = {
+      default: '默认主题',
+      aydzBlue: '哎呀科技蓝',
+      darkMode: '深色模式'
+    }
+    return labels[themeKey] || themeKey
+  }
+
+  return { 
+    themes,
+    currentTheme,
+    themeOptions,
+    initTheme,
+    setTheme,
+    getThemeLabel
+  }
 })

RuoYi-App/store/vipStore.js

@@ -0,0 +1,74 @@
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+import { vipApi } from '@/api/vip'
+
+export const useVipStore = defineStore('vip', () => {
+  // VIP状态
+  const isVIP = ref(false)
+  const vipType = ref(null) // 0-非会员 1-初级 2-中级 3-高级 4-超级
+  const expireTime = ref('')
+  const privileges = ref([]) // 会员特权列表
+  
+  // 从Java后端加载会员状态
+  const loadVipStatus = async (userId) => {
+    try {
+      const res = await vipApi.getStatus(userId)
+      isVIP.value = res.data.isEffective
+      vipType.value = res.data.type
+      expireTime.value = res.data.expireTime
+      privileges.value = res.data.privileges || [
+        '免广告', 
+        '专属内容', 
+        '双倍阅读金币'
+      ]
+      return true
+    } catch (err) {
+      console.error('VIP状态加载失败', err)
+      uni.showToast({ title: '会员信息获取失败', icon: 'none' })
+      return false
+    }
+  }
+  
+  // 购买VIP（对接Java支付接口）
+  const purchaseVip = async (plan) => {
+    try {
+      uni.showLoading({ title: '支付中...', mask: true })
+      
+      // 调用Java支付接口
+      const payRes = await vipApi.purchase({
+        userId: uni.getStorageSync('userId'),
+        planId: plan.id,
+        amount: plan.price
+      })
+      
+      // 处理支付结果
+      if (payRes.data.success) {
+        await loadVipStatus() // 刷新状态
+        uni.showToast({ title: '开通成功！', icon: 'success' })
+        return true
+      } else {
+        throw new Error(payRes.data.message || '支付失败')
+      }
+    } catch (err) {
+      uni.showToast({ title: err.message, icon: 'none' })
+      return false
+    } finally {
+      uni.hideLoading()
+    }
+  }
+  
+  // 会员特权检测（例如广告跳过）
+  const hasPrivilege = (privilegeKey) => {
+    return isVIP.value && privileges.value.includes(privilegeKey)
+  }
+
+  return { 
+    isVIP, 
+    vipType, 
+    expireTime, 
+    privileges,
+    loadVipStatus,
+    purchaseVip,
+    hasPrivilege
+  }
+})

RuoYi-App/utils/adManager.js

@@ -4,20 +4,75 @@ import { useUserStore } from '@/stores/user'
 // 广告平台配置
 const AD_PLATFORMS = {
   WECHAT: {
-    reward: adUnitId => wx.createRewardedVideoAd({ adUnitId }),
-    feed: adUnitId => wx.createBannerAd({ adUnitId })
+    reward: (adUnitId) => {
+      const ad = wx.createRewardedVideoAd({
+        adUnitId,
+        multiton: true
+      })
+      ad.onError(err => console.error('微信激励广告错误:', err))
+      return ad
+    },
+    feed: (adUnitId) => {
+      return wx.createBannerAd({
+        adUnitId,
+        adIntervals: 30,
+        style: {
+          left: 0,
+          top: 0,
+          width: 320
+        }
+      })
+    },
+    interstitial: (adUnitId) => {
+      return wx.createInterstitialAd({ adUnitId })
+    }
   },
   DOUYIN: {
-    reward: adUnitId => tt.createRewardedVideoAd({ adUnitId }),
-    feed: adUnitId => tt.createBannerAd({ adUnitId })
+    reward: (adUnitId) => {
+      const ad = tt.createRewardedVideoAd({ adUnitId })
+      ad.onError(err => console.error('抖音激励广告错误:', err))
+      return ad
+    },
+    feed: (adUnitId) => {
+      return tt.createBannerAd({
+        adUnitId,
+        style: {
+          left: 0,
+          top: 0,
+          width: 300
+        }
+      })
+    },
+    interstitial: (adUnitId) => {
+      return tt.createInterstitialAd({ adUnitId })
+    }
   },
   H5: {
-    reward: adUnitId => {
+    reward: (adUnitId) => {
       console.log('H5激励广告:', adUnitId)
-      return { show: () => Promise.resolve() }
+      return { 
+        show: () => {
+          console.log('展示激励广告')
+          return Promise.resolve()
+        },
+        onClose: (callback) => {
+          // 模拟关闭事件
+          setTimeout(() => callback({ isEnded: true }), 3000)
+        }
+      }
+    },
+    feed: (adUnitId) => {
+      console.log('H5信息流广告:', adUnitId)
+      return {
+        show: () => console.log('展示信息流广告'),
+        destroy: () => {}
+      }
     },
-    feed: adUnitId => {
-      return { show: () => console.log('H5信息流广告展示') }
+    interstitial: (adUnitId) => {
+      console.log('H5插屏广告:', adUnitId)
+      return {
+        show: () => console.log('展示插屏广告')
+      }
     }
   }
 }
@@ -26,13 +81,14 @@ const AD_PLATFORMS = {
 export function useAdManager() {
   const userStore = useUserStore()
   const chapterCount = ref(0)
+  const lastAdShownTime = ref(0)
   
   // 获取当前平台适配器
   const getPlatformAdapter = () => {
     // #ifdef MP-WEIXIN
     return AD_PLATFORMS.WECHAT
     // #endif
-    // #ifdef MP-DOUYIN
+    // #ifdef MP-TOUTIAO
     return AD_PLATFORMS.DOUYIN
     // #endif
     return AD_PLATFORMS.H5
@@ -42,30 +98,107 @@ export function useAdManager() {
   const showRewardAd = async (chapterId) => {
     if (userStore.isVIP) return
     
+    // 广告冷却时间（至少30秒）
+    const now = Date.now()
+    if (now - lastAdShownTime.value < 30000) return
+    
     chapterCount.value++
     if (chapterCount.value % 5 !== 0) return
     
+    const platform = getCurrentPlatform()
     const adapter = getPlatformAdapter()
-    const ad = adapter.reward('your_ad_unit_id')
+    const adUnitId = getAdUnitId(platform, 'reward')
+    
+    if (!adUnitId) {
+      console.error('未配置广告单元ID')
+      return
+    }
+    
+    const ad = adapter.reward(adUnitId)
     
     try {
-      await ad.show()
-      logAdView(chapterId, 'reward')
+      // 监听广告关闭事件
+      return new Promise((resolve) => {
+        ad.onClose(res => {
+          if (res && res.isEnded) {
+            // 完整观看，记录广告
+            logAdView(chapterId, 'reward', platform)
+            resolve(true)
+          } else {
+            resolve(false)
+          }
+        })
+        
+        // 展示广告
+        ad.show().catch(err => {
+          console.error('广告展示失败:', err)
+          resolve(false)
+        })
+        
+        lastAdShownTime.value = Date.now()
+      })
     } catch (err) {
       console.error('广告展示失败:', err)
+      return false
     }
   }
 
   // 展示底部信息流广告
-  const showFeedAd = () => {
+  const showFeedAd = (adUnitId) => {
     if (userStore.isVIP) return null
     
+    const platform = getCurrentPlatform()
     const adapter = getPlatformAdapter()
-    return adapter.feed('your_feed_ad_id')
+    
+    if (!adUnitId) {
+      adUnitId = getAdUnitId(platform, 'feed')
+    }
+    
+    if (!adUnitId) {
+      console.error('未配置信息流广告单元ID')
+      return null
+    }
+    
+    const ad = adapter.feed(adUnitId)
+    try {
+      ad.show()
+      return ad
+    } catch (err) {
+      console.error('信息流广告展示失败:', err)
+      return null
+    }
   }
 
-  // 广告日志记录（对接Java接口）
-  const logAdView = (chapterId, adType) => {
+  // 展示插屏广告
+  const showInterstitialAd = () => {
+    if (userStore.isVIP) return
+    
+    // 广告冷却时间（至少60秒）
+    const now = Date.now()
+    if (now - lastAdShownTime.value < 60000) return
+    
+    const platform = getCurrentPlatform()
+    const adapter = getPlatformAdapter()
+    const adUnitId = getAdUnitId(platform, 'interstitial')
+    
+    if (!adUnitId) {
+      console.error('未配置插屏广告单元ID')
+      return
+    }
+    
+    const ad = adapter.interstitial(adUnitId)
+    try {
+      ad.show()
+      lastAdShownTime.value = Date.now()
+      return true
+    } catch (err) {
+      console.error('插屏广告展示失败:', err)
+      return false
+    }
+  }
+
+  // 广告日志记录
+  const logAdView = (chapterId, adType, platform) => {
     uni.request({
       url: 'https://api.aiyadianzi.ltd/ad/log',
       method: 'POST',
@@ -73,10 +206,51 @@ export function useAdManager() {
         userId: userStore.userId,
         chapterId,
         adType,
-        platform: process.env.VUE_APP_PLATFORM
+        platform
+      },
+      header: {
+        'Authorization': `Bearer ${uni.getStorageSync('token')}`
       }
     })
   }
+  
+  // 获取当前平台
+  const getCurrentPlatform = () => {
+    // #ifdef MP-WEIXIN
+    return 'wechat'
+    // #endif
+    // #ifdef MP-TOUTIAO
+    return 'douyin'
+    // #endif
+    return 'h5'
+  }
+  
+  // 获取广告单元ID
+  const getAdUnitId = (platform, adType) => {
+    const config = {
+      wechat: {
+        reward: 'wechat_reward_ad_123456',
+        feed: 'wechat_feed_ad_654321',
+        interstitial: 'wechat_interstitial_ad_789012'
+      },
+      douyin: {
+        reward: 'douyin_reward_ad_abcdef',
+        feed: 'douyin_feed_ad_fedcba',
+        interstitial: 'douyin_interstitial_ad_123abc'
+      },
+      h5: {
+        reward: 'h5_reward_ad_123',
+        feed: 'h5_feed_ad_456',
+        interstitial: 'h5_interstitial_ad_789'
+      }
+    }
+    
+    return config[platform]?.[adType]
+  }
 
-  return { showRewardAd, showFeedAd }
+  return { 
+    showRewardAd, 
+    showFeedAd,
+    showInterstitialAd
+  }
 }

RuoYi-App/utils/contentUtils.js

@@ -0,0 +1,92 @@
+/**
+ * 清洗小说内容，移除原始网站信息
+ * @param {string} content - 原始内容
+ * @returns {string} 清洗后的内容
+ */
+export function cleanNovelContent(content) {
+  if (!content) return ''
+  
+  // 移除特定网站信息
+  const cleanContent = content
+    .replace(/最新网址[:：]?\s*[a-z0-9.-]+/gi, '')
+    .replace(/www\.[a-z0-9]+\.[a-z]{2,}/gi, '')
+    .replace(/请收藏本站：https:\/\/www\.\w+\.\w+/g, '')
+    .replace(/ | /g, ' ') // 替换空格实体
+    .replace(/<br\s*\/?>/g, '\n') // 替换换行标签
+    .replace(/<[^>]+>/g, '') // 移除所有HTML标签
+  
+  // 移除多余空行
+  return cleanContent
+    .split('\n')
+    .map(line => line.trim())
+    .filter(line => line.length > 0)
+    .join('\n\n')
+}
+
+/**
+ * 分页处理小说内容
+ * @param {string} content - 清洗后的内容
+ * @param {number} pageSize - 每页字符数
+ * @returns {string[]} 分页后的内容数组
+ */
+export function paginateContent(content, pageSize = 800) {
+  const pages = []
+  let currentPage = ''
+  let currentLength = 0
+  const paragraphs = content.split('\n\n')
+  
+  for (const paragraph of paragraphs) {
+    // 如果当前页加上新段落不会超长
+    if (currentLength + paragraph.length <= pageSize) {
+      currentPage += (currentPage ? '\n\n' : '') + paragraph
+      currentLength += paragraph.length
+    } 
+    // 如果段落本身超过一页
+    else if (paragraph.length > pageSize) {
+      // 先保存当前页
+      if (currentPage) {
+        pages.push(currentPage)
+        currentPage = ''
+        currentLength = 0
+      }
+      
+      // 将长段落分割成多页
+      let start = 0
+      while (start < paragraph.length) {
+        const end = start + pageSize
+        let pageContent = paragraph.substring(start, end)
+        
+        // 尽量在句号处分页
+        const lastPunctuation = Math.max(
+          pageContent.lastIndexOf('。'),
+          pageContent.lastIndexOf('！'),
+          pageContent.lastIndexOf('？'),
+          pageContent.lastIndexOf('.'),
+          pageContent.lastIndexOf('!'),
+          pageContent.lastIndexOf('?')
+        )
+        
+        if (lastPunctuation > -1 && lastPunctuation > start + pageSize * 0.8) {
+          pageContent = pageContent.substring(0, lastPunctuation + 1)
+          start = start + lastPunctuation + 1
+        } else {
+          start = end
+        }
+        
+        pages.push(pageContent)
+      }
+    }
+    // 如果段落会导致当前页超长
+    else {
+      pages.push(currentPage)
+      currentPage = paragraph
+      currentLength = paragraph.length
+    }
+  }
+  
+  if (currentPage) {
+    pages.push(currentPage)
+  }
+  
+  return pages
+}