更新：增加“我的书单”功能

pages/user/index.vue

@@ -96,8 +96,8 @@ const menuItems = computed(() => [
   {
     id: 2,
     name: t('user.myBooklist'),
-    url: '/pages/book/index',
-    type: 'switchTab'
+    url: '/pages/user/myBook/index',
+    type: 'pageJump'
   },
   {
     id: 3,

pages/user/myBook/index.vue

@@ -0,0 +1,225 @@
+<template>
+  <view class="my-book-page">
+    <!-- 自定义导航栏 -->
+    <nav-bar :title="$t('book.myBook')"></nav-bar>
+    
+    <!-- 书籍列表 -->
+    <scroll-view 
+      v-if="(bookList && bookList.length > 0) || loading"
+      scroll-y 
+      class="book-scroll"
+      :style="{ height: scrollHeight + 'px' }"
+      :scroll-into-view="scrollTarget"
+      @scrolltolower="loadMore"
+    >
+      <view :id="scrollTarget" />
+      <view class="book-list">
+        <BookCard 
+          v-for="item in bookList" 
+          :key="item.id"
+          :book="item"
+          @click="goToDetail(item.id)"
+          @read="goToReader(item.id)"
+          @listen="goToListen(item.id)"
+          @review="goToReview(item.id)"
+        />
+        
+        <!-- 加载提示 -->
+        <view v-if="showLoadMore && hasMore" class="load-tip">
+          <text>{{ $t('common.loadMore') }}</text>
+        </view>
+        <view v-if="!hasMore && bookList && bookList.length > 0" class="load-tip">
+          <text>{{ $t('common.noMore') }}</text>
+        </view>
+      </view>
+    </scroll-view>
+    
+    <!-- 空状态 -->
+    <view v-else-if="!loading" class="empty-state">
+      <image src="@/static/null_img.png" mode="aspectFit" />
+      <text class="empty-text">{{ $t('book.nullText') }}</text>
+      <wd-button type="primary" @click="goToBuy">
+        {{ $t('book.choose') }}
+      </wd-button>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, computed } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
+import { useI18n } from 'vue-i18n'
+import { bookApi } from '@/api/modules/book'
+import type { IBook } from '@/types/book'
+import BookCard from '@/components/book/BookCard.vue'
+
+const { t } = useI18n()
+
+// 数据状态
+const bookList = ref<IBook[]>([])
+const loading = ref(false)
+const page = ref({
+  current: 1,
+  limit: 10
+})
+const total = ref(0)
+const scrollTarget = ref('top')
+const scrollHeight = ref(0)
+const showLoadMore = ref(false)
+
+// 计算属性
+const hasMore = computed(() => bookList.value && bookList.value.length < total.value)
+
+// 生命周期
+onMounted(() => {
+  initScrollHeight()
+  loadBookList()
+})
+
+// 初始化滚动区域高度
+function initScrollHeight() {
+  const systemInfo = uni.getSystemInfoSync()
+  const statusBarHeight = systemInfo.statusBarHeight || 0
+  let navBarHeight = 44
+  if (systemInfo.model.includes('iPhone')) {
+    const modelNumber = parseInt(systemInfo.model.match(/\d+/)?.[0] || '0')
+    if (modelNumber >= 11) {
+      navBarHeight = 48
+    }
+  }
+  const totalNavHeight = statusBarHeight + navBarHeight
+  scrollHeight.value = systemInfo.windowHeight - totalNavHeight
+}
+
+// 加载书单列表
+async function loadBookList() {
+  if (loading.value || (!hasMore.value && bookList.value && bookList.value.length > 0)) {
+    return
+  }
+  
+  loading.value = true
+  uni.showLoading({ title: t('global.loading') })
+  
+  try {
+    const res = await bookApi.getMyBooks(page.value.current, page.value.limit)
+    uni.hideLoading()
+    
+    if (res.page && res.page.records) {
+      total.value = res.page.total
+      const newBooks = res.page.records
+      
+      if (newBooks.length > 0) {
+        bookList.value = [...(bookList.value || []), ...newBooks]
+        page.value.current += 1
+        showLoadMore.value = true
+      }
+    }
+  } catch (error) {
+    uni.hideLoading()
+    console.error('Failed to load book list:', error)
+  } finally {
+    loading.value = false
+  }
+}
+
+// 加载更多
+function loadMore() {
+  if (!loading.value && hasMore.value) {
+    loadBookList()
+  }
+}
+
+// 页面跳转
+function goToDetail(bookId: number) {
+  uni.navigateTo({
+    url: `/pages/book/detail?id=${bookId}`
+  })
+}
+
+function goToReader(bookId: number) {
+  uni.navigateTo({
+    url: `/pages/book/reader?isBuy=0&bookId=${bookId}`
+  })
+}
+
+function goToListen(bookId: number) {
+  uni.navigateTo({
+    url: `/pages/book/listen/index?bookId=${bookId}`
+  })
+}
+
+function goToReview(bookId: number) {
+  uni.navigateTo({
+    url: `/pages/book/review?bookId=${bookId}&page=0`
+  })
+}
+
+function goToBuy() {
+  uni.switchTab({
+    url: '/pages/book/index'
+  })
+}
+
+// 页面显示时重新加载
+onShow(() => {
+  // 回到顶部
+  scrollTarget.value = 'top'
+  setTimeout(() => {
+    scrollTarget.value = ''
+  }, 300)
+  
+  // 重置并重新加载
+  bookList.value = []
+  page.value.current = 1
+  total.value = 0
+  showLoadMore.value = false
+  loadBookList()
+})
+</script>
+
+<style lang="scss" scoped>
+.my-book-page {
+  background: #f7faf9;
+  min-height: 100vh;
+  
+  .book-scroll {
+    .book-list {
+      padding: 0 20rpx 10rpx;
+    }
+  }
+  
+  .load-tip {
+    font-size: 30rpx;
+    text-align: center;
+    padding: 40rpx 0;
+    color: #ccc;
+  }
+  
+  .empty-state {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding-top: 200rpx;
+    
+    image {
+      width: 400rpx;
+      height: 300rpx;
+      margin-bottom: 40rpx;
+    }
+    
+    .empty-text {
+      font-size: 28rpx;
+      color: #999;
+      margin-bottom: 50rpx;
+    }
+    
+    button {
+      width: 180rpx;
+      height: 60rpx;
+      font-size: 28rpx;
+      border-radius: 50rpx;
+    }
+  }
+}
+</style>

pages/user/order/index.vue

@@ -1,21 +1,13 @@
 <template>
   <view class="order-page">
     <!-- 自定义导航栏 -->
-    <view class="custom-navbar" :style="{ height: navbarHeight }">
-      <view class="navbar-content" :style="{ paddingTop: statusBarHeight + 'px' }">
-        <view class="navbar-left" @click="goBack">
-          <wd-icon name="arrow-left" size="18px" color="#333" />
-        </view>
-        <text class="navbar-title">{{ $t('user.myOrders') }}</text>
-      </view>
-    </view>
+    <nav-bar :title="$t('user.myOrders')"></nav-bar>
 
     <!-- 订单列表 -->
     <scroll-view 
       v-if="orderList.length > 0"
       scroll-y 
       class="order-scroll"
-      :style="{ paddingTop: navbarHeight }"
       @scrolltolower="loadMore"
     >
       <view class="order-list">

pages/user/settings/index.vue

@@ -42,27 +42,72 @@
       </view>
     </wd-popup>
 
+    <!-- 语言选择弹窗 -->
+    <wd-popup v-model="showLanguageSelect" position="bottom" :closeable="true">
+      <view class="language-modal">
+        <text class="modal-title">{{ $t('user.languageSelect') }}</text>
+        <view class="language-list">
+          <view 
+            v-for="lang in availableLanguages" 
+            :key="lang.code"
+            class="language-item"
+            :class="{ active: (userStore.language || uni.getLocale()) === lang.code }"
+            @click="selectLanguage(lang.code)"
+          >
+            <text class="language-name">{{ lang.name }}</text>
+            <wd-icon v-if="(userStore.language || uni.getLocale()) === lang.code" name="check" size="20px" color="#54a966" />
+          </view>
+        </view>
+      </view>
+    </wd-popup>
+
     <wd-message-box />
   </view>
 </template>
 
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue'
+import { useSysStore } from '@/stores/sys'
 import { useUserStore } from '@/stores/user'
 import { useI18n } from 'vue-i18n'
 import { useMessage } from '@/uni_modules/wot-design-uni'
 import { makePhoneCall, copyToClipboard } from '@/utils/index'
 
-const { t } = useI18n()
+const { t, locale } = useI18n()
+const sysStore = useSysStore()
 const userStore = useUserStore()
+
 const message = useMessage()
 
 // 导航栏高度
 const statusBarHeight = ref(0)
 const navbarHeight = ref('44px')
 
+// 弹窗状态
+const showQrCode = ref(false)
+const showLanguageSelect = ref(false)
+
+// 可选语言列表
+const availableLanguages = computed(() => [
+  { code: 'en', name: t('locale.en') },
+  { code: 'zh-Hans', name: t('locale.zh-hans') }
+])
+
+// 获取当前语言名称
+const getCurrentLanguageName = () => {
+  const currentLang = userStore.language || uni.getLocale()
+  const language = availableLanguages.value.find(lang => lang.code === currentLang)
+  return language ? language.name : currentLang
+}
+
 // 设置项列表
 const settingItems = computed(() => [
+  {
+    id: 0,
+    label: t('user.language'),
+    value: getCurrentLanguageName(),
+    type: 'language'
+  },
   {
     id: 1,
     label: t('user.hotline'),
@@ -89,9 +134,6 @@ const settingItems = computed(() => [
   }
 ])
 
-// 弹窗状态
-const showQrCode = ref(false)
-
 /**
  * 获取导航栏高度
  */
@@ -113,6 +155,9 @@ const getNavbarHeight = () => {
  */
 const handleSettingClick = (item: any) => {
   switch (item.type) {
+    case 'language':
+      showLanguageSelect.value = true
+      break
     case 'tel':
       handlePhoneCall(item.value, item.label)
       break
@@ -152,6 +197,27 @@ const previewQrCode = () => {
   })
 }
 
+/**
+ * 选择语言
+ */
+const selectLanguage = (languageCode: string) => {
+  try {
+    uni.setLocale(languageCode)
+    // 保存语言设置到用户存储
+    sysStore.setLanguage(languageCode)
+    
+    // 更新i18n语言
+    locale.value = languageCode
+    
+  } catch (error) {
+    console.error('语言切换失败:', error)
+    uni.showToast({
+      title: t('user.languageChangeFailed'),
+      icon: 'none'
+    })
+  }
+}
+
 /**
  * 检查版本更新
  */
@@ -337,4 +403,40 @@ $theme-color: #54a966;
     margin: 0 auto;
   }
 }
+
+.language-modal {
+  padding: 40rpx;
+  
+  .modal-title {
+    display: block;
+    font-size: 32rpx;
+    font-weight: bold;
+    color: #333;
+    margin-bottom: 30rpx;
+    text-align: center;
+  }
+  
+  .language-list {
+    .language-item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 30rpx 20rpx;
+      border-bottom: 1rpx solid #f0f0f0;
+      
+      &.active {
+        background-color: #f7faf9;
+      }
+      
+      &:last-child {
+        border-bottom: none;
+      }
+      
+      .language-name {
+        font-size: 30rpx;
+        color: #333;
+      }
+    }
+  }
+}
 </style>