revert 33c22eaad9

revert 解决冲突
2025-11-27 15:38:24 +08:00
parent 3da220526b
commit 64abd3d4ab
28 changed files with 1059 additions and 705 deletions
--- a/api/interceptors/response.ts
+++ b/api/interceptors/response.ts
@@ -34,7 +34,7 @@ export function responseInterceptor(res: UniApp.RequestSuccessCallbackResult) {
  }

  // 可能为字符串，尝试解析（原项目也做了类似处理）
-  let httpData: IApiResponse | string = res.data;
+  let httpData: IApiResponse | string = res.data as any;
  if (typeof httpData === 'string') {
    try {
      httpData = JSON.parse(httpData);
@@ -44,20 +44,19 @@ export function responseInterceptor(res: UniApp.RequestSuccessCallbackResult) {
  }

  // 规范化 message 字段
-  const message = (httpData as IApiResponse).msg || (httpData as IApiResponse).message || (httpData as IApiResponse).errMsg || '';
+  const message = (httpData as any).msg || (httpData as any).message || (httpData as any).errMsg || '';

-  const code = (httpData as IApiResponse).code;
-
-  // 成功判断
-  const successFlag = (httpData as IApiResponse).success === true || code === 0;
+  // 成功判断：与原项目一致的条件
+  const successFlag = (httpData as any).success === true || (httpData as any).code === 0;

  if (successFlag) {
-    // 返回原始 httpData
-    // 实际数据每个接口不同，调用者需根据实际情况取 .data 字段
+    // 返回原始 httpData（与原项目 dataFactory 返回 Promise.resolve(httpData) 保持一致）
+    // 但大多数调用者更关心 data 字段，这里返回整个 httpData，调用者可取 .data
    return Promise.resolve(httpData);
  }

-  // 登录失效或需要强制登录的一些 code
+  // 登录失效或需要强制登录的一些 code（与原项目一致）
+  const code = (httpData as any).code;
  if (code === '401' || code === 401) {
    // 触发登出流程
    handleAuthExpired();
@@ -65,7 +64,7 @@ export function responseInterceptor(res: UniApp.RequestSuccessCallbackResult) {
  }

  // 原项目还将 1000,1001,1100,402 等视作需要强制登录
-  if (code == 1000 || code == 1001 || code === 1100 || code === 402) {
+  if (code === '1000' || code === '1001' || code === 1000 || code === 1001 || code === 1100 || code === '402' || code === 402) {
    handleAuthExpired();
    return Promise.reject({ statusCode: 0, errMsg: message || t('global.loginExpired'), data: httpData });
  }
--- a/api/modules/order.ts
+++ b/api/modules/order.ts
@@ -8,8 +8,7 @@ import type {
  IOrderGoods,
  ICoupon,
  ICourseOrderCreateParams,
-  IOrderInitData,
-  IGoodsDiscountParams
+  IOrderInitData
 } from '@/types/order'
 import type { IUserInfo } from '@/types/user'

@@ -109,7 +108,7 @@ export const orderApi = {
   * 获取地区优惠金额
   * @param productList 商品列表
   */
-  async getDistrictAmount(productList: IGoodsDiscountParams[]) {
+  async getDistrictAmount(productList: Array<{ productId: number; quantity: number }>) {
    const res = await mainClient.request<IApiResponse<{ districtAmount: number }>>({
      url: 'book/buyOrder/getDistrictAmount',
      method: 'POST',
--- a/api/request.ts
+++ b/api/request.ts
@@ -8,7 +8,6 @@ import { t } from '@/utils/i18n'
 export function createRequestClient(cfg: ICreateClientConfig) {
  const baseURL = cfg.baseURL;
  const timeout = cfg.timeout ?? REQUEST_TIMEOUT;
-  let reqCount= 0

  async function request<T = any>(options: IRequestOptions): Promise<T> {
    // 组装 final options
@@ -24,18 +23,14 @@ export function createRequestClient(cfg: ICreateClientConfig) {

    // 全局处理请求 loading
    const loading = !cfg.loading ? true : cfg.loading  // 接口请求参数不传loading，默认显示loading
-    if (loading) {
-      uni.showLoading({ mask: true })
-      reqCount++
-    }
+    loading && uni.showLoading()

    return new Promise((resolve, reject) => {
      uni.request({
        ...intercepted,
        complete() {
          // 请求完成关闭 loading
-          loading && reqCount--
-          reqCount <= 0 && uni.hideLoading()
+          loading && uni.hideLoading()
        },
        success(res: any) {
          // 委托给响应拦截器处理
--- a/components/order/Confirm.vue
+++ b/components/order/Confirm.vue
@@ -26,47 +26,53 @@
      <!-- 商品总价 -->
      <view class="price-item">
        <text class="label">{{ $t('order.totalPrice') }}</text>
-        <text class="value">{{ totalAmount.toFixed(2) }} {{ t('global.coin') }}</text>
+        <text class="value">{{ totalPrice.toFixed(2) }} 天医币</text>
      </view>
      
      <!-- 优惠券 -->
      <!-- <coupon v-model="selectedCoupon" /> -->
      
      <!-- 活动立减 -->
-      <view v-if="promotionDiscounted > 0" class="price-item">
-        <text class="label">{{ $t('order.promotionDiscounted') }}</text>
-        <text class="discount-value">-{{ promotionDiscounted.toFixed(2) }} {{ t('global.coin') }}</text>
+      <view v-if="hasActivityDiscount" class="price-item">
+        <text class="label">{{ $t('order.activityDiscount') }}</text>
+        <text class="discount-value">-￥{{ activityDiscountAmount.toFixed(2) }}</text>
      </view>
      
      <!-- VIP专享立减 -->
-      <view v-if="vipDiscounted > 0" class="price-item">
+      <view v-if="vipPrice > 0" class="price-item">
        <view class="label-row">
          <text class="vip-icon">VIP</text>
          <text class="label">{{ $t('order.vipDiscount') }}</text>
        </view>
-        <text class="discount-value">-{{ vipDiscounted.toFixed(2) }} {{ t('global.coin') }}</text>
+        <text class="discount-value">-￥{{ vipPrice.toFixed(2) }}</text>
+      </view>
+      
+      <!-- 地区优惠 -->
+      <view v-if="districtAmount > 0" class="price-item">
+        <text class="label">{{ $t('order.districtDiscount') }}</text>
+        <text class="discount-value">-￥{{ districtAmount.toFixed(2) }}</text>
      </view>
      
      <!-- 积分 -->
-      <view v-if="allowPointPay && userInfo?.jf > 0" class="price-item">
+      <view v-if="allowPointPay && userInfo.jf > 0" class="price-item">
        <view class="label-row">
          <image src="/static/icon/jifen.png" class="icon-img" />
          <text class="label">{{ $t('order.points') }}</text>
          <text class="points-total">
-            ({{ $t('order.allPoints') }}：{{ userInfo?.jf || 0 }})
+            ({{ $t('order.allPoints') }}：{{ userInfo.jf }})
          </text>
        </view>
-        <text class="discount-value">-{{ pointsDiscounted.toFixed(2) }}</text>
+        <text class="discount-value">-{{ jfNumber.toFixed(2) }}</text>
      </view>
      
      <!-- 积分输入 -->
-      <view v-if="allowPointPay && userInfo?.jf > 0" class="points-input-section">
+      <view v-if="allowPointPay && userInfo.jf > 0" class="points-input-section">
        <text class="points-label">
-          {{ $t('order.maxPoints', { max: pointsUsableMax }) }}
+          {{ $t('order.maxPoints', { max: jfNumberMax }) }}
        </text>
        <view class="points-input-box">
          <input
-            v-model="pointsDiscounted"
+            v-model="jfNumber"
            type="number"
            clearable
            :placeholder="$t('order.pointsPlaceholder')"
@@ -88,9 +94,9 @@
    <view class="bottom-bar">
      <view class="total-info">
        <text class="label">{{ $t('order.total') }}：</text>
-        <text class="amount">{{ finalAmount }} {{ t('global.coin') }}</text>
+        <text class="amount">{{ actualPayment.toFixed(2) }} 天医币</text>
      </view>
-      <wd-button type="primary" @click="handleSubmit">
+      <wd-button type="primary" :loading="submitting" @click="handleSubmit">
        {{ $t('order.submit') }}
      </wd-button>
    </view>
@@ -114,7 +120,7 @@
        </view>
        
        <view class="popup-footer">
-          <wd-button type="primary" block @click="showRemarkPopup = false">{{ $t('global.ok') }}</wd-button>
+          <wd-button type="primary" block @click="handleRemarkConfirm">{{ $t('global.ok') }}</wd-button>
        </view>
      </view>
    </wd-popup>
@@ -122,61 +128,93 @@
 </template>

 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import { ref, computed, watch } from 'vue'
 import { orderApi } from '@/api/modules/order'
 import { t } from '@/utils/i18n'
-import type { IGoods, IGoodsDiscountParams } from '@/types/order'
+import type { IOrderGoods } from '@/types/order'
 import PayWay from '@/components/order/PayWay.vue'

 // 使用页面传参
 interface Props {
-  goodsList: IGoods[],
+  goodsList: IOrderGoods[],
  userInfo: object,
  allowPointPay: boolean,
-  orderType: string,
 }
 const props = withDefaults(defineProps<Props>(), {
  goodsList: () => [],
  userInfo: () => ({}),
-  allowPointPay: () => true,
-  orderType: () => 'order',
+  allowPointPay: () => true
 })

+// 价格相关
+const totalPrice = ref(0)
+const vipPrice = ref(0)
+const districtAmount = ref(0)
+const actualPayment = ref(0)
+
+// 积分相关
+const jfNumber = ref(0)
+const jfNumberMax = ref(0)
+
+// 优惠券相关
+
+
 // 订单备注
 const remark = ref('')
 const showRemarkPopup = ref(false)

-// 价格相关
-const totalAmount = ref(0) // 商品总价
-const vipDiscounted = ref(0) // VIP专享立减
-const promotionDiscounted = ref(0) // 活动优惠金额
-const couponDiscounted = ref(0) // 优惠券优惠金额
-const finalAmount = ref<string | number>('--') // 最终支付金额
+// 支付相关

-// 积分相关
-const pointsDiscounted = ref(0) // 积分支付金额
-const pointsUsableMax = ref(0) // 最大可用积分
+// UI状态
+const submitting = ref(false)

-// 优惠券相关
-
-/**
- * 优惠价格的请求参数
- */
-const goodsListParams = ref<IGoodsDiscountParams[]>([])
-const getDiscountParams = (goodsList: IGoods[]) => {
-  goodsListParams.value = goodsList.map(item => ({
-    productId: item.productId,
-    quantity: item.productAmount || 1
-  }))
-}
-
-// 监听商品列表变化，更新价格
 watch(() => props.goodsList, () => {
-  getDiscountParams(props.goodsList)
  // 初始化价格
  calculateAllPrices()
 })

+/**
+ * 是否有活动优惠
+ */
+const hasActivityDiscount = computed(() => {
+  return props.goodsList.some(item => item.activityPrice && item.activityPrice > 0)
+})
+
+/**
+ * 活动优惠金额
+ */
+const activityDiscountAmount = computed(() => {
+  return props.goodsList.reduce((sum, item) => {
+    if (item.activityPrice && item.activityPrice > 0) {
+      return sum + (item.price - item.activityPrice) * item.productAmount
+    }
+    return sum
+  }, 0)
+})
+
+/**
+ * 处理商品数量变化
+ */
+const handleQuantityChange = async (item: IOrderGoods, value: number) => {
+  try {
+    // 更新购物车
+    await orderApi.updateCart({
+      productId: item.productId,
+      productAmount: value,
+      price: item.price
+    })
+    
+    // 重新获取商品列表和计算价格
+    // await getGoodsList()
+  } catch (error) {
+    console.error('更新数量失败:', error)
+    uni.showToast({
+      title: '更新失败',
+      icon: 'none'
+    })
+  }
+}
+
 /**
 * 计算所有价格
 */
@@ -185,17 +223,15 @@ const calculateAllPrices = async () => {
    // 计算商品总价
    calculateTotalPrice()
    
-    await Promise.all([
-      // 获取VIP优惠
-      calculateVipDiscounted(),
-      
-      // 获取活动优惠
-      calculatePromotionDiscounted()
-
-      // 获取优惠券列表
-      // await getAvailableCoupons()
-    ])
-
+    // 获取VIP优惠
+    // await calculateVipDiscount()
+    
+    // 获取地区优惠
+    // await calculateDistrictDiscount()
+    
+    // 获取优惠券列表
+    // await getAvailableCoupons()
+    
    // 计算最终价格
    calculateFinalPrice()
  } catch (error) {
@@ -207,7 +243,8 @@ const calculateAllPrices = async () => {
 * 计算商品总价
 */
 const calculateTotalPrice = () => {
-  totalAmount.value = props.goodsList.reduce((sum: number, item: IGoods) => {
+  console.log('商品列表:', props.goodsList)
+  totalPrice.value = props.goodsList.reduce((sum, item) => {
    // return sum + (item.price * item.productAmount)
    return sum + (item.price * 1)
  }, 0)
@@ -216,47 +253,95 @@ const calculateTotalPrice = () => {
 /**
 * 计算VIP优惠
 */
-const calculateVipDiscounted = async () => {
-  const res = await orderApi.getVipDiscountAmount(goodsListParams.value)
-  vipDiscounted.value = res.discountAmount
+const calculateVipDiscount = async () => {
+  try {
+    const productList = props.goodsList.map(item => ({
+      productId: item.productId,
+      quantity: item.productAmount
+    }))
+    
+    const res = await orderApi.getVipDiscountAmount(productList)
+    if (res.code === 0 && res.data) {
+      vipPrice.value = res.data.discountAmount
+    }
+  } catch (error) {
+    console.error('获取VIP优惠失败:', error)
+  }
 }

 /**
 * 计算活动优惠
 */
-const calculatePromotionDiscounted = async () => {
-  const res = await orderApi.getDistrictAmount(goodsListParams.value)
-  promotionDiscounted.value = res.districtAmount
+const calculateDistrictDiscount = async () => {
+  try {
+    const productList = props.goodsList.map(item => ({
+      productId: item.productId,
+      quantity: item.productAmount
+    }))
+    
+    const res = await orderApi.getDistrictAmount(productList)
+    if (res.code === 0 && res.data) {
+      districtAmount.value = res.data.districtAmount
+    }
+  } catch (error) {
+    console.error('获取地区优惠失败:', error)
+  }
 }

 /**
 * 获取可用优惠券
 */
-// const getAvailableCoupons = async () => {
-//   try {
-//     const shopProductInfos = props.goodsList.map(item => {
-//       const price = item.activityPrice && item.activityPrice > 0 ? item.activityPrice : item.price
-//       return `${item.productId}:${price}:${item.productAmount}`
-//     }).join(',')
+const getAvailableCoupons = async () => {
+  try {
+    const shopProductInfos = props.goodsList.map(item => {
+      const price = item.activityPrice && item.activityPrice > 0 ? item.activityPrice : item.price
+      return `${item.productId}:${price}:${item.productAmount}`
+    }).join(',')
    
-//     const res = await orderApi.getCouponListPayment(shopProductInfos)
-//     if (res.code === 0 && res.data) {
-//       couponList.value = res.data.couponHistoryList || []
+    const res = await orderApi.getCouponListPayment(shopProductInfos)
+    if (res.code === 0 && res.data) {
+      couponList.value = res.data.couponHistoryList || []
      
-//       // 如果当前选中的优惠券不可用，清除选择
-//       if (selectedCoupon.value) {
-//         const stillAvailable = couponList.value.find(
-//           c => c.couponId === selectedCoupon.value?.couponId && c.canUse === 1
-//         )
-//         if (!stillAvailable) {
-//           selectedCoupon.value = null
-//         }
-//       }
-//     }
-//   } catch (error) {
-//     console.error('获取优惠券失败:', error)
-//   }
-// }
+      // 如果当前选中的优惠券不可用，清除选择
+      if (selectedCoupon.value) {
+        const stillAvailable = couponList.value.find(
+          c => c.couponId === selectedCoupon.value?.couponId && c.canUse === 1
+        )
+        if (!stillAvailable) {
+          selectedCoupon.value = null
+        }
+      }
+    }
+  } catch (error) {
+    console.error('获取优惠券失败:', error)
+  }
+}
+
+/**
+ * 计算最终价格
+ */
+const calculateFinalPrice = () => {
+  // const couponAmount = selectedCoupon.value?.couponEntity.couponAmount || 0
+  const couponAmount = 0
+  
+  // 计算最大可用积分
+  const orderAmountAfterDiscount = totalPrice.value - districtAmount.value - vipPrice.value
+  jfNumberMax.value = Math.min(
+    props.userInfo.jf || 0,
+    Math.floor(orderAmountAfterDiscount - couponAmount)
+  )
+  
+  // 限制当前积分不超过最大值
+  if (jfNumber.value > jfNumberMax.value) {
+    jfNumber.value = jfNumberMax.value
+  }
+  
+  // 计算实付款
+  actualPayment.value = Math.max(
+    0,
+    totalPrice.value - couponAmount - jfNumber.value - districtAmount.value - vipPrice.value
+  )
+}

 /**
 * 处理积分输入
@@ -268,7 +353,7 @@ const handlePointsInput = (value: any) => {
  val = val.replace(/[^0-9]/g, '')
  
  if (val === '0' || val === '') {
-    pointsDiscounted.value = 0
+    jfNumber.value = 0
  } else {
    let numericValue = parseInt(val, 10)
    if (numericValue < 0 || isNaN(numericValue)) {
@@ -276,11 +361,11 @@ const handlePointsInput = (value: any) => {
    }
    
    // 确保不超过最大值
-    if (numericValue >= pointsUsableMax.value) {
-      numericValue = pointsUsableMax.value
+    if (numericValue >= jfNumberMax.value) {
+      numericValue = jfNumberMax.value
    }
    
-    pointsDiscounted.value = numericValue
+    jfNumber.value = numericValue
  }
  
  // 重新计算实付款
@@ -291,52 +376,32 @@ const handlePointsInput = (value: any) => {
 * 清除积分输入
 */
 const handlePointsClear = () => {
-  pointsDiscounted.value = 0
+  jfNumber.value = 0
  calculateFinalPrice()
 }

 /**
- * 计算最终价格
+ * 跳转到充值页面
 */
-const calculateFinalPrice = () => {
-  // const couponAmount = selectedCoupon.value?.couponEntity.couponAmount || 0
-  const couponAmount = 0
-  
-  // 计算最大可用积分
-  const orderAmountAfterDiscount = totalAmount.value - promotionDiscounted.value - vipDiscounted.value
-  pointsUsableMax.value = Math.min(
-    props?.userInfo?.jf || 0,
-    Math.floor(orderAmountAfterDiscount - couponAmount)
-  )
-  
-  // 限制当前积分不超过最大值
-  if (pointsDiscounted.value > pointsUsableMax.value) {
-    pointsDiscounted.value = pointsUsableMax.value
-  }
-  
-  // 计算实付款
-  const result = Math.max(
-    0,
-    totalAmount.value - couponAmount - pointsDiscounted.value - promotionDiscounted.value - vipDiscounted.value
-  )
-  finalAmount.value = result.toFixed(2)
+const goToRecharge = () => {
+  uni.navigateTo({
+    url: '/pages/user/wallet/recharge/index?source=order'
+  })
+}
+
+/**
+ * 确认备注
+ */
+const handleRemarkConfirm = () => {
+  showRemarkPopup.value = false
 }

 /**
 * 验证订单
 */
 const validateOrder = (): boolean => {
-  // 验证实付金额是否计算完成
-  if (typeof finalAmount.value != 'number') {
-    uni.showToast({
-      title: t('order.invalidPaymentAmount'),
-      icon: 'none'
-    })
-    return false
-  }
-
  // 验证天医币余额
-  if (finalAmount.value > props.userInfo.peanutCoin) {
+  if (actualPayment.value > props.userInfo.peanutCoin) {
    uni.showToast({
      title: t('order.insufficientBalance'),
      icon: 'none'
@@ -350,45 +415,77 @@ const validateOrder = (): boolean => {
 /**
 * 提交订单
 */
-const handleSubmit = async () => {  
+const handleSubmit = async () => {
+  if (submitting.value) {
+    uni.showToast({
+      title: t('order.tooFrequent'),
+      icon: 'none'
+    })
+    return
+  }
+  
  // 验证订单
-  if (!validateOrder()) return
+  if (!validateOrder()) {
+    return
+  }
+  
+  try {
+    submitting.value = true
+    
+    // 创建订单 此app用天医币支付，创建订单成功即支付成功
+    await createOrder()

-  // 创建订单 此app用天医币支付，创建订单成功即支付成功
-  await createOrder()
-
-  uni.showToast({
-    title: t('order.orderSuccess'),
-    icon: 'success'
-  })
+    uni.showToast({
+      title: t('order.orderSuccess'),
+      icon: 'success'
+    })
+    
+  } catch (error) {
+    console.error('提交订单失败:', error)
+    uni.showToast({
+      title: t('order.orderFailed'),
+      icon: 'none'
+    })
+  } finally {
+    submitting.value = false
+  }
 }

 /**
 * 创建订单
 */
 const createOrder = async (): Promise<string | null> => {
-  const orderParams = {
-    userId: props.userInfo.id,
-    paymentMethod: 4, // 天医币
-    orderMoney: totalAmount.value,
-    realMoney: finalAmount.value,
-    pointsDeduction: pointsDiscounted.value,
-    // couponId: selectedCoupon.value?.id,
-    // couponName: selectedCoupon.value?.couponEntity.couponName,
-    vipDiscountAmount: vipDiscounted.value,
-    districtMoney: promotionDiscounted.value,
-    remark: remark.value,
-    productList: goodsListParams.value,
-    orderType: props.orderType,
-    come: 10
+  try {    
+    const orderParams = {
+      userId: props.userInfo.id,
+      paymentMethod: 4, // 天医币
+      orderMoney: totalPrice.value,
+      realMoney: actualPayment.value,
+      jfDeduction: jfNumber.value,
+      // couponId: selectedCoupon.value?.id,
+      // couponName: selectedCoupon.value?.couponEntity.couponName,
+      // vipDiscountAmount: vipPrice.value,
+      // districtMoney: districtAmount.value,
+      remark: remark.value,
+      productList: props.goodsList.map(item => ({
+        productId: item.productId,
+        quantity: item.productAmount || 1
+      })),
+      orderType: 'order',
+      come: 10
+    }
+    
+    const res = await orderApi.placeCourseOrder(orderParams)
+    
+    if (res.code === 0 && res.orderSn) {
+      return res.orderSn
+    }
+    
+    return null
+  } catch (error) {
+    console.error('创建订单失败:', error)
+    throw error
  }
-  
-  const res = await orderApi.placeCourseOrder(orderParams)
-  
-  if (res.orderSn) {
-    return res.orderSn
-  }
-  return null
 }
 </script>

--- a/components/order/GoodsPrice.vue
+++ b/components/order/GoodsPrice.vue
@@ -1,72 +0,0 @@
-<template>
-  <view class="price-info">
-    <text class="price">{{ goodsPrice.lowestPrice }} {{ t('global.coin') }}</text>
-    <text class="price-label">{{ goodsPrice.priceLabel }}</text>
-    <text v-if="goodsPrice.priceLabel" class="original-price">{{ props.goods.price }} {{ t('global.coin') }}</text>
-  </view>
-</template>
-
-<script lang="ts" setup>
-import { computed } from 'vue'
-import { useUserStore } from '@/stores/user'
-import { calculateLowestPrice } from '@/utils/index'
-import { t } from '@/utils/i18n'
-import type { IGoods } from '@/types/order'
-
-const userStore = useUserStore()
-
-interface Props {
-  goods: IGoods
-}
-const props = defineProps<Props>()
-
-// 计算商品价格
-const goodsPrice = computed(() => {
-  const { activityPrice, vipPrice, price } = props.goods
-  const isVipUser = userStore.userVips && userStore.userVips.length > 0
-  const priceLabel = {
-    vipPrice: 'VIP优惠价',
-    activityPrice: '活动价',
-    price: ''
-  }
-  
-  let priceData = null
-  if (isVipUser) {
-    priceData = { activityPrice, vipPrice, price }
-  } else {
-    priceData = { activityPrice, price }
-  }
-  const lowestPrice = calculateLowestPrice(priceData)
-  
-  return {
-    lowestPrice: parseFloat(lowestPrice.value).toFixed(2),
-    priceLabel: priceLabel[lowestPrice.key as keyof typeof priceLabel]
-  }
-})
-</script>
-
-<style lang="scss" scoped>
-.price-info {
-  display: flex;
-  align-items: baseline;
-  gap: 10rpx;
-  color: #e97512;
-  
-  .price {
-    font-size: 16px;
-    font-weight: bold;
-    color: #e97512;
-  }
-  
-  .price-label {
-    font-size: 12px;
-    color: #e97512;
-  }
-  
-  .original-price {
-    font-size: 12px;
-    color: #8a8a8a;
-    text-decoration: line-through;
-  }
-}
-</style>
--- a/components/order/GoodsSelector.vue
+++ b/components/order/GoodsSelector.vue
@@ -2,14 +2,18 @@
  <wd-popup 
    v-model="visible" 
    position="bottom"
+    @close="handleClose"
  >
    <view class="goods-selector">
      <view v-if="selectedIndex !== -1" class="goods-info-mini">
        <image :src="goods[selectedIndex].productImages" mode="aspectFit" class="goods-cover" />
        <view class="info">
          <view class="name">{{ goods[selectedIndex].productName }}</view>
-          <!-- 商品价格组件 -->
-          <GoodsPrice :goods="goods[selectedIndex]" />
+          <view class="price-info">
+            <text class="price">{{ selectedGoodsPrice.lowestPrice }} 天医币</text>
+            <text class="price-label">{{ selectedGoodsPrice.priceLabel }}</text>
+            <text v-if="selectedGoodsPrice.priceLabel" class="original-price">{{ goods[selectedIndex].price }} 天医币</text>
+          </view>
        </view>
      </view>
      
@@ -28,8 +32,11 @@
          <view class="goods-info">
            <text class="goods-name">{{ item.productName }}</text>

-            <!-- 商品价格组件 -->
-            <GoodsPrice :goods="item" />
+            <view class="price-info">
+              <text class="price">{{ calculatePrice(item).lowestPrice }} 天医币</text>
+              <text class="price-label">{{ calculatePrice(item).priceLabel }}</text>
+              <text v-if="calculatePrice(item).priceLabel" class="original-price">{{ item.price }} 天医币</text>
+            </view>
          </view>
        </view>
      </view>
@@ -45,10 +52,12 @@
 <script setup lang="ts">
 import { ref, computed, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
+import { useUserStore } from '@/stores/user'
+import { calculateLowestPrice } from '@/utils/index'
 import type { IGoods } from '@/types/order'
-import GoodsPrice from '@/components/order/GoodsPrice.vue';

 const { t } = useI18n()
+const userStore = useUserStore()

 interface Props {
  show: boolean
@@ -71,8 +80,38 @@ const visible = computed({
  }
 })

-// 选中商品的索引
+// 计算商品价格
+const calculatePrice = (goods: IGoods) => {
+  const { activityPrice, vipPrice, price } = goods
+  const isVipUser = userStore.userVips && userStore.userVips.length > 0
+  const priceLabel = {
+    vipPrice: 'VIP优惠价',
+    activityPrice: '活动价',
+    price: ''
+  }
+  
+  let priceData = null
+  if (isVipUser) {
+    priceData = { activityPrice, vipPrice, price }
+  } else {
+    priceData = { activityPrice, price }
+  }
+  const lowestPrice = calculateLowestPrice(priceData)
+  
+  return {
+    lowestPrice: parseFloat(lowestPrice.value).toFixed(2),
+    priceLabel: priceLabel[lowestPrice.key as keyof typeof priceLabel]
+  }
+}
+
 const selectedIndex = ref(-1)
+// 选中商品的价格
+const selectedGoodsPrice = computed(() => {
+  if (selectedIndex.value === -1) return 0
+  const selectedGoods = props.goods[selectedIndex.value]
+  return calculatePrice(selectedGoods)
+})
+
 /**
 * 选择商品
 */
@@ -96,6 +135,13 @@ const handleConfirm = () => {
  emit('confirm', props.goods[selectedIndex.value])
 }

+/**
+ * 关闭选择器
+ */
+const handleClose = () => {
+  emit('close')
+}
+
 // 监听显示状态，重置选择
 watch(() => props.show, (newVal: boolean) => {
  if (newVal && props.goods.length > 0) {
@@ -129,6 +175,30 @@ watch(() => props.show, (newVal: boolean) => {
  }
 }

+.price-info {
+  display: flex;
+  align-items: baseline;
+  gap: 10rpx;
+  color: #e97512;
+  
+  .price {
+    font-size: 16px;
+    font-weight: bold;
+    color: #e97512;
+  }
+  
+  .price-label {
+    font-size: 12px;
+    color: #e97512;
+  }
+  
+  .original-price {
+    font-size: 12px;
+    color: #8a8a8a;
+    text-decoration: line-through;
+  }
+}
+
 .goods-info-mini {
  display: flex;
  align-items: center;
@@ -156,10 +226,10 @@ watch(() => props.show, (newVal: boolean) => {

    .price-info {
      padding-top: 20rpx;
-
-      :deep(.price) {
-        font-size: 36rpx;
-      }
+    }
+    
+    .price {
+      font-size: 36rpx;
    }
  }
 }
--- a/components/order/PayWay.vue
+++ b/components/order/PayWay.vue
@@ -4,7 +4,7 @@
    <view class="payment-item">
      <view class="payment-left">
        <image src="/static/icon/pay_3.png" class="payment-icon" />
-        <text class="">{{ $t('global.coin') }}</text>
+        <text class="">{{ $t('order.virtualCoin') }}</text>
        <text class="text-[#7dc1f0]">
          ({{ $t('order.balance') }}：{{ peanutCoin || 0 }})
        </text>
@@ -25,12 +25,19 @@
        <view class="tip-title">{{ $t('order.paymentTipTitle') }}</view>
        <view class="tip-item">{{ $t('order.paymentTip1') }}</view>
        <view class="tip-item">
-          {{ $t('order.paymentTip2-1') }}
-          <text class="link-text" @click="copyToClipboard('yilujiankangkefu')">yilujiankangkefu</text>
-          {{ $t('order.paymentTip2-2') }}
-          <text class="link-text" @click="copyToClipboard('AmazingLimited@163.com')">
-            AmazingLimited@163.com
+          {{ $t('order.paymentTip2') }}
+          <text class="link-text" @click="makePhoneCall('022-24142321')">022-24142321</text>
+        </view>
+        <view class="tip-item">
+          {{ $t('order.paymentTip3') }}
+          <text class="link-text" @click="copyToClipboard('publisher@tmrjournals.com')">
+            publisher@tmrjournals.com
          </text>
+          {{ $t('order.paymentTip3_1') }}
+          <text class="link-text" @click="copyToClipboard('yilujiankangkefu')">
+            yilujiankangkefu
+          </text>
+          {{ $t('order.paymentTip3_2') }}
        </view>
      </view>
    </view>
@@ -46,15 +53,6 @@ const props = defineProps({
    default: 0
  }
 })
-
-/**
- * 跳转到充值页面
- */
-const goToRecharge = () => {
-  uni.navigateTo({
-    url: '/pages/user/wallet/recharge/index?source=order'
-  })
-}
 </script>

 <style lang="scss" scoped>
--- a/components/order/ProductInfo.vue
+++ b/components/order/ProductInfo.vue
@@ -9,7 +9,7 @@
      <view class="order-item-product-name" v-html="title"></view>
    </view>
    <view class="order-item-product-price">
-      <view class="price">{{ price }} {{ t('global.coin') }}</view>
+      <view class="price">{{ price }} 天医币</view>
      <view class="count">x {{ 1 }}</view>
    </view>
  </view>
--- a/locale/en.json
+++ b/locale/en.json
@@ -16,8 +16,7 @@
    "dataNull": "No data available",
    "networkConnectionError": "Network connection error.",
    "loginExpired": "Login expired. Please log in again.",
-    "requestException": "Request exception",
-    "coin": "Coin"
+    "requestException": "Request exception"
  },
  "tabar.course": "COURSE",
  "tabar.book": "EBOOK",
@@ -239,6 +238,7 @@
    "amount": "Amount",
    "paymentMethod": "Payment Method",
    "googlePay": "Google Pay",
+    "virtualCoin": "Virtual Coin",
    "balance": "Balance",
    "confirm": "Confirm Order",
    "creating": "Creating order...",
@@ -247,7 +247,6 @@
    "paymentFailed": "Payment failed",
    "paymentCancelled": "Payment cancelled",
    "insufficientBalance": "Insufficient virtual coin balance",
-    "invalidPaymentAmount": "Final amount calculation incomplete",
    "googlePayNotAvailable": "Google Pay not available",
    "productNotFound": "Product not found",
    "orderCreateFailed": "Failed to create order",
@@ -422,9 +421,11 @@
    "coupon": "Coupon",
    "points": "Points",
    "vipDiscount": "VIP Exclusive Discount",
-    "promotionDiscounted": "Promotion Discount",
+    "activityDiscount": "Activity Discount",
+    "districtDiscount": "Regional Discount",
    "actualPayment": "Total",
    "paymentMethod": "Payment Method",
+    "virtualCoin": "Virtual Coin",
    "balance": "Balance",
    "recharge": "Recharge Now",
    "remark": "Order Remark",
@@ -451,11 +452,14 @@
    "duplicateConfirm": "Continue",
    "duplicateCancel": "Cancel",
    "customerService": "Customer Service",
+    "paymentTip": "1 Virtual Coin = 1 CNY",
    "paymentTipTitle": "Notes",
-    "paymentTip1": "1.1 points = 1 Tianyi coin",
-    "paymentTip2-1": "2.1 For assistance, please contact our customer service on WeChat",
-    "paymentTip2-2": "or by email at",
-    "ensureBalance": "Ensure sufficient Tianyi coin balance",
+    "paymentTip1": "1. 1 Virtual Coin = 1 CNY",
+    "paymentTip2": "2. For questions, please call customer service",
+    "paymentTip3": "3. Non-mainland China users can pay by credit card. Simple and fast, recommended! Credit cards with Visa or MasterCard logos are accepted. Please send payment request to email",
+    "paymentTip3_1": "(click to copy) with course name, amount, registered name and phone number, or add WeChat customer service (",
+    "paymentTip3_2": ") (click to copy). We will send payment link within 24 hours.",
+    "ensureBalance": "Ensure sufficient virtual coin balance",
    "vipLabel": "VIP Discount",
    "activityLabel": "Activity Price",
    "vipPriceLabel": "VIP Price",
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -16,8 +16,7 @@
    "dataNull": "暂无数据",
    "networkConnectionError": "网络连接错误。",
    "loginExpired": "登录失效，请重新登录。",
-    "requestException": "请求异常",
-    "coin": "天医币"
+    "requestException": "请求异常"
  },
  "tabar.course": "课程",
  "tabar.book": "图书",
@@ -266,6 +265,7 @@
    "amount": "金额",
    "paymentMethod": "支付方式",
    "googlePay": "Google Pay",
+    "virtualCoin": "虚拟币",
    "balance": "余额",
    "confirm": "确认下单",
    "creating": "创建订单中...",
@@ -422,9 +422,11 @@
    "coupon": "优惠券",
    "points": "积分",
    "vipDiscount": "VIP专享立减",
-    "promotionDiscounted": "活动立减",
+    "activityDiscount": "活动立减",
+    "districtDiscount": "地区优惠",
    "actualPayment": "实付款",
    "paymentMethod": "支付方式",
+    "virtualCoin": "天医币",
    "balance": "余额",
    "recharge": "立即充值",
    "remark": "订单备注",
@@ -443,7 +445,6 @@
    "pointsPlaceholder": "请输入积分",
    "allPoints": "全部积分",
    "insufficientBalance": "天医币余额不足",
-    "invalidPaymentAmount": "实付金额计算未完成",
    "orderCreating": "正在请求订单",
    "orderSuccess": "购买成功",
    "orderFailed": "失败,请重新下单",
@@ -452,10 +453,13 @@
    "duplicateConfirm": "继续操作",
    "duplicateCancel": "点错了",
    "customerService": "客服",
+    "paymentTip": "1天医币 = 1元人民币",
    "paymentTipTitle": "说明",
-    "paymentTip1": "1. 1积分=1天医币",
-    "paymentTip2-1": "2. 若有疑问请加客服微信：{ customerServiceWechat }  { customerServiceEmail }",
-    "paymentTip2-2": "或邮箱联系",
+    "paymentTip1": "1. 1天医币 = 1元人民币",
+    "paymentTip2": "2.若有疑问或意见请致电客服",
+    "paymentTip3": "3.非中国大陆用户可以信用卡支付。简单快捷，推荐使用！支付时使用的信用卡需要带有Visa或MasterCard的标识。请向邮箱",
+    "paymentTip3_1": "（点击复制）发送支付请求，内容需包含：拟购买的课程名称、支付金额、APP注册姓名及手机号码，或者加一路健康客服微信（",
+    "paymentTip3_2": "）（点击复制）联系我们，我们将在24小时内向您的邮箱或者微信发送支付链接，根据提示即可完成信用卡支付，无需兑换外币。",
    "ensureBalance": "确保您的天医币足够支付",
    "vipLabel": "VIP优惠",
    "activityLabel": "活动价",
--- a/pages/book/detail.vue
+++ b/pages/book/detail.vue
@@ -230,43 +230,70 @@ function initScrollHeight() {

 // 加载书籍详情
 async function loadBookInfo() {
-  const res = await bookApi.getBookInfo(bookId.value)
-  bookInfo.value = res.bookInfo
+  try {
+    const res = await bookApi.getBookInfo(bookId.value)
+    
+    if (res.bookInfo) {
+      bookInfo.value = res.bookInfo
+    }
+  } catch (error) {
+    console.error('Failed to load book info:', error)
+  }
 }

 // 加载购买商品信息
 async function loadGoodsInfo() {
-  const res = await bookApi.getBookGoods(bookId.value)
-  goodsList.value = res.productList || []
+  try {
+    const res = await bookApi.getBookGoods(bookId.value)
+    if (res.code === 0) {
+      goodsList.value = res.productList || []
+    }
+  } catch (error) {
+    console.error('Failed to load goods info:', error)
+  }
 }

 // 加载统计数据
 async function loadBookCount() {
-  const res = await bookApi.getBookReadCount(bookId.value)
-  if (res.code === 0) {
-    readCount.value = res.readCount || 0
-    listenCount.value = res.listenCount || 0
-    buyCount.value = res.buyCount || 0
+  try {
+    const res = await bookApi.getBookReadCount(bookId.value)
+    if (res.code === 0) {
+      readCount.value = res.readCount || 0
+      listenCount.value = res.listenCount || 0
+      buyCount.value = res.buyCount || 0
+    }
+  } catch (error) {
+    console.error('Failed to load book count:', error)
  }
 }

 // 加载评论
 async function loadComments() {
-  const res = await bookApi.getBookComments(bookId.value, 1, 10)
-  if (res.commentsTree && res.commentsTree.length > 0) {
-    commentList.value = res.commentsTree
-  } else {
+  try {
+    const res = await bookApi.getBookComments(bookId.value, 1, 10)
+    if (res.commentsTree && res.commentsTree.length > 0) {
+      commentList.value = res.commentsTree
+    } else {
+      nullText.value = t('common.data_null')
+    }
+  } catch (error) {
    nullText.value = t('common.data_null')
+    console.error('Failed to load comments:', error)
  }
 }

 // 加载推荐书籍
 async function loadRecommendBooks() {
-  const res = await bookApi.getRecommendBook(bookId.value)
-  if (res.bookList && res.bookList.length > 0) {
-    relatedBooks.value = res.bookList
-  } else {
+  try {
+    const res = await bookApi.getRecommendBook(bookId.value)
+    if (res.bookList && res.bookList.length > 0) {
+      relatedBooks.value = res.bookList
+    } else {
+      nullBookText.value = t('common.data_null')
+    }
+  } catch (error) {
    nullBookText.value = t('common.data_null')
+    console.error('Failed to load recommend books:', error)
  }
 }

--- a/pages/book/index.vue
+++ b/pages/book/index.vue
@@ -162,7 +162,7 @@
          >
            <image :src="item.images" />
            <text class="book-text">{{ item.name }}</text>
-            <text class="book-price">{{ item.minPrice }} {{ t('global.coin') }}</text>
+            <text class="book-price">{{ item.minPrice }} 天医币</text>
            <text v-if="formatStats(item)" class="book-flag">{{
              formatStats(item)
            }}</text>
@@ -219,9 +219,13 @@ const vipInfo = ref<IVipInfo | null>(null)
 * 获取VIP信息
 */
 const getVipInfo = async () => {
-  const res = await homeApi.getVipInfo()
-  if (res.vipInfo) {
-    vipInfo.value = res.vipInfo
+  try {
+    const res = await homeApi.getVipInfo()
+    if (res.vipInfo) {
+      vipInfo.value = res.vipInfo
+    }
+  } catch (error) {
+    console.error('获取VIP信息失败:', error)
  }
 }

@@ -229,17 +233,21 @@ const getVipInfo = async () => {
 * 获取我的书单
 */
 const getMyBooks = async () => {
-  const res = await homeApi.getMyBooks(1, 10)
-  if (res && res.code === 0) {
-    showMyBooks.value = true
-    if (res.page.records && res.page.records.length > 0) {
-      myBooksList.value = res.page.records
+  try {
+    const res = await homeApi.getMyBooks(1, 10)
+    if (res && res.code === 0) {
+      showMyBooks.value = true
+      if (res.page.records && res.page.records.length > 0) {
+        myBooksList.value = res.page.records
+      }
+    } else {
+      // 未登录，跳转到登录页
+      uni.navigateTo({
+        url: '/pages/login/login'
+      })
    }
-  } else {
-    // 未登录，跳转到登录页
-    uni.navigateTo({
-      url: '/pages/login/login'
-    })
+  } catch (error) {
+    console.error('获取我的书单失败:', error)
  }
 }

@@ -247,9 +255,13 @@ const getMyBooks = async () => {
 * 获取推荐图书
 */
 const getRecommendBooks = async () => {
-  const res = await homeApi.getRecommendBooks()
-  if (res.books && res.books.length > 0) {
-    recommendBooksList.value = res.books
+  try {
+    const res = await homeApi.getRecommendBooks()
+    if (res.books && res.books.length > 0) {
+      recommendBooksList.value = res.books
+    }
+  } catch (error) {
+    console.error('获取推荐图书失败:', error)
  }
 }

@@ -257,12 +269,16 @@ const getRecommendBooks = async () => {
 * 获取活动标签列表
 */
 const getActivityLabels = async () => {
-  const res = await homeApi.getBookLabelList(1)
-  showActivity.value = true
-  if (res.lableList && res.lableList.length > 0) {
-    activityLabelList.value = res.lableList
-    // 默认加载第一个标签的图书列表
-    await getBooksByLabel(res.lableList[0].id, 'activity')
+  try {
+    const res = await homeApi.getBookLabelList(1)
+    showActivity.value = true
+    if (res.lableList && res.lableList.length > 0) {
+      activityLabelList.value = res.lableList
+      // 默认加载第一个标签的图书列表
+      await getBooksByLabel(res.lableList[0].id, 'activity')
+    }
+  } catch (error) {
+    console.error('获取活动标签失败:', error)
  }
 }

@@ -270,12 +286,16 @@ const getActivityLabels = async () => {
 * 获取分类标签列表
 */
 const getCategoryLabels = async () => {
-  const res = await homeApi.getBookLabelList(0)
-  showCategory.value = true
-  if (res.lableList && res.lableList.length > 0) {
-    categoryLevel1List.value = res.lableList
-    // 默认加载第一个标签的二级标签
-    await getSubLabels(res.lableList[0].id, 0)
+  try {
+    const res = await homeApi.getBookLabelList(0)
+    showCategory.value = true
+    if (res.lableList && res.lableList.length > 0) {
+      categoryLevel1List.value = res.lableList
+      // 默认加载第一个标签的二级标签
+      await getSubLabels(res.lableList[0].id, 0)
+    }
+  } catch (error) {
+    console.error('获取分类标签失败:', error)
  }
 }

@@ -283,17 +303,21 @@ const getCategoryLabels = async () => {
 * 获取二级标签列表
 */
 const getSubLabels = async (pid: number, index: number) => {
-  const res = await homeApi.getSubLabelList(pid)
-  currentLevel1Index.value = index
-  if (res.lableList && res.lableList.length > 0) {
-    categoryLevel2List.value = res.lableList
-    currentLevel2Index.value = 0
-    // 加载第一个二级标签的图书列表
-    await getBooksByLabel(res.lableList[0].id, 'category')
-  } else {
-    // 没有二级标签，直接加载一级标签的图书列表
-    categoryLevel2List.value = []
-    await getBooksByLabel(pid, 'category')
+  try {
+    const res = await homeApi.getSubLabelList(pid)
+    currentLevel1Index.value = index
+    if (res.lableList && res.lableList.length > 0) {
+      categoryLevel2List.value = res.lableList
+      currentLevel2Index.value = 0
+      // 加载第一个二级标签的图书列表
+      await getBooksByLabel(res.lableList[0].id, 'category')
+    } else {
+      // 没有二级标签，直接加载一级标签的图书列表
+      categoryLevel2List.value = []
+      await getBooksByLabel(pid, 'category')
+    }
+  } catch (error) {
+    console.error('获取二级标签失败:', error)
  }
 }

@@ -304,19 +328,23 @@ const getBooksByLabel = async (
  labelId: number,
  type: 'activity' | 'category'
 ) => {
-  const res = await homeApi.getBooksByLabel(labelId)
-  if (type === 'activity') {
-    if (res.bookList && res.bookList.length > 0) {
-      activityList.value = res.bookList
+  try {
+    const res = await homeApi.getBooksByLabel(labelId)
+    if (type === 'activity') {
+      if (res.bookList && res.bookList.length > 0) {
+        activityList.value = res.bookList
+      } else {
+        activityList.value = []
+      }
    } else {
-      activityList.value = []
-    }
-  } else {
-    if (res.bookList && res.bookList.length > 0) {
-      categoryBookList.value = res.bookList
-    } else {
-      categoryBookList.value = []
+      if (res.bookList && res.bookList.length > 0) {
+        categoryBookList.value = res.bookList
+      } else {
+        categoryBookList.value = []
+      }
    }
+  } catch (error) {
+    console.error('获取图书列表失败:', error)
  }
 }

--- a/pages/book/listen/index.vue
+++ b/pages/book/listen/index.vue
@@ -117,20 +117,31 @@ function initScrollHeight() {

 // 加载书籍信息
 async function loadBookInfo() {
-  const res = await bookApi.getBookInfo(bookId.value)
-  bookInfo.value = res.bookInfo
+  try {
+    const res = await bookApi.getBookInfo(bookId.value)
+    if (res.bookInfo) {
+      bookInfo.value = res.bookInfo
+    }
+  } catch (error) {
+    console.error('Failed to load book info:', error)
+  }
 }

 // 加载章节列表
 async function loadChapterList() {
-  const res = await bookApi.getBookChapter({
-    bookId: bookId.value
-  })
-  
-  if (res.chapterList && res.chapterList.length > 0) {
-    chapterList.value = res.chapterList
-  } else {
+  try {
+    const res = await bookApi.getBookChapter({
+      bookId: bookId.value
+    })
+    
+    if (res.chapterList && res.chapterList.length > 0) {
+      chapterList.value = res.chapterList
+    } else {
+      nullText.value = t('common.data_null')
+    }
+  } catch (error) {
    nullText.value = t('common.data_null')
+    console.error('Failed to load chapter list:', error)
  }
 }

--- a/pages/book/listen/player.vue
+++ b/pages/book/listen/player.vue
@@ -245,8 +245,14 @@ function initAudioContext() {

 // 加载书籍信息
 async function loadBookInfo() {
-  const res = await bookApi.getBookInfo(bookId.value)
-  bookInfo.value = res.bookInfo
+  try {
+    const res = await bookApi.getBookInfo(bookId.value)
+    if (res.bookInfo) {
+      bookInfo.value = res.bookInfo
+    }
+  } catch (error) {
+    console.error('Failed to load book info:', error)
+  }
 }

 // 加载章节列表
--- a/pages/book/review.vue
+++ b/pages/book/review.vue
@@ -164,9 +164,13 @@ function initScrollHeight() {

 // 加载书籍信息
 async function loadBookInfo() {
-  const res = await bookApi.getBookInfo(bookId.value)
-  if (res.bookInfo) {
-    bookInfo.value = res.bookInfo
+  try {
+    const res = await bookApi.getBookInfo(bookId.value)
+    if (res.bookInfo) {
+      bookInfo.value = res.bookInfo
+    }
+  } catch (error) {
+    console.error('Failed to load book info:', error)
  }
 }

@@ -176,15 +180,20 @@ async function loadComments() {
    return
  }
  
-  const res = await bookApi.getBookComments(bookId.value, page.value.current, page.value.limit)
+  try {
+    const res = await bookApi.getBookComments(bookId.value, page.value.current, page.value.limit)
    
-  commentsCount.value = res.commentsCount || 0
-  
-  if (res.commentsTree && res.commentsTree.length > 0) {
-    commentList.value = [...commentList.value, ...res.commentsTree]
-    page.value.current += 1
-  } else if (commentList.value.length === 0) {
+    commentsCount.value = res.commentsCount || 0
+    
+    if (res.commentsTree && res.commentsTree.length > 0) {
+      commentList.value = [...commentList.value, ...res.commentsTree]
+      page.value.current += 1
+    } else if (commentList.value.length === 0) {
+      nullText.value = t('common.data_null')
+    }
+  } catch (error) {
    nullText.value = t('common.data_null')
+    console.error('Failed to load comments:', error)
  }
 }

@@ -266,29 +275,33 @@ function handleEmj(i: any) {

 // 提交评论
 async function submitComment() {
-  const content = await getEditorContent()
+  try {
+    const content = await getEditorContent()
+    
+    if (!content || content === '<p><br></p>') {
+      uni.showToast({
+        title: t('bookDetails.enterText'),
+        icon: 'none'
+      })
+      return
+    }
+    
+    const pid = replyTarget.value?.id || 0
+    await bookApi.insertComment(bookId.value, content, pid)
    
-  if (!content || content === '<p><br></p>') {
    uni.showToast({
-      title: t('bookDetails.enterText'),
-      icon: 'none'
+      title: t('workOrder.submit_success'),
+      icon: 'success',
+      duration: 500
    })
-    return
+    
+    setTimeout(() => {
+      editorCtx.value?.clear()
+      resetComments()
+    }, 500)
+  } catch (error) {
+    console.error('Failed to submit comment:', error)
  }
-  
-  const pid = replyTarget.value?.id || 0
-  await bookApi.insertComment(bookId.value, content, pid)
-  
-  uni.showToast({
-    title: t('workOrder.submit_success'),
-    icon: 'success',
-    duration: 500
-  })
-  
-  setTimeout(() => {
-    editorCtx.value?.clear()
-    resetComments()
-  }, 500)
 }

 // 点赞/取消点赞
@@ -301,25 +314,29 @@ async function handleLike(comment: IComment) {
    return
  }
  
-  if (comment.isLike === 0) {
-    await bookApi.likeComment(comment.id)
-    uni.showToast({
-      title: t('bookDetails.supportSuccess'),
-      icon: 'success',
-      duration: 1000
-    })
-  } else {
-    await bookApi.unlikeComment(comment.id)
-    uni.showToast({
-      title: t('bookDetails.supportCancel'),
-      icon: 'success',
-      duration: 1000
-    })
+  try {
+    if (comment.isLike === 0) {
+      await bookApi.likeComment(comment.id)
+      uni.showToast({
+        title: t('bookDetails.supportSuccess'),
+        icon: 'success',
+        duration: 1000
+      })
+    } else {
+      await bookApi.unlikeComment(comment.id)
+      uni.showToast({
+        title: t('bookDetails.supportCancel'),
+        icon: 'success',
+        duration: 1000
+      })
+    }
+    
+    setTimeout(() => {
+      resetComments()
+    }, 200)
+  } catch (error) {
+    console.error('Failed to like comment:', error)
  }
-  
-  setTimeout(() => {
-    resetComments()
-  }, 200)
 }

 // 删除评论
@@ -331,16 +348,20 @@ function handleDelete(comment: IComment) {
    confirmText: t('common.confirm_text'),
    success: async (res) => {
      if (res.confirm) {
-        await bookApi.deleteComment(comment.id)
-        uni.showToast({
-          title: t('bookDetails.deleteSuccess'),
-          icon: 'success',
-          duration: 500
-        })
-        
-        setTimeout(() => {
-          resetComments()
-        }, 500)
+        try {
+          await bookApi.deleteComment(comment.id)
+          uni.showToast({
+            title: t('bookDetails.deleteSuccess'),
+            icon: 'success',
+            duration: 500
+          })
+          
+          setTimeout(() => {
+            resetComments()
+          }, 500)
+        } catch (error) {
+          console.error('Failed to delete comment:', error)
+        }
      }
    }
  })
--- a/pages/book/search.vue
+++ b/pages/book/search.vue
@@ -70,8 +70,14 @@ onLoad((options: any) => {
 * 获取VIP信息
 */
 const getVipInfo = async () => {
-  const res = await homeApi.getVipInfo()
-  vipInfo.value = res.vipInfo
+  try {
+    const res = await homeApi.getVipInfo()
+    if (res.vipInfo) {
+      vipInfo.value = res.vipInfo
+    }
+  } catch (error) {
+    console.error('获取VIP信息失败:', error)
+  }
 }

 /**
@@ -85,19 +91,26 @@ const handleSearch = async () => {
  loading.value = true
  isEmpty.value = false

-  const res = await homeApi.searchBooks({
-    title: keyword.value.trim(),
-    page: 1,
-    limit: 10,
-  })
-  if (res.bookList && res.bookList.length > 0) {
-    searchResults.value = res.bookList
-    isEmpty.value = false
-  } else {
+  try {
+    const res = await homeApi.searchBooks({
+      title: keyword.value.trim(),
+      page: 1,
+      limit: 10,
+    })
+    if (res.bookList && res.bookList.length > 0) {
+      searchResults.value = res.bookList
+      isEmpty.value = false
+    } else {
+      searchResults.value = []
+      isEmpty.value = true
+    }
+  } catch (error) {
+    console.error('搜索失败:', error)
    searchResults.value = []
    isEmpty.value = true
+  } finally {
+    loading.value = false
  }
-  loading.value = false
 }

 /**
--- a/pages/course/details/chapter.vue
+++ b/pages/course/details/chapter.vue
@@ -164,19 +164,23 @@ onLoad((options: any) => {
 * 加载章节详情
 */
 const loadChapterDetail = async () => {
-  const res = await courseApi.getChapterDetail(chapterId.value)
-  if (res.code === 0 && res.data) {
-    chapterDetail.value = res.data.detail
-    videoList.value = res.data.videos || []
+  try {    
+    const res = await courseApi.getChapterDetail(chapterId.value)
+    if (res.code === 0 && res.data) {
+      chapterDetail.value = res.data.detail
+      videoList.value = res.data.videos || []

-    // 如果有历史播放记录，定位到对应视频
-    if (res.data.current) {
-      const index = videoList.value.findIndex(v => v.id === res.data.current)
-      if (index !== -1) {
-        currentVideoIndex.value = index
-        activeVideoIndex.value = index
+      // 如果有历史播放记录，定位到对应视频
+      if (res.data.current) {
+        const index = videoList.value.findIndex(v => v.id === res.data.current)
+        if (index !== -1) {
+          currentVideoIndex.value = index
+          activeVideoIndex.value = index
+        }
      }
    }
+  } catch (error) {
+    console.error('加载章节详情失败:', error)
  }
 }

--- a/pages/course/details/course.vue
+++ b/pages/course/details/course.vue
@@ -259,47 +259,60 @@ onLoad(async (options: any) => {
 * 加载页面数据
 */
 const loadPageData = async () => {
-  // 获取课程详情
-  const res = await courseApi.getCourseDetail(courseId.value)
-  if (res.code === 0 && res.data) {
-    courseDetail.value = res.data.course
-    catalogueList.value = res.data.catalogues || []
-    relatedBooks.value = res.data.shopProductList || []
+  try {
+    uni.showLoading({ title: '加载中...' })
    
-    // 计算学习进度
-    if (catalogueList.value.length > 0) {
-      const totalProgress = catalogueList.value.reduce((sum, cat) => sum + cat.completion, 0)
-      learningProgress.value = Number((totalProgress / catalogueList.value.length).toFixed(2))
+    // 获取课程详情
+    const res = await courseApi.getCourseDetail(courseId.value)
+    if (res.code === 0 && res.data) {
+      courseDetail.value = res.data.course
+      catalogueList.value = res.data.catalogues || []
+      relatedBooks.value = res.data.shopProductList || []
+      
+      // 计算学习进度
+      if (catalogueList.value.length > 0) {
+        const totalProgress = catalogueList.value.reduce((sum, cat) => sum + cat.completion, 0)
+        learningProgress.value = Number((totalProgress / catalogueList.value.length).toFixed(2))
+      }
+      
+      // 默认选择第一个目录
+      if (catalogueList.value.length > 0) {
+        await switchCatalogue(0)
+      }
    }
    
-    // 默认选择第一个目录
-    if (catalogueList.value.length > 0) {
-      await switchCatalogue(0)
-    }
+    // 检查VIP权益
+    await checkVipStatus()
+    
+    // 加载评论
+    await loadComments()
+    
+  } catch (error) {
+    console.error('加载页面数据失败:', error)
+  } finally {
+    uni.hideLoading()
  }
-  
-  // 检查VIP权益
-  await checkVipStatus()
-  
-  // 加载评论
-  await loadComments()
 }

 /**
 * 检查VIP状态
 */
 const checkVipStatus = async () => {
-  const res = await courseApi.checkCourseVip(courseId.value)
-  if (res.code === 0) {
-    userVip.value = res.userVip || null
-    
-    // 如果不是VIP，获取需要的VIP类型
-    if (!userVip.value) {
-      const moduleRes = await courseApi.getCourseVipModule(courseId.value)
-      if (moduleRes.code === 0) {
-        vipModuleList.value = moduleRes.list || []
+  try {
+    const res = await courseApi.checkCourseVip(courseId.value)
+    if (res.code === 0) {
+      userVip.value = res.userVip || null
+      
+      // 如果不是VIP，获取需要的VIP类型
+      if (!userVip.value) {
+        const moduleRes = await courseApi.getCourseVipModule(courseId.value)
+        if (moduleRes.code === 0) {
+          vipModuleList.value = moduleRes.list || []
+        }
      }
    }
+  } catch (error) {
+    console.error('检查VIP状态失败:', error)
  }
 }

@@ -311,17 +324,21 @@ const switchCatalogue = async (index: number) => {
  const catalogue = catalogueList.value[index]
  
  // 获取章节列表
-  const res = await courseApi.getCatalogueChapterList(catalogue.id)
-  if (res.code === 0) {
-    chapterList.value = res.chapterList || []
-  }
-  
-  // 检查是否支持复读
-  if (catalogue.isBuy === 0 && !userVip.value) {
-    const renewRes = await courseApi.checkRenewPayment(catalogue.id)
-    showRenewBtn.value = renewRes.canRelearn || false
-  } else {
-    showRenewBtn.value = false
+  try {
+    const res = await courseApi.getCatalogueChapterList(catalogue.id)
+    if (res.code === 0) {
+      chapterList.value = res.chapterList || []
+    }
+    
+    // 检查是否支持复读
+    if (catalogue.isBuy === 0 && !userVip.value) {
+      const renewRes = await courseApi.checkRenewPayment(catalogue.id)
+      showRenewBtn.value = renewRes.canRelearn || false
+    } else {
+      showRenewBtn.value = false
+    }
+  } catch (error) {
+    console.error('切换目录失败:', error)
  }
 }

@@ -349,12 +366,18 @@ const handleChapterClick = (chapter: IChapter) => {
 const handleGetFreeCourse = async () => {
  if (!currentCatalogue.value) return
  
-  uni.showLoading({ title: '领取中...' })
-  const res = await courseApi.startStudyForMF(currentCatalogue.value.id)
-  if (res.code === 0) {
-    uni.showToast({ title: '领取成功', icon: 'success' })
-    // 刷新页面数据
-    await loadPageData()
+  try {
+    uni.showLoading({ title: '领取中...' })
+    const res = await courseApi.startStudyForMF(currentCatalogue.value.id)
+    if (res.code === 0) {
+      uni.showToast({ title: '领取成功', icon: 'success' })
+      // 刷新页面数据
+      await loadPageData()
+    }
+  } catch (error) {
+    console.error('领取免费课程失败:', error)
+  } finally {
+    uni.hideLoading()
  }
 }

@@ -364,13 +387,17 @@ const handleGetFreeCourse = async () => {
 const handlePurchase = async () => {
  if (!currentCatalogue.value) return
  
-  isFudu.value = false
-  const res = await courseApi.getProductListForCourse(currentCatalogue.value.id)
-  if (res.code === 0 && res.productList.length > 0) {
-    goodsList.value = res.productList
-    showGoodsSelector.value = true
-  } else {
-    uni.showToast({ title: '此课程暂无购买方式', icon: 'none' })
+  try {
+    isFudu.value = false
+    const res = await courseApi.getProductListForCourse(currentCatalogue.value.id)
+    if (res.code === 0 && res.productList.length > 0) {
+      goodsList.value = res.productList
+      showGoodsSelector.value = true
+    } else {
+      uni.showToast({ title: '此课程暂无购买方式', icon: 'none' })
+    }
+  } catch (error) {
+    console.error('获取商品列表失败:', error)
  }
 }

@@ -380,14 +407,18 @@ const handlePurchase = async () => {
 const handleRenew = async () => {
  if (!currentCatalogue.value) return
  
-  isFudu.value = true
-  fuduCatalogueId.value = currentCatalogue.value.id
-  const res = await courseApi.getRenewProductList(currentCatalogue.value.id)
-  if (res.code === 0 && res.productList.length > 0) {
-    goodsList.value = res.productList
-    showGoodsSelector.value = true
-  } else {
-    uni.showToast({ title: '暂无复读方案', icon: 'none' })
+  try {
+    isFudu.value = true
+    fuduCatalogueId.value = currentCatalogue.value.id
+    const res = await courseApi.getRenewProductList(currentCatalogue.value.id)
+    if (res.code === 0 && res.productList.length > 0) {
+      goodsList.value = res.productList
+      showGoodsSelector.value = true
+    } else {
+      uni.showToast({ title: '暂无复读方案', icon: 'none' })
+    }
+  } catch (error) {
+    console.error('获取复读商品列表失败:', error)
  }
 }

--- a/pages/course/index.vue
+++ b/pages/course/index.vue
@@ -257,25 +257,29 @@ const handleFirstLevelClick = (item: string) => {
 * 获取课程分类数据
 */
 const getMedicalTags = async () => {
-  const res = await courseSubjectClassificationApi.getCourseMedicalTree()
-  if (res && res.code === 0) {
-    if (res.labels && res.labels.length > 0) {
-      curseTagList.value = res.labels
-      // 根据 currentIndex 设置初始选中的分类
-      if (res.labels[currentIndex.value]) {
-        const selectedTag = res.labels[currentIndex.value]
-        if (selectedTag.isLast === 0) {
-          // 非终极分类，显示子分类
-          if (selectedTag.children && selectedTag.children.length > 0) {
-            sbuMedicalTagsList.value = selectedTag.children
-          } else {
-            sbuMedicalTagsList.value = []
+  try {
+    const res = await courseSubjectClassificationApi.getCourseMedicalTree()
+    if (res && res.code === 0) {
+      if (res.labels && res.labels.length > 0) {
+        curseTagList.value = res.labels
+        // 根据 currentIndex 设置初始选中的分类
+        if (res.labels[currentIndex.value]) {
+          const selectedTag = res.labels[currentIndex.value]
+          if (selectedTag.isLast === 0) {
+            // 非终极分类，显示子分类
+            if (selectedTag.children && selectedTag.children.length > 0) {
+              sbuMedicalTagsList.value = selectedTag.children
+            } else {
+              sbuMedicalTagsList.value = []
+            }
          }
        }
+      } else {
+        curseTagList.value = []
      }
-    } else {
-      curseTagList.value = []
    }
+  } catch (error) {
+    console.error('获取医学课程分类失败:', error)
  }
 }
 /**
@@ -305,9 +309,13 @@ const curseClick = (item: IMedicalTag, index: number) => {
 */
 const soulCateList = ref<IMedicalTag[]>([])
 const getSoulCateList = async () => {
-  const res = await courseSubjectClassificationApi.getCourseSoulTree()
-  if (res.labels&&res.labels.length>0) {
-    soulCateList.value = res.labels;
+  try {
+    const res = await courseSubjectClassificationApi.getCourseSoulTree()
+    if (res.labels&&res.labels.length>0) {
+			soulCateList.value = res.labels;
+		}
+  } catch (error) {
+    console.error('获取心理学课程分类失败:', error)
  }
 }

@@ -317,9 +325,13 @@ const getSoulCateList = async () => {
 */
 const sociologyCateList = ref<IMedicalTag[]>([])
 const getSociologyCateList = async () => {
-  const res = await courseSubjectClassificationApi.getCourseSociologyTree()
-  if (res.labels&&res.labels.length>0) {
-    sociologyCateList.value = res.labels;
+  try {
+    const res = await courseSubjectClassificationApi.getCourseSociologyTree()
+    if (res.labels&&res.labels.length>0) {
+			sociologyCateList.value = res.labels;
+		}
+  } catch (error) {
+    console.error('获取国学课程分类失败:', error)
  }
 }

@@ -357,13 +369,17 @@ const learnList = ref<ICourse[]>([]) // 观看记录列表
 * 获取观看记录
 */
 const getLearnCourse = async () => {
-  const res = await courseApi.getUserLateCourseList()
-  if (res && res.code === 0) {
-    if (res.page && res.page.length > 0) {
-      learnList.value = res.page
-    } else {
-      learnList.value = []
+  try {
+    const res = await courseApi.getUserLateCourseList()
+    if (res && res.code === 0) {
+      if (res.page && res.page.length > 0) {
+        learnList.value = res.page
+      } else {
+        learnList.value = []
+      }
    }
+  } catch (error) {
+    console.error('获取观看记录失败:', error)
  }
 }

@@ -373,13 +389,17 @@ const newsList = ref<INews[]>([]) // 新闻列表
 * 获取新闻列表
 */
 const getNewsList = async () => {
-  const res = await commonApi.getMessageList(0, 1, 0)
-  if (res && res.code === 0) {
-    if (res.messages && res.messages.length > 0) {
-      newsList.value = res.messages
-    } else {
-      newsList.value = []
+  try {
+    const res = await commonApi.getMessageList(0, 1, 0)
+    if (res && res.code === 0) {
+      if (res.messages && res.messages.length > 0) {
+        newsList.value = res.messages
+      } else {
+        newsList.value = []
+      }
    }
+  } catch (error) {
+    console.error('获取新闻列表失败:', error)
  }
 }
 /**
@@ -403,17 +423,21 @@ const tryListenList = ref<ICourse[]>([]) // 试听课程列表
 * 获取试听课程列表
 */
 const getTryListenList = async () => {
-  const res = await courseApi.getMarketCourseList({
-    page: 1,
-    limit: 6,
-    id: 1
-  })
-  if (res && res.code === 0) {
-    if (res.courseList && res.courseList.records && res.courseList.records.length > 0) {
-      tryListenList.value = res.courseList.records
-    } else {
-      tryListenList.value = []
+  try {
+    const res = await courseApi.getMarketCourseList({
+      page: 1,
+      limit: 6,
+      id: 1
+    })
+    if (res && res.code === 0) {
+      if (res.courseList && res.courseList.records && res.courseList.records.length > 0) {
+        tryListenList.value = res.courseList.records
+      } else {
+        tryListenList.value = []
+      }
    }
+  } catch (error) {
+    console.error('获取试听课程失败:', error)
  }
 }

--- a/pages/course/list/category.vue
+++ b/pages/course/list/category.vue
@@ -52,26 +52,30 @@ const subCategoryList = ref<ICategory[]>([]) // 子级分类列表
 * 获取分类下的子级分类
 */
 const getSubCategoryList = async () => {
-  let res: any = null
-  switch (subject.value) {
-    case '医学':
-      res = await courseSubjectClassificationApi.getCourseMedicalChildLabels(categoryId.value)
-      break
-    case '心理学':
-      res = await courseSubjectClassificationApi.getCourseSoulChildLabels(categoryId.value)
-      break
-  }
-  if (res && res.code === 0) {
-    if (res.labels && res.labels.length > 0) {
-      subCategoryList.value = res.labels
-      // 默认选中第一个tab
-      tab_category_id.value = res.labels[0].id
-      radio_category_id.value = res.labels[0].children[0] && res.labels[0].children[0].id || 0
-    } else {
-      subCategoryList.value = []
-      tab_category_id.value = 0
-      radio_category_id.value = 0
+  try {
+    let res: any = null
+    switch (subject.value) {
+      case '医学':
+        res = await courseSubjectClassificationApi.getCourseMedicalChildLabels(categoryId.value)
+        break
+      case '心理学':
+        res = await courseSubjectClassificationApi.getCourseSoulChildLabels(categoryId.value)
+        break
    }
+    if (res && res.code === 0) {
+      if (res.labels && res.labels.length > 0) {
+        subCategoryList.value = res.labels
+        // 默认选中第一个tab
+        tab_category_id.value = res.labels[0].id
+        radio_category_id.value = res.labels[0].children[0] && res.labels[0].children[0].id || 0
+      } else {
+        subCategoryList.value = []
+        tab_category_id.value = 0
+        radio_category_id.value = 0
+      }
+    }
+  } catch (error) {
+    console.error('获取分类下的子级分类失败:', error)
  }
 }

--- a/pages/login/forget.vue
+++ b/pages/login/forget.vue
@@ -191,12 +191,16 @@ const getCode = async () => {
  if (!isEmailEmpty()) return
  if (!isEmailVerified(email.value)) return

-  await commonApi.sendMailCaptcha(email.value)
-  uni.showToast({
-    title: t('login.sendCodeSuccess'),
-    icon: 'none'
-  })
-  getCodeState()
+  try {
+    await commonApi.sendMailCaptcha(email.value)
+    uni.showToast({
+      title: t('login.sendCodeSuccess'),
+      icon: 'none'
+    })
+    getCodeState()
+  } catch (error) {
+    console.error('Send code error:', error)
+  }
 }

 /**
@@ -260,16 +264,20 @@ const onSubmit = async () => {
  if (!isConfirmPasswordEmpty()) return
  if (!isPasswordMatch()) return

-  await resetPassword(email.value, code.value, password.value)
+  try {
+    await resetPassword(email.value, code.value, password.value)
    
-  uni.showModal({
-    title: t('global.tips'),
-    content: t('forget.passwordChanged'),
-    showCancel: false,
-    success: () => {
-      uni.navigateBack()
-    }
-  })
+    uni.showModal({
+      title: t('global.tips'),
+      content: t('forget.passwordChanged'),
+      showCancel: false,
+      success: () => {
+        uni.navigateBack()
+      }
+    })
+  } catch (error) {
+    console.error('Reset password error:', error)
+  }
 }
 </script>

--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -285,8 +285,13 @@ const verifyCodeLogin = async () => {
 	
 	if (!isCodeEmpty()) return false
 	
-	const res = await loginWithCode(email.value, code.value)
-  return res || null
+	try {
+		const res = await loginWithCode(email.value, code.value)
+		return res
+	} catch (error) {
+		console.error('验证码登录失败:', error)
+		return null
+	}
 }
 // 密码登录
 const passwordLogin = async () => {
@@ -296,8 +301,13 @@ const passwordLogin = async () => {
 	
 	if (!isPasswordEmpty()) return false
 	
-	const res = await loginWithPassword(phoneEmail.value, password.value)
-  return res || null
+	try {
+		const res = await loginWithPassword(phoneEmail.value, password.value)
+		return res
+	} catch (error) {
+		console.error('密码登录失败:', error)
+		return null
+	}
 }
 // 提交登录
 const onSubmit = async () => {
--- a/pages/order/goodsConfirm.vue
+++ b/pages/order/goodsConfirm.vue
@@ -26,8 +26,28 @@
          <!-- 商品信息 -->
          <view class="goods-info">
            <text class="goods-name">{{ item.productName }}</text>
-            <!-- 商品价格组件 -->
-            <GoodsPrice :goods="item" />
+            
+            <!-- 价格信息 -->
+            <view class="price-info">
+              <!-- VIP优惠价 -->
+              <!-- <view v-if="item.isVipPrice === 1 && item.vipPrice" class="price-row">
+                <text class="vip-price">￥{{ item.vipPrice.toFixed(2) }}</text>
+                <text class="vip-label">{{ $t('order.vipPriceLabel') }}</text>
+                <text class="original-price">￥{{ item.price.toFixed(2) }}</text>
+              </view> -->
+              
+              <!-- 活动价 -->
+              <!-- <view v-else-if="item.activityPrice && item.activityPrice > 0" class="price-row">
+                <text class="activity-price">￥{{ item.activityPrice.toFixed(2) }}</text>
+                <text class="activity-label">{{ $t('order.activityLabel') }}</text>
+                <text class="original-price">￥{{ item.price.toFixed(2) }}</text>
+              </view> -->
+              
+              <!-- 普通价格 -->
+              <view class="price-row">
+                <text class="normal-price">{{ item.price.toFixed(2) }} 天医币</text>
+              </view>
+            </view>
            
            <!-- 数量 -->
            <!-- <view class="quantity-row">
@@ -49,20 +69,25 @@
 </template>

 <script lang="ts" setup>
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import { orderApi } from '@/api/modules/order'
-import type { IOrderGoods } from '@/types/order'
 import Confirm from '@/components/order/Confirm.vue';
-import GoodsPrice from '@/components/order/GoodsPrice.vue';
+import type { IOrderGoods } from '@/types/order'

 /**
 * 获取用户信息
 */
-const userInfo = ref({})
+const userInfo = ref(null)
 const getUserInfo = async () => {
-  const res = await orderApi.getUserInfo()
-  userInfo.value = res.result || {}
+  try {
+    const res = await orderApi.getUserInfo()
+    if (res.code === 0) {
+      userInfo.value = res.result || {}
+    }
+  } catch (error) {
+    console.error('获取用户信息失败:', error)
+  }
 }

 /**
@@ -71,11 +96,15 @@ const getUserInfo = async () => {
 const goodsIds = ref<string>('')
 const goodsList = ref<IOrderGoods[]>([])
 const getGoodsList = async () => {
-  // 获取商品详情
-  const res = await orderApi.getShopProductListByIds(goodsIds.value)
-  
-  if (res.shopProductList?.length > 0) {
-    goodsList.value = res.shopProductList
+  try {
+    // 获取商品详情
+    const res = await orderApi.getShopProductListByIds(goodsIds.value)
+    
+    if (res.code === 0 && res.shopProductList?.length > 0) {
+      goodsList.value = res.shopProductList
+    }
+  } catch (error) {
+    console.error('获取商品列表失败:', error)
  }
 }

@@ -152,6 +181,43 @@ onLoad(async (options: any) => {
      overflow: hidden;
    }
    
+    .price-info {
+      .price-row {
+        display: flex;
+        align-items: baseline;
+        gap: 10rpx;
+        
+        .vip-price,
+        .activity-price {
+          font-size: 32rpx;
+          font-weight: bold;
+          color: #e97512;
+        }
+        
+        .normal-price {
+          font-size: 32rpx;
+          font-weight: bold;
+          color: #333;
+        }
+        
+        .vip-label {
+          font-size: 22rpx;
+          color: #fa2d12;
+        }
+        
+        .activity-label {
+          font-size: 22rpx;
+          color: #613804;
+        }
+        
+        .original-price {
+          font-size: 24rpx;
+          color: #999;
+          text-decoration: line-through;
+        }
+      }
+    }
+    
    .quantity-row {
      display: flex;
      align-items: center;
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -44,7 +44,7 @@
 			<view class="vip-card wallet_l">
 				<view class="assets">
 					<view @click="goVirtualList">
-						<view class="assets_row">{{ t('global.coin') }}</view>
+						<view class="assets_row">天医币</view>
 						<view>{{userInfo.peanutCoin ?? 1}}</view>
 					</view>
 					<view @click="goPointsList">
@@ -157,12 +157,15 @@
 				userStore.setUserInfo(userRes.result)
 			}

-		// 获取VIP信息
-		const vipRes = await getVipInfo()
-		if (vipRes.vipInfo) {
-			vipInfo.value = vipRes.vipInfo
+			// 获取VIP信息
+			const vipRes = await getVipInfo()
+			if (vipRes.vipInfo) {
+				vipInfo.value = vipRes.vipInfo
+			}
+		} catch (error) {
+			console.error('获取数据失败:', error)
 		}
-	}}
+	}

 	/**
 	 * 跳转到设置页面
--- a/pages/user/order/index.vue
+++ b/pages/user/order/index.vue
@@ -27,7 +27,7 @@
        <ProductInfo v-if="order.orderType === 'abroadBook'" :data="order.bookEntity" :type="order.orderType" />
        <ProductInfo v-if="order.orderType === 'vip'" :data="order.vipBuyConfigEntity" :type="order.orderType" />
        <!-- 三种订单类型商品信息 end -->
-        <view class="order-item-total-price">实付款：{{ order.orderMoney }} {{ t('global.coin') }}</view>
+        <view class="order-item-total-price">实付款：{{ order.orderMoney }} 天医币</view>

        <template #footer>
          <view>
--- a/pages/user/profile/index.vue
+++ b/pages/user/profile/index.vue
@@ -199,10 +199,14 @@ const avatarUrl = ref('')
 */
 const userInfo = ref<any>({}) // 用户信息
 const getData = async () => {
-  const res = await getUserInfo()
-  if (res.result) {
-    userStore.setUserInfo(res.result)
-    userInfo.value = res.result
+  try {
+    const res = await getUserInfo()
+    if (res.result) {
+      userStore.setUserInfo(res.result)
+      userInfo.value = res.result
+    }
+  } catch (error) {
+    console.error('获取用户信息失败:', error)
  }
 }

@@ -320,12 +324,16 @@ const sendCode = async () => {
    return
  }

-  await sendEmailCode(editForm.value.email)
-  uni.showToast({
-    title: t('user.sendCodeSuccess'),
-    icon: 'none'
-  })
-  startCountdown()
+  try {
+    await sendEmailCode(editForm.value.email)
+    uni.showToast({
+      title: t('user.sendCodeSuccess'),
+      icon: 'none'
+    })
+    startCountdown()
+  } catch (error) {
+    console.error('发送验证码失败:', error)
+  }
 }

 /**
@@ -390,88 +398,92 @@ const checkPasswordStrength = () => {
 const handleSubmit = async () => {
  const key = currentField.value?.key
  
-  // 构建更新数据对象
-  let updateData: any = Object.assign({}, userInfo.value)
+  try {
+    // 构建更新数据对象
+    let updateData: any = Object.assign({}, userInfo.value)

-  switch (key) {
-    case 'email':
-      // 更新邮箱
-      if (!editForm.value.email || !editForm.value.code) {
-        uni.showToast({
-          title: t('user.pleaseInputCode'),
-          icon: 'none'
-        })
-        return
-      }
-      await updateEmail(userInfo.value.id, editForm.value.email, editForm.value.code)
-      break
-      
-    case 'password':
-      // 更新密码
-      if (!passwordOk.value) {
-        uni.showToast({
-          title: passwordNote.value,
-          icon: 'none'
-        })
-        return
-      }
-      if (editForm.value.password !== editForm.value.confirmPassword) {
-        uni.showToast({
-          title: t('user.passwordNotMatch'),
-          icon: 'none'
-        })
-        return
-      }
-      await updatePassword(userInfo.value.id, editForm.value.password)
-      break
-      
-    case 'avatar':
-      // 更新头像
-      console.log('avatarUrl.value:', avatarUrl.value)
-      if (!avatarUrl.value) {
-        uni.showToast({
-          title: t('common.pleaseSelect') + t('user.avatar'),
-          icon: 'none'
-        })
-        return
-      }
-      
-      // 如果是新上传的图片，需要先上传
-      updateData.avatar = avatarUrl.value
-      await updateUserInfo(updateData)
-      break
-      
-    case 'sex':
-      // 更新性别
-      updateData.sex = editValue.value
-      await updateUserInfo(updateData)
-      break
-      
-    default:
-      // 更新其他字段
-      if (!editValue.value) {
-        uni.showToast({
-          title: getPlaceholder(key),
-          icon: 'none'
-        })
-        return
-      }
-      updateData[key] = editValue.value
-      await updateUserInfo(updateData)
-      break
+    switch (key) {
+      case 'email':
+        // 更新邮箱
+        if (!editForm.value.email || !editForm.value.code) {
+          uni.showToast({
+            title: t('user.pleaseInputCode'),
+            icon: 'none'
+          })
+          return
+        }
+        await updateEmail(userInfo.value.id, editForm.value.email, editForm.value.code)
+        break
+        
+      case 'password':
+        // 更新密码
+        if (!passwordOk.value) {
+          uni.showToast({
+            title: passwordNote.value,
+            icon: 'none'
+          })
+          return
+        }
+        if (editForm.value.password !== editForm.value.confirmPassword) {
+          uni.showToast({
+            title: t('user.passwordNotMatch'),
+            icon: 'none'
+          })
+          return
+        }
+        await updatePassword(userInfo.value.id, editForm.value.password)
+        break
+        
+      case 'avatar':
+        // 更新头像
+        console.log('avatarUrl.value:', avatarUrl.value)
+        if (!avatarUrl.value) {
+          uni.showToast({
+            title: t('common.pleaseSelect') + t('user.avatar'),
+            icon: 'none'
+          })
+          return
+        }
+        
+        // 如果是新上传的图片，需要先上传
+        updateData.avatar = avatarUrl.value
+        await updateUserInfo(updateData)
+        break
+        
+      case 'sex':
+        // 更新性别
+        updateData.sex = editValue.value
+        await updateUserInfo(updateData)
+        break
+        
+      default:
+        // 更新其他字段
+        if (!editValue.value) {
+          uni.showToast({
+            title: getPlaceholder(key),
+            icon: 'none'
+          })
+          return
+        }
+        updateData[key] = editValue.value
+        await updateUserInfo(updateData)
+        break
+    }
+
+    uni.showToast({
+      title: t('user.updateSuccess'),
+      icon: 'success'
+    })
+    
+    closeModal()
+    
+    // 刷新数据
+    setTimeout(() => {
+      getData()
+    }, 500)
+  } catch (error) {
+    console.error('更新失败:', error)
  }
-
-  uni.showToast({
-    title: t('user.updateSuccess'),
-    icon: 'success'
-  })
-  
-  closeModal()
-  
-  // 刷新数据
-  setTimeout(() => {
-    getData()
-  }, 500)
 }

 /**
--- a/pages/vip/course.vue
+++ b/pages/vip/course.vue
--- a/types/order.d.ts
+++ b/types/order.d.ts
@@ -13,14 +13,6 @@ export interface IGoods {
  delFlag?: number                 // 删除标记 -1-已下架
 }

-/**
- * 获取优惠价格参数
- **/
-export interface IGoodsDiscountParams {
-  productId: number
-  quantity: number
-}
-
 /**
 * 订单接口
 */