修复：合并丢失的代码

revert 更新：谷歌支付

App.vue

@@ -1,7 +1,14 @@
 <script>
+	// #ifdef APP-PLUS
+	import updata from "@/uni_modules/uni-upgrade-center-app/utils/check-update";
+	// #endif
   export default {
     onLaunch: function() {
       console.log('App Launch')
+			// 检测自动更新
+			// #ifdef APP-PLUS
+			updata();
+			// #endif
     },
     onShow: function() {
       console.log('App Show')

androidPrivacy.json

@@ -1,3 +1,3 @@
 {
-    "prompt": "template"
+    "prompt" : "template"
 }

api/modules/book.ts

@@ -11,6 +11,7 @@ import type {
   IComment,
   IReadProgress
 } from '@/types/book'
+import type { IGoods } from '@/types/order'
 
 const client = createRequestClient({ baseURL: SERVICE_MAP.MAIN })
 
@@ -212,5 +213,17 @@ export const bookApi = {
       method: 'POST',
       data: { chapterId }
     })
-  }
+  },
+
+  /**
+   * 获取购买商品信息
+   * @param bookId 书籍ID
+   */
+  getBookGoods(bookId: number) {
+    return client.request<IApiResponse<{ goodsList: IGoods[] }>>({
+      url: 'bookAbroad/home/getProductListForBook',
+      method: 'POST',
+      data: { bookId }
+    })
+  },
 }

api/modules/order.ts

@@ -4,7 +4,12 @@ import type { IApiResponse } from '@/api/types'
 import type { 
   ICreateOrderParams, 
   IGooglePayVerifyParams,
-  ICreateOrderResponse
+  ICreateOrderResponse,
+  IOrderGoods,
+  ICoupon,
+  ICourseOrderCreateParams,
+  IOrderInitData,
+  IGoodsDiscountParams
 } from '@/types/order'
 import type { IUserInfo } from '@/types/user'
 
@@ -59,5 +64,96 @@ export const orderApi = {
       method: 'POST'
     })
     return res
+  },
+
+  /**
+   * 初始化订单准备数据
+   * @param params 初始化参数
+   */
+  async initPrepareOrder(params: { uid: number; productList: Array<{ productId: number; quantity: number }> }) {
+    const res = await mainClient.request<IApiResponse<IOrderInitData>>({
+      url: 'common/buyOrder/initPrepareOrder',
+      method: 'POST',
+      data: params
+    })
+    return res
+  },
+
+  /**
+   * 根据商品ID获取商品详情列表
+   * @param productIds 商品ID字符串（逗号分隔）
+   */
+  async getShopProductListByIds(productIds: string) {
+    const res = await mainClient.request<IApiResponse<{ shopProductList: IOrderGoods[] }>>({
+      url: 'book/buyOrder/getShopProductListByIds',
+      method: 'POST',
+      data: { productIds }
+    })
+    return res
+  },
+
+  /**
+   * 获取VIP优惠金额
+   * @param productList 商品列表
+   */
+  async getVipDiscountAmount(productList: Array<{ productId: number; quantity: number }>) {
+    const res = await mainClient.request<IApiResponse<{ discountAmount: number }>>({
+      url: 'book/buyOrder/getVipDiscountAmount',
+      method: 'POST',
+      data: { productList }
+    })
+    return res
+  },
+
+  /**
+   * 获取地区优惠金额
+   * @param productList 商品列表
+   */
+  async getDistrictAmount(productList: IGoodsDiscountParams[]) {
+    const res = await mainClient.request<IApiResponse<{ districtAmount: number }>>({
+      url: 'book/buyOrder/getDistrictAmount',
+      method: 'POST',
+      data: { productList }
+    })
+    return res
+  },
+
+  /**
+   * 获取可用优惠券列表
+   * @param shopProductInfos 商品信息字符串（格式：productId:price:quantity,productId:price:quantity）
+   */
+  async getCouponListPayment(shopProductInfos: string) {
+    const res = await mainClient.request<IApiResponse<{ couponHistoryList: ICoupon[] }>>({
+      url: 'common/coupon/getCouponListPayment',
+      method: 'POST',
+      data: { shopProductInfos }
+    })
+    return res
+  },
+
+  /**
+   * 更新购物车商品
+   * @param data 商品数据
+   */
+  async updateCart(data: { productId: number; productAmount: number; price: number }) {
+    const res = await mainClient.request<IApiResponse>({
+      url: 'book/ordercart/update',
+      method: 'POST',
+      data
+    })
+    return res
+  },
+
+  /**
+   * 创建订单
+   * @param data 订单数据
+   */
+  async placeOrder(data: ICourseOrderCreateParams) {
+    const res = await mainClient.request<IApiResponse<{ orderSn: string; money: number }>>({
+      url: 'book/buyOrder/placeOrder',
+      method: 'POST',
+      data
+    })
+    return res
   }
 }

api/modules/user.ts

@@ -39,11 +39,11 @@ export async function getVipInfo() {
  * @param current 当前页码
  * @param limit 每页数量
  */
-export async function getOrderList(current: number, limit: number, orderStatus: string) {
+export async function getOrderList(page: number, limit: number, orderStatus: string) {
   const res = await mainClient.request<IApiResponse<{ orders: IPageData<IOrder> }>>({
     url: 'common/buyOrder/commonBuyOrderList',
     method: 'POST',
-    data: { current, limit, orderStatus, come: '10', userId: uni.getStorageSync('userInfo').id }
+    data: { page, limit, orderStatus, come: '10', userId: uni.getStorageSync('userInfo').id }
   })
   return res
 }
@@ -215,3 +215,54 @@ export async function verifyIAP(data: any) {
   })
   return res
 }
+
+/**
+ * 获取充值列表
+ * @param type 固定值 point
+ * @param qudao 支付类型 
+ */
+export async function getBookBuyConfigList(type: string, qudao: string) {
+  const res = await mainClient.request<IApiResponse>({
+    url: 'common/bookBuyConfig/getBookBuyConfigList',
+    method: 'POST',
+    data: {type, qudao}
+  })
+  return res
+}
+
+/**
+ * 获取隐私协议
+ * @param id 101众妙之门隐私政策
+ */
+export async function getAgreement(id: string) {
+	console.log(id, 'id');
+  const res = await mainClient.request<IApiResponse>({
+    url: '/sys/agreement/getAgreement',
+    method: 'POST',
+    data: {id}
+  })
+  return res
+}
+
+/**
+ * 获取活动说明
+ */
+export async function getActivityDescription() {
+  const res = await mainClient.request<IApiResponse>({
+    url: 'common/bookBuyConfig/getRechargeActivity',
+    method: 'POST'
+  })
+  return res
+}
+
+/**
+ * 获取充值列表
+ */
+export async function getTransactionDetailsList(current: number, limit: number, userId: string,) {
+  const res = await mainClient.request<IApiResponse>({
+    url: 'common/transactionDetails/getTransactionDetailsList',
+    method: 'POST',
+		data: { current, limit,  userId, }
+  })
+  return res
+}

api/modules/vip.ts

@@ -0,0 +1,27 @@
+import { mainClient } from '@/api/clients/main'
+import type { IApiResponse } from '@/api/types'
+import type { IVipItem } from '@/types/vip'
+
+export const vipApi = {
+  /**
+   * 获取VIP购买配置列表
+   */
+  getVipBuyConfigList: async () => {
+    const res = await mainClient.request<IApiResponse<{ res: IVipItem[] }>>({
+      url: 'common/userVip/getVipBuyConfigList',
+      method: 'POST'
+    })
+    return res
+  },
+
+  /**
+   * 获取图书VIP列表
+   */
+  getBookVipList: async () => {
+    const res = await mainClient.request<IApiResponse<any>>({
+      url: 'bookAbroad/ebookvip/getEbookvipBuyConfigList',
+      method: 'POST'
+    })
+    return res
+  }
+}

components/course/ChapterList.vue

@@ -263,6 +263,7 @@ const handleChapterClick = (chapter: IChapter) => {
     left: 0;
     top: 0;
     font-size: 24rpx;
+		display: inline-block;
     background: linear-gradient(90deg, #6429db 0%, #0075ed 100%);
     color: #fff;
     padding: 10rpx 20rpx;

components/order/Confirm.vue

@@ -0,0 +1,717 @@
+<template>
+  <view class="confirm-order-page">
+    <!-- 商品列表区域 -->
+    <view class="common-section">
+      <view class="section-title">{{ $t('order.goodsInfo') }}</view>
+      <slot name="goodsList" />
+    </view>
+
+    <!-- 订单备注区域 -->
+    <view class="remark-section common-section" @click="showRemarkPopup = true">
+      <view class="remark-row">
+        <text class="remark-label">{{ $t('order.remark') }}</text>
+        <view class="remark-value">
+          <text :class="remark ? 'remark-text' : 'remark-placeholder'">
+            {{ remark || $t('order.remarkPlaceholder') }}
+          </text>
+          <image src="/static/icon/icon_right.png" class="arrow-icon" />
+        </view>
+      </view>
+    </view>
+
+    <!-- 价格明细区域 -->
+    <view class="price-section common-section">
+      <view class="section-title">{{ $t('order.priceDetail') }}</view>
+      
+      <!-- 商品总价 -->
+      <view class="price-item">
+        <text class="label">{{ $t('order.totalPrice') }}</text>
+        <text class="value">{{ totalAmount.toFixed(2) }} {{ t('global.coin') }}</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>
+      
+      <!-- VIP专享立减 -->
+      <view v-if="vipDiscounted > 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>
+      </view>
+      
+      <!-- 积分 -->
+      <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 }})
+          </text>
+        </view>
+        <text class="discount-value">-{{ pointsDiscounted.toFixed(2) }}</text>
+      </view>
+      
+      <!-- 积分输入 -->
+      <view v-if="allowPointPay && userInfo?.jf > 0" class="points-input-section">
+        <text class="points-label">
+          {{ $t('order.maxPoints', { max: pointsUsableMax }) }}
+        </text>
+        <view class="points-input-box">
+          <input
+            v-model="pointsDiscounted"
+            type="number"
+            clearable
+            :placeholder="$t('order.pointsPlaceholder')"
+            class="text-right"
+            @input="handlePointsInput"
+            @clear="handlePointsClear"
+          />
+        </view>
+      </view>
+    </view>
+    
+    <!-- 支付方式区域 -->
+    <view class="common-section">
+      <view class="section-title">{{ $t('order.paymentMethod') }}</view>
+      <PayWay :peanutCoin="userInfo?.peanutCoin || 0" />
+    </view>
+    
+    <!-- 底部汇总栏 -->
+    <view class="bottom-bar">
+      <view class="total-info">
+        <text class="label">{{ $t('order.total') }}：</text>
+        <text class="amount">{{ finalAmount }} {{ t('global.coin') }}</text>
+      </view>
+      <wd-button type="primary" @click="handleSubmit">
+        {{ $t('order.submit') }}
+      </wd-button>
+    </view>
+    
+    <!-- 订单备注弹窗 -->
+    <wd-popup
+      v-model="showRemarkPopup"
+      position="bottom"
+    >
+      <view class="remark-popup">
+        <view class="popup-header">{{ $t('order.remarkTitle') }}</view>
+        
+        <view class="remark-content">
+          <wd-textarea
+            v-model="remark"
+            :placeholder="$t('order.remarkPlaceholder')"
+            :maxlength="200"
+            show-word-limit
+            class="pb-0!"
+          />
+        </view>
+        
+        <view class="popup-footer">
+          <wd-button type="primary" block @click="showRemarkPopup = false">{{ $t('global.ok') }}</wd-button>
+        </view>
+      </view>
+    </wd-popup>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+import { orderApi } from '@/api/modules/order'
+import { getUserInfo } from '@/api/modules/user'
+import { useUserStore } from '@/stores/user'
+import { t } from '@/utils/i18n'
+import type { IGoods, IGoodsDiscountParams } from '@/types/order'
+import PayWay from '@/components/order/PayWay.vue'
+
+const userStore = useUserStore()
+
+// 使用页面传参
+interface Props {
+  goodsList: IGoods[],
+  userInfo: object,
+  allowPointPay: boolean,
+  orderType: string,
+  backStep: number // 购买完成后返回几层页面
+}
+const props = withDefaults(defineProps<Props>(), {
+  goodsList: () => [],
+  userInfo: () => ({}),
+  allowPointPay: true,
+  orderType: 'order',
+  backStep: 1
+})
+
+// 订单备注
+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) // 最大可用积分
+
+// 优惠券相关
+
+/**
+ * 优惠价格的请求参数
+ */
+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 calculateAllPrices = async () => {
+  try {
+    // 计算商品总价
+    calculateTotalPrice()
+    
+    props.orderType === 'order' && await Promise.all([
+      // 获取VIP优惠
+      calculateVipDiscounted(),
+      
+      // 获取活动优惠
+      calculatePromotionDiscounted()
+
+      // 获取优惠券列表
+      // await getAvailableCoupons()
+    ])
+
+    // 计算最终价格
+    calculateFinalPrice()
+  } catch (error) {
+    console.error('计算价格失败:', error)
+  }
+}
+
+/**
+ * 计算商品总价
+ */
+const calculateTotalPrice = () => {
+  totalAmount.value = props.goodsList.reduce((sum: number, item: IGoods) => {
+    // return sum + (item.price * item.productAmount)
+    return sum + (item.price * 1)
+  }, 0)
+}
+
+/**
+ * 计算VIP优惠
+ */
+const calculateVipDiscounted = async () => {
+  const res = await orderApi.getVipDiscountAmount(goodsListParams.value)
+  vipDiscounted.value = res.discountAmount
+}
+
+/**
+ * 计算活动优惠
+ */
+const calculatePromotionDiscounted = async () => {
+  const res = await orderApi.getDistrictAmount(goodsListParams.value)
+  promotionDiscounted.value = res.districtAmount
+}
+
+/**
+ * 获取可用优惠券
+ */
+// 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 || []
+      
+//       // 如果当前选中的优惠券不可用，清除选择
+//       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 handlePointsInput = (value: any) => {
+  let val = String(value.detail.value)
+  
+  // 只允许数字字符，去掉小数点
+  val = val.replace(/[^0-9]/g, '')
+  
+  if (val === '0' || val === '') {
+    pointsDiscounted.value = 0
+  } else {
+    let numericValue = parseInt(val, 10)
+    if (numericValue < 0 || isNaN(numericValue)) {
+      numericValue = 0
+    }
+    
+    // 确保不超过最大值
+    if (numericValue >= pointsUsableMax.value) {
+      numericValue = pointsUsableMax.value
+    }
+    
+    pointsDiscounted.value = numericValue
+  }
+  
+  // 重新计算实付款
+  calculateFinalPrice()
+}
+
+/**
+ * 清除积分输入
+ */
+const handlePointsClear = () => {
+  pointsDiscounted.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
+}
+
+/**
+ * 验证订单
+ */
+const validateOrder = (): boolean => {
+  // 验证实付金额是否计算完成
+  if (isNaN(parseFloat(finalAmount.value))) {
+    uni.showToast({
+      title: t('order.invalidPaymentAmount'),
+      icon: 'none'
+    })
+    return false
+  }
+
+  // 验证天医币余额
+  if (finalAmount.value > props.userInfo.peanutCoin) {
+    uni.showToast({
+      title: t('order.insufficientBalance'),
+      icon: 'none'
+    })
+    return false
+  }
+  
+  return true
+}
+
+/**
+ * 提交订单
+ */
+const handleSubmit = async () => {  
+  // 验证订单
+  if (!validateOrder()) return
+
+  // 创建订单 此app用天医币支付，创建订单成功即支付成功
+  await createOrder()
+
+  // 重新获取用户信息更新store和本地缓存
+  const res = await getUserInfo()
+  userStore.setUserInfo(res.result)
+
+  uni.showToast({
+    title: t('order.orderSuccess'),
+    icon: 'success'
+  })
+
+  // 返回上一页
+  uni.navigateBack({
+    delta: props.backStep
+  })
+}
+
+/**
+ * 创建订单
+ */
+const createOrder = async (): Promise<string | null> => {
+  const orderParams = {
+    userId: props.userInfo.id,
+    paymentMethod: 4, // 天医币
+    orderMoney: totalAmount.value,
+    realMoney: finalAmount.value,
+    jfDeduction: pointsDiscounted.value,
+    // couponId: selectedCoupon.value?.id,
+    // couponName: selectedCoupon.value?.couponEntity.couponName,
+    vipDiscountAmount: vipDiscounted.value,
+    districtMoney: promotionDiscounted.value,
+    remark: remark.value,
+    orderType: props.orderType,
+    productList: props.orderType === 'order' ? goodsListParams.value : null,
+    vipBuyConfigId: props.orderType === 'vip' ? props.goodsList[0].productId : null,
+    abroadVipId: props.orderType === 'abroadVip' ? props.goodsList[0].productId : null,
+    come: 10
+  }
+  
+  const res = await orderApi.placeOrder(orderParams)
+  
+  if (res.orderSn) {
+    return res.orderSn
+  }
+  return null
+}
+</script>
+
+<style lang="scss" scoped>
+.confirm-order-page {
+  min-height: 100vh;
+  background-color: #f5f5f5;
+  padding: 20rpx;
+  padding-bottom: 60px;
+}
+
+.common-section {
+  background-color: #fff;
+  border-radius: 12rpx;
+  padding: 20rpx;
+  margin-bottom: 20rpx;
+}
+
+.section-title {
+  font-size: 28rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 20rpx;
+}
+
+.price-section {
+  .price-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 15rpx 0;
+    font-size: 28rpx;
+    
+    .label-row {
+      display: flex;
+      align-items: center;
+      gap: 10rpx;
+      
+      .label {
+        color: #666;
+      }
+      
+      .vip-icon {
+        padding: 2rpx 8rpx;
+        background-color: #f94f04;
+        color: #fff;
+        font-size: 20rpx;
+        border-radius: 4rpx;
+        font-weight: bold;
+      }
+      
+      .icon-img {
+        width: 40rpx;
+        height: 40rpx;
+      }
+      
+      .points-total {
+        font-size: 24rpx;
+        color: #aaa;
+      }
+    }
+    
+    .label {
+      color: #666;
+    }
+    
+    .value {
+      color: #333;
+      font-weight: 500;
+    }
+    
+    .value-row {
+      display: flex;
+      align-items: center;
+      gap: 10rpx;
+    }
+    
+    .discount-value {
+      color: #fe6035;
+      font-weight: 500;
+    }
+  }
+  
+  .points-input-section {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 15rpx 0;
+    margin-top: 10rpx;
+    background-color: #f5f5f5;
+    border-radius: 20rpx;
+    padding: 20rpx;
+    
+    .points-label {
+      font-size: 28rpx;
+      color: #7dc1f0;
+      font-weight: 600;
+    }
+    
+    .points-input-box {
+      width: 320rpx;
+    }
+  }
+}
+
+.goods-section {
+  .goods-item {
+    position: relative;
+    display: flex;
+    padding-bottom: 20rpx;
+    border-bottom: 1px solid #f0f0f0;
+    
+    &:last-child {
+      border-bottom: none;
+      padding-bottom: 0;
+    }
+    
+    .vip-badge {
+      position: absolute;
+      top: 20rpx;
+      left: 0;
+      z-index: 1;
+    }
+    
+    .goods-image {
+      width: 140rpx;
+      height: 140rpx;
+      flex-shrink: 0;
+      margin-right: 20rpx;
+      background-color: #f5f5f5;
+      border-radius: 8rpx;
+      overflow: hidden;
+      
+      image {
+        width: 100%;
+        height: 100%;
+      }
+    }
+    
+    .goods-info {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      
+      .goods-name {
+        font-size: 28rpx;
+        color: #333;
+        line-height: 1.4;
+        margin-bottom: 10rpx;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+        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;
+        font-size: 24rpx;
+        color: #999;
+        
+        .quantity-label {
+          margin-right: 10rpx;
+        }
+        
+        .quantity-control {
+          display: flex;
+          align-items: center;
+        }
+      }
+    }
+  }
+}
+
+.remark-section {
+  .remark-row {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    
+    .remark-label {
+      font-size: 28rpx;
+      font-weight: bold;
+      color: #333;
+    }
+    
+    .remark-value {
+      display: flex;
+      align-items: center;
+      gap: 10rpx;
+      max-width: 500rpx;
+      
+      .remark-text {
+        font-size: 24rpx;
+        color: #333;
+        text-align: right;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+      
+      .remark-placeholder {
+        font-size: 24rpx;
+        color: #b0b0b0;
+      }
+      
+      .arrow-icon {
+        width: 24rpx;
+        height: 24rpx;
+      }
+    }
+  }
+}
+
+.remark-popup {
+  background-color: #fff;
+  border-radius: 20rpx 20rpx 0 0;
+  
+  .popup-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 30rpx;
+    border-bottom: 1px solid #f0f0f0;
+    
+    .popup-title {
+      font-size: 32rpx;
+      font-weight: 500;
+      color: #333;
+    }
+  }
+  
+  .remark-content {
+    min-height: 300rpx;
+  }
+  
+  .popup-footer {
+    padding: 20rpx;
+    border-top: 1px solid #f0f0f0;
+  }
+}
+
+.bottom-bar {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20rpx;
+  background-color: #fff;
+  box-shadow: 0 -2px 12px rgba(0, 0, 0, 0.1);
+  z-index: 999;
+  
+  .total-info {
+    flex: 1;
+    
+    .label {
+      font-size: 28rpx;
+      color: #666;
+    }
+    
+    .amount {
+      font-size: 36rpx;
+      color: #ff4444;
+      font-weight: bold;
+      margin-left: 10rpx;
+    }
+  }
+}
+</style>

components/order/Coupon.vue

@@ -0,0 +1,328 @@
+<template>
+  <view>
+    <view class="price-item" @click="showCouponPopup = true">
+      <view class="label-row">
+        <text class="label">{{ $t('order.coupon') }}</text>
+      </view>
+      <view class="value-row">
+        <template v-if="!selectedCoupon">
+          <view v-if="availableCouponCount > 0" class="coupon-badge">
+            <text>{{ $t('order.couponCount', { count: availableCouponCount }) }}</text>
+          </view>
+          <text v-else-if="couponList.length === 0" class="unavailable-text">
+            {{ $t('order.noCoupon') }}
+          </text>
+          <text v-else class="unavailable-text">
+            {{ $t('order.unavailable') }}
+          </text>
+        </template>
+        <template v-else>
+          <text class="discount-value">-￥{{ selectedCoupon.couponEntity.couponAmount }}</text>
+          <text class="reselect-btn">{{ $t('order.reselect') }}</text>
+        </template>
+        <image
+          v-if="availableCouponCount > 0 || selectedCoupon"
+          src="/static/icon/icon_right.png"
+          class="arrow-icon"
+        />
+      </view>
+    </view>
+
+    <!-- 优惠券选择弹窗 -->
+    <wd-popup
+      v-model="showCouponPopup"
+      position="bottom"
+      :close-on-click-modal="false"
+    >
+      <view class="coupon-popup">
+        <view class="popup-header">
+          <text class="popup-title">{{ $t('order.selectCoupon') }}</text>
+          <wd-icon name="close" @click="showCouponPopup = false" />
+        </view>
+        
+        <view class="coupon-list">
+          <view
+            v-for="(coupon, index) in couponList"
+            :key="index"
+            :class="['coupon-item', coupon.canUse === 0 ? 'disabled' : '', selectedCoupon?.couponId === coupon.couponId ? 'selected' : '']"
+            @click="handleCouponSelect(coupon)"
+          >
+            <view class="coupon-type-badge">
+              {{ getCouponTypeText(coupon.couponEntity.couponRange) }}
+            </view>
+            
+            <view class="coupon-amount">
+              <text class="currency">￥</text>
+              <text class="amount">{{ coupon.couponEntity.couponAmount }}</text>
+            </view>
+            
+            <view class="coupon-info">
+              <text class="coupon-name">{{ coupon.couponEntity.couponName }}</text>
+              <text class="coupon-condition">
+                {{ $t('order.couponUseLevel', { level: coupon.couponEntity.useLevel }) }}
+              </text>
+              <text class="coupon-expiry">
+                {{ $t('order.couponExpiry') }}：
+                {{ coupon.effectType === 0 ? $t('order.couponForever') : coupon.endTime }}
+              </text>
+              <text v-if="coupon.canUse === 0" class="unavailable-reason">
+                {{ $t('order.couponReason') }}：{{ coupon.canUseReason }}
+              </text>
+            </view>
+            
+            <view class="coupon-select">
+              <wd-icon
+                v-if="coupon.canUse === 1"
+                :name="selectedCoupon?.couponId === coupon.couponId ? 'checkmark-circle-fill' : 'circle'"
+                :color="selectedCoupon?.couponId === coupon.couponId ? '#fd6004' : '#d9d9d9'"
+                size="20"
+              />
+            </view>
+          </view>
+          
+          <view v-if="couponList.length === 0" class="empty-coupon">
+            <text>{{ $t('order.noCoupon') }}</text>
+          </view>
+        </view>
+        
+        <view class="popup-footer">
+          <wd-button
+            v-if="availableCouponCount > 0"
+            type="default"
+            @click="handleCouponConfirm(null)"
+          >
+            {{ $t('order.notUseCoupon') }}
+          </wd-button>
+          <wd-button
+            v-if="availableCouponCount > 0"
+            type="primary"
+            @click="handleCouponConfirm(selectedCoupon)"
+          >
+            {{ $t('order.selected') }}
+          </wd-button>
+          <wd-button
+            v-else
+            type="default"
+            @click="showCouponPopup = false"
+          >
+            {{ $t('order.confirm') }}
+          </wd-button>
+        </view>
+      </view>
+    </wd-popup>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed } from 'vue'
+import { orderApi } from '@/api/modules/order'
+import { t } from '@/utils/i18n'
+import type {
+  ICoupon
+} from '@/types/order'
+
+const emit = defineEmits(['selectCoupon'])
+
+const couponList = ref<ICoupon[]>([])
+const selectedCoupon = ref<ICoupon | null>(null)
+const showCouponPopup = ref(false)
+
+/**
+ * 可用优惠券数量
+ */
+const availableCouponCount = computed(() => {
+  return couponList.value.filter(c => c.canUse === 1).length
+})
+
+/**
+ * 获取优惠券类型文本
+ */
+const getCouponTypeText = (type: number) => {
+  const typeMap: Record<number, string> = {
+    0: 'couponType0',
+    1: 'couponType1',
+    2: 'couponType2'
+  }
+  return typeMap[type] || 'couponType0'
+}
+
+/**
+ * 选择优惠券
+ */
+const handleCouponSelect = (coupon: ICoupon) => {
+  if (coupon.canUse === 0) {
+    return
+  }
+  
+  if (selectedCoupon.value?.couponId === coupon.couponId) {
+    selectedCoupon.value = null
+  } else {
+    selectedCoupon.value = coupon
+  }
+}
+
+/**
+ * 确认优惠券选择
+ */
+const handleCouponConfirm = (coupon: ICoupon | null) => {
+  selectedCoupon.value = coupon
+  showCouponPopup.value = false
+
+  // 回传优惠券选择
+  emit('selectCoupon', coupon)
+}
+</script>
+
+<style lang="scss" scoped>
+.coupon-badge {
+  padding: 4rpx 20rpx;
+  background-color: #fceeeb;
+  color: #ec4729;
+  font-size: 24rpx;
+  border-radius: 10rpx;
+}
+
+.unavailable-text {
+  font-size: 24rpx;
+  color: #999;
+}
+
+.reselect-btn {
+  padding: 4rpx 12rpx;
+  background-color: #fe6035;
+  color: #fff;
+  font-size: 24rpx;
+  border-radius: 30rpx;
+}
+
+.arrow-icon {
+  width: 24rpx;
+  height: 24rpx;
+}
+
+.coupon-popup {
+  max-height: 80vh;
+  background-color: #fff;
+  border-radius: 20rpx 20rpx 0 0;
+  
+  .popup-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 30rpx;
+    border-bottom: 1px solid #f0f0f0;
+    
+    .popup-title {
+      font-size: 32rpx;
+      font-weight: 500;
+      color: #333;
+    }
+  }
+  
+  .coupon-list {
+    max-height: 60vh;
+    overflow-y: auto;
+    padding: 20rpx;
+    
+    .coupon-item {
+      position: relative;
+      display: flex;
+      align-items: center;
+      padding: 30rpx 20rpx;
+      margin-bottom: 20rpx;
+      background: linear-gradient(to top right, #fff, #fef2f4);
+      border: 1px solid #d9d9d9;
+      border-radius: 10rpx;
+      
+      &.selected {
+        border-color: #fd6004;
+      }
+      
+      &.disabled {
+        background: linear-gradient(to top right, #fafafa, #fafafa);
+        color: #979797;
+        
+        .coupon-amount {
+          color: #979797;
+        }
+      }
+      
+      .coupon-type-badge {
+        position: absolute;
+        top: 10rpx;
+        right: 10rpx;
+        padding: 6rpx;
+        background-color: #ffe3e9;
+        color: #c81346;
+        font-size: 20rpx;
+        border-radius: 10rpx;
+      }
+      
+      .coupon-amount {
+        width: 25%;
+        text-align: center;
+        color: #ff0043;
+        
+        .currency {
+          font-size: 24rpx;
+        }
+        
+        .amount {
+          font-size: 45rpx;
+          font-weight: bold;
+        }
+      }
+      
+      .coupon-info {
+        flex: 1;
+        padding-left: 5%;
+        display: flex;
+        flex-direction: column;
+        gap: 10rpx;
+        
+        .coupon-name {
+          font-size: 28rpx;
+          font-weight: 500;
+          color: #333;
+        }
+        
+        .coupon-condition {
+          font-size: 24rpx;
+          color: #666;
+        }
+        
+        .coupon-expiry {
+          font-size: 22rpx;
+          color: #999;
+        }
+        
+        .unavailable-reason {
+          font-size: 20rpx;
+          color: #333;
+        }
+      }
+      
+      .coupon-select {
+        width: 7%;
+        display: flex;
+        justify-content: center;
+      }
+    }
+    
+    .empty-coupon {
+      padding: 60rpx 0;
+      text-align: center;
+      color: #999;
+      font-size: 28rpx;
+    }
+  }
+  
+  .popup-footer {
+    display: flex;
+    gap: 20rpx;
+    padding: 20rpx;
+    border-top: 1px solid #f0f0f0;
+  }
+}
+
+</style>

components/order/GoodsSelector.vue

@@ -8,8 +8,9 @@
       <view v-if="selectedIndex !== -1" class="goods-info-mini">
         <image :src="goods[selectedIndex].productImages" mode="aspectFit" class="goods-cover" />
         <view class="info">
-          <text class="name">{{ goods[selectedIndex].productName }}</text>
-          <text v-if="selectedGoodsPrice" class="price">NZ$ {{ selectedGoodsPrice }}</text>
+          <view class="name">{{ goods[selectedIndex].productName }}</view>
+          <!-- 商品价格组件 -->
+          <GoodsPrice :goods="goods[selectedIndex]" />
         </view>
       </view>
       
@@ -27,25 +28,9 @@
           <image :src="item.productImages" mode="aspectFit" class="goods-cover" />
           <view class="goods-info">
             <text class="goods-name">{{ item.productName }}</text>
-            
-            <!-- VIP优惠价 -->
-            <view v-if="item.isVipPrice === 1 && item.vipPrice" class="price-info">
-              <text class="vip-price">NZ$ {{ parseFloat(item.vipPrice).toFixed(2) }}</text>
-              <text class="vip-label">VIP到手价</text>
-              <text class="original-price">NZ$ {{ parseFloat(item.price).toFixed(2) }}</text>
-            </view>
-            
-            <!-- 活动价 -->
-            <view v-else-if="item.activityPrice && item.activityPrice > 0" class="price-info">
-              <text class="activity-price">NZ$ {{ parseFloat(item.activityPrice).toFixed(2) }}</text>
-              <text class="activity-label">活动价</text>
-              <text class="original-price">NZ$ {{ parseFloat(item.price).toFixed(2) }}</text>
-            </view>
-            
-            <!-- 普通价格 -->
-            <view v-else class="price-info">
-              <text class="normal-price">NZ$ {{ parseFloat(item.price).toFixed(2) }}</text>
-            </view>
+
+            <!-- 商品价格组件 -->
+            <GoodsPrice :goods="item" />
           </view>
         </view>
       </view>
@@ -62,6 +47,7 @@
 import { ref, computed, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 import type { IGoods } from '@/types/order'
+import GoodsPrice from '@/components/order/GoodsPrice.vue';
 
 const { t } = useI18n()
 
@@ -86,19 +72,8 @@ const visible = computed({
   }
 })
 
+// 选中商品的索引
 const selectedIndex = ref(-1)
-// 选中商品的价格
-const selectedGoodsPrice = computed(() => {
-  if (selectedIndex.value === -1) return 0
-  const selectedGoods = props.goods[selectedIndex.value]
-  if (selectedGoods.isVipPrice === 1 && selectedGoods.vipPrice) {
-    return parseFloat(selectedGoods.vipPrice).toFixed(2)
-  } else if (selectedGoods.activityPrice && selectedGoods.activityPrice > 0) {
-    return parseFloat(selectedGoods.activityPrice).toFixed(2)
-  }
-  return parseFloat(selectedGoods.price).toFixed(2)
-})
-
 /**
  * 选择商品
  */
@@ -119,16 +94,20 @@ const handleConfirm = () => {
     return
   }
   
+  visible.value = false
   emit('confirm', props.goods[selectedIndex.value])
 }
 
 /**
- * 关闭选择器
+ * 关闭弹窗
  */
 const handleClose = () => {
+  visible.value = false
   emit('close')
 }
 
+
+
 // 监听显示状态，重置选择
 watch(() => props.show, (newVal: boolean) => {
   if (newVal && props.goods.length > 0) {
@@ -186,13 +165,13 @@ watch(() => props.show, (newVal: boolean) => {
       max-height: 76rpx;
       overflow: hidden;
     }
-    
-    .price {
-      display: block;
+
+    .price-info {
       padding-top: 20rpx;
-      font-size: 36rpx;
-      color: #ff4703;
-      font-weight: bold;
+
+      :deep(.price) {
+        font-size: 36rpx;
+      }
     }
   }
 }
@@ -230,38 +209,6 @@ watch(() => props.show, (newVal: boolean) => {
         color: #333;
         line-height: 1.4;
       }
-      
-      .price-info {
-        display: flex;
-        align-items: baseline;
-        gap: 10rpx;
-        
-        .vip-price,
-        .activity-price,
-        .normal-price {
-          font-size: 16px;
-          font-weight: bold;
-          color: #e97512;
-        }
-        
-        // .normal-price {}
-        
-        .vip-label {
-          font-size: 12px;
-          color: #fa2d12;
-        }
-        
-        .activity-label {
-          font-size: 12px;
-          color: #613804;
-        }
-        
-        .original-price {
-          font-size: 12px;
-          color: #8a8a8a;
-          text-decoration: line-through;
-        }
-      }
     }
   }
 }

components/order/PayWay.vue

@@ -0,0 +1,125 @@
+<template>
+  <view>
+    <!-- 天医币支付 -->
+    <view class="payment-item">
+      <view class="payment-left">
+        <image src="/static/icon/pay_3.png" class="payment-icon" />
+        <text class="">{{ $t('order.virtualCoin') }}</text>
+        <text class="text-[#7dc1f0]">
+          ({{ $t('order.balance') }}：{{ peanutCoin || 0 }})
+        </text>
+      </view>
+    </view>
+
+    <!-- 支付说明 -->
+    <view class="payment-tips">
+      <view class="tips-header">
+        <wd-icon name="error-circle" color="#7dc1f0" size="20" />
+        <text>{{ $t('order.ensureBalance') }}</text>
+        <text class="recharge-btn" @click="goToRecharge">
+          {{ $t('order.recharge') }}
+        </text>
+      </view>
+      
+      <view class="tips-content">
+        <view class="tip-title">{{ $t('order.paymentTipTitle') }}</view>
+        <view class="tip-item">{{ $t('order.paymentTip1') }}</view>
+        <view class="tip-item">
+          {{ $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>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { makePhoneCall, copyToClipboard } from '@/utils/index'
+
+const props = defineProps({
+  peanutCoin: {
+    type: Number,
+    default: 0
+  }
+})
+</script>
+
+<style lang="scss" scoped>
+.payment-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20rpx 0;
+  
+  .payment-left {
+    display: flex;
+    align-items: center;
+    gap: 10rpx;
+    font-size: 28rpx;
+    font-weight: bold;
+    
+    .payment-icon {
+      width: 40rpx;
+      height: 40rpx;
+    }
+  }
+}
+
+.payment-tips {
+  margin-top: 20rpx;
+  padding: 20rpx;
+  background-color: #f7f8f9;
+  border-radius: 10rpx;
+  
+  .tips-header {
+    display: flex;
+    align-items: center;
+    gap: 10rpx;
+    margin-bottom: 12rpx;
+    font-size: 28rpx;
+    color: #333;
+    
+    .recharge-btn {
+      margin-left: auto;
+      padding: 4rpx 14rpx;
+      background-color: #7dc1f0;
+      color: #fff;
+      font-size: 24rpx;
+      border-radius: 10rpx;
+    }
+  }
+  
+  .tips-content {
+    font-size: 28rpx;
+    color: #5a5a5a;
+    line-height: 1.6;
+    
+    .tip-title {
+      font-weight: 500;
+      margin-bottom: 10rpx;
+    }
+    
+    .tip-item {
+      margin-bottom: 10rpx;
+      word-wrap: break-word;
+      word-break: break-all;
+    }
+    
+    .link-text {
+      color: #7dc1f0;
+      text-decoration: underline;
+    }
+  }
+}
+</style>

components/order/ProductInfo.vue

@@ -0,0 +1,111 @@
+<template>
+  <view class="order-item-content">
+    <view class="order-item-product-info">
+      <image
+        :src="productImg"
+        mode="aspectFit"
+        class="order-item-product-cover"
+      />
+      <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="count">x {{ 1 }}</view>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { computed } from 'vue'
+import { t } from '@/utils/i18n'
+interface Props {
+  data: any
+  type: string
+}
+const props = defineProps<Props>()
+
+const productImg = computed(() => {
+  
+  switch (props.type) {
+    case 'order':
+      return props.data[0]?.product?.productImages || ''
+    case 'abroadBook':
+      return props.data?.images || ''
+    case 'vip':
+      return '/static/vip.png'
+    case 'point':
+      return '/static/jifen.png'
+    default:
+      return ''
+  }
+})
+const title = computed(() => {
+  switch (props.type) {
+    case 'order':
+      return props.data[0]?.product?.productName || ''
+    case 'abroadBook':
+      return props.data?.name || ''
+    case 'vip':
+      return props.data?.title + '<text style="color: #ff4703; font-weight: bold;">(' + props.data?.year + '年)</text>' || ''
+    case 'point':
+      return ''
+    default:
+      return ''
+  }
+})
+const price = computed(() => {
+  switch (props.type) {
+    case 'order':
+      return props.data[0]?.product?.price || 0
+    case 'abroadBook':
+      return props.data?.abroadPrice || 0
+    case 'vip':
+      return props.data?.fee || 0
+    case 'point':
+      return ''
+    default:
+      return ''
+  }
+})
+
+</script>
+
+<style lang="scss" scoped>
+.order-item-content {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  font-size: 14px;
+
+  .order-item-product-info {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: center;
+
+    .order-item-product-cover {
+      margin-right: 12px;
+      width: 40px;
+      height: 40px;
+      border-radius: 4px;
+      background-color: #f5f5f5;
+    }
+
+    .order-item-product-name {
+      color: #333;
+    }
+  }
+  .order-item-product-price {
+    font-weight: bold;
+    color: #333;
+    text-align: right;
+    font-size: 12px;
+
+    .count {
+      font-weight: normal;
+      color: #999;
+    }
+  }
+}
+</style>

components/video-player/index.vue

@@ -362,13 +362,13 @@ const retry = () => {
 
 .video-wrapper {
   width: 100%;
-  height: 100%;
+  height: 400rpx;
   position: relative;
 }
 
 .video-element {
   width: 100%;
-  height: 400rpx;
+  height: 100%;
 }
 
 .error-display {
@@ -401,10 +401,12 @@ const retry = () => {
 }
 
 .btn-retry {
+  display: inline-block;
   background-color: #1989fa;
   color: #fff;
   border: none;
   padding: 20rpx 40rpx;
+  line-height: 1;
   border-radius: 8rpx;
   font-size: 28rpx;
 }

locale/en.json

@@ -16,7 +16,9 @@
     "dataNull": "No data available",
     "networkConnectionError": "Network connection error.",
     "loginExpired": "Login expired. Please log in again.",
-    "requestException": "Request exception"
+    "requestException": "Request exception",
+    "coin": "Coin",
+    "days": "Days"
   },
   "tabar.course": "COURSE",
   "tabar.book": "EBOOK",
@@ -207,7 +209,8 @@
     "seasonCard": "Quarterly",
     "yearCard": "Yearly",
     "days": "days",
-    "selectPackage": "Please select a package"
+    "selectPackage": "Please select a package",
+		"consumptionRecord": "Consumption record"
   },
   "book": {
     "title": "My Books",
@@ -237,7 +240,6 @@
     "amount": "Amount",
     "paymentMethod": "Payment Method",
     "googlePay": "Google Pay",
-    "virtualCoin": "Virtual Coin",
     "balance": "Balance",
     "confirm": "Confirm Order",
     "creating": "Creating order...",
@@ -246,6 +248,7 @@
     "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",
@@ -412,6 +415,72 @@
   },
   "order": {
     "selectFuduScheme": "Select Fudu Scheme",
-    "selectPurchaseScheme": "Select Purchase Scheme"
+    "selectPurchaseScheme": "Select Purchase Scheme",
+    "confirmTitle": "Confirm Order",
+    "goodsInfo": "Product Information",
+    "priceDetail": "Price Details",
+    "totalPrice": "Subtotal",
+    "coupon": "Coupon",
+    "points": "Points",
+    "vipDiscount": "VIP Exclusive Discount",
+    "promotionDiscounted": "Promotion Discount",
+    "actualPayment": "Total",
+    "paymentMethod": "Payment Method",
+    "balance": "Balance",
+    "recharge": "Recharge Now",
+    "remark": "Order Remark",
+    "remarkPlaceholder": "Optional: Leave a message",
+    "remarkTitle": "Order Remark",
+    "submit": "Pay Now",
+    "submitting": "Submitting...",
+    "total": "Total",
+    "noCoupon": "No coupons available",
+    "unavailable": "Unavailable",
+    "selectCoupon": "Please select a coupon",
+    "notUseCoupon": "Don't use coupon",
+    "reselect": "Reselect",
+    "selected": "Confirm",
+    "maxPoints": "Available Points ({max} pts)",
+    "pointsPlaceholder": "Enter points",
+    "allPoints": "Total Points",
+    "insufficientBalance": "Insufficient virtual coin balance",
+    "orderCreating": "Creating order",
+    "orderSuccess": "Purchase successful",
+    "orderFailed": "Failed, please try again",
+    "tooFrequent": "Too frequent, please wait",
+    "duplicateOrder": "You have a similar order recently. Continue?",
+    "duplicateConfirm": "Continue",
+    "duplicateCancel": "Cancel",
+    "customerService": "Customer Service",
+    "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",
+    "vipLabel": "VIP Discount",
+    "activityLabel": "Activity Price",
+    "vipPriceLabel": "VIP Price",
+    "quantity": "Quantity",
+    "couponUseLevel": "Min. {level} CNY",
+    "couponExpiry": "Valid until",
+    "couponForever": "Permanent",
+    "couponReason": "Reason",
+    "couponUsage": "Usage",
+    "couponType0": "All Products",
+    "couponType1": "Specific Courses",
+    "couponType2": "Course Categories",
+    "couponCount": "{count} coupons",
+		"rechargeConsumptionList": "Recharge and consumption records",
+		"rechargeAmount": "Recharge amount",
+		"valueAddedServices": "Value-added services",
+		"readAgree": "I have read and agreed",
+		"readAgreeServices": "Please read and agree to the value-added services first"
+  },
+  "vip": {
+    "courseVip": "Course VIP",
+    "bookVip": "E-Book VIP",
+    "openVip": "Open Now",
+    "renewal": "Renewal",
+    "daily": "Daily"
   }
 }

locale/zh-Hans.json

@@ -16,7 +16,9 @@
     "dataNull": "暂无数据",
     "networkConnectionError": "网络连接错误。",
     "loginExpired": "登录失效，请重新登录。",
-    "requestException": "请求异常"
+    "requestException": "请求异常",
+    "coin": "天医币",
+    "days": "天"
   },
   "tabar.course": "课程",
   "tabar.book": "图书",
@@ -208,7 +210,8 @@
     "seasonCard": "季卡",
     "yearCard": "年卡",
     "days": "天",
-    "selectPackage": "请选择套餐"
+    "selectPackage": "请选择套餐",
+		"consumptionRecord": "消费记录"
   },
   "book": {
     "title": "我的书单",
@@ -264,7 +267,6 @@
     "amount": "金额",
     "paymentMethod": "支付方式",
     "googlePay": "Google Pay",
-    "virtualCoin": "虚拟币",
     "balance": "余额",
     "confirm": "确认下单",
     "creating": "创建订单中...",
@@ -413,6 +415,73 @@
   },
   "order": {
     "selectFuduScheme": "选择复读方案",
-    "selectPurchaseScheme": "选择购买方案"
+    "selectPurchaseScheme": "选择购买方案",
+    "confirmTitle": "确认订单",
+    "goodsInfo": "商品信息",
+    "priceDetail": "价格明细",
+    "totalPrice": "商品总价",
+    "coupon": "优惠券",
+    "points": "积分",
+    "vipDiscount": "VIP专享立减",
+    "promotionDiscounted": "活动立减",
+    "actualPayment": "实付款",
+    "paymentMethod": "支付方式",
+    "balance": "余额",
+    "recharge": "立即充值",
+    "remark": "订单备注",
+    "remarkPlaceholder": "选填：给商家留言",
+    "remarkTitle": "订单备注",
+    "submit": "立即支付",
+    "submitting": "提交中...",
+    "total": "合计",
+    "noCoupon": "暂无可用优惠券",
+    "unavailable": "不可用",
+    "selectCoupon": "请选择优惠券",
+    "notUseCoupon": "不使用优惠券",
+    "reselect": "重新选择",
+    "selected": "选好了",
+    "maxPoints": "可用积分({max}分)",
+    "pointsPlaceholder": "请输入积分",
+    "allPoints": "全部积分",
+    "insufficientBalance": "天医币余额不足",
+    "invalidPaymentAmount": "实付金额计算未完成",
+    "orderCreating": "正在请求订单",
+    "orderSuccess": "购买成功",
+    "orderFailed": "失败,请重新下单",
+    "tooFrequent": "操作太频繁了，休息下吧",
+    "duplicateOrder": "您短时间内有一笔相同金额的订单，是否确定继续下单？",
+    "duplicateConfirm": "继续操作",
+    "duplicateCancel": "点错了",
+    "customerService": "客服",
+    "paymentTipTitle": "说明",
+    "paymentTip1": "1. 1积分=1天医币",
+    "paymentTip2-1": "2. 若有疑问请加客服微信：{ customerServiceWechat }  { customerServiceEmail }",
+    "paymentTip2-2": "或邮箱联系",
+    "ensureBalance": "确保您的天医币足够支付",
+    "vipLabel": "VIP优惠",
+    "activityLabel": "活动价",
+    "vipPriceLabel": "VIP到手价",
+    "quantity": "数量",
+    "couponUseLevel": "满{level}元可用",
+    "couponExpiry": "有效期至",
+    "couponForever": "永久有效",
+    "couponReason": "不可用原因",
+    "couponUsage": "使用说明",
+    "couponType0": "全场通用",
+    "couponType1": "指定课程可用",
+    "couponType2": "指定课程品类可用",
+    "couponCount": "共 {count} 张",
+		"rechargeConsumptionList": "充值消费记录",
+		"rechargeAmount": "充值金额",
+		"valueAddedServices": "增值服务",
+		"readAgree": "我已阅读并同意",
+		"readAgreeServices": "请先阅读并同意增值服务"
+  },
+  "vip": {
+    "courseVip": "课程VIP",
+    "bookVip": "电子书VIP",
+    "openVip": "立即开通",
+    "renewal": "续费",
+    "daily": "日均"
   }
 }

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "Amazing Limited",
+    "name" : "太湖国际",
     "appid" : "__UNI__1250B39",
-    "description" : "Amazing Limited",
-    "versionName" : "1.0.2",
-    "versionCode" : 102,
+    "description" : "太湖国际",
+    "versionName" : "1.0.4",
+    "versionCode" : 104,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -99,6 +99,22 @@
             "splashscreen" : {
                 "useOriginalMsgbox" : true
             }
+        },
+        "nativePlugins" : {
+            "sn-googlepay5" : {
+                "__plugin_info__" : {
+                    "name" : "安卓 google pay v7 v8插件",
+                    "description" : "安卓 google pay v7,v8支付(内购，订阅，更改订阅)插件",
+                    "platforms" : "Android",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=12608",
+                    "android_package_name" : "com.amazinglimited",
+                    "ios_bundle_id" : "",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "12608",
+                    "parameters" : {}
+                }
+            }
         }
     },
     /* 快应用特有相关 */

package.json

@@ -8,10 +8,10 @@
     "太湖国际",
     "中医学 国学 心理学"
   ],
-  "scripts": {  
+  "scripts": {
     "tailwind-dev": "npx @tailwindcss/cli -i ./tailwind-input.css -o ./style/tailwind.css --watch",
     "tailwind-build": "npx @tailwindcss/cli -i ./tailwind-input.css -o ./style/tailwind.css"
-  },  
+  },
   "dcloudext": {
     "sale": {
       "regular": {

pages.json

@@ -67,6 +67,18 @@
 				"navigationBarTitleText": "%user.feedback%",
 				"navigationStyle": "custom"
 			}
+		}, {
+			"path": "pages/user/recharge/index",
+			"style": {
+				"navigationBarTitleText": "%user.recharge%",
+				"navigationStyle": "custom"
+			}
+		},{
+			"path": "pages/user/virtual/index",
+			"style": {
+				"navigationBarTitleText": "%user.virtual%",
+				"navigationStyle": "custom"
+			}
 		}, {
 			"path": "pages/user/myBook/index",
 			"style": {
@@ -152,10 +164,42 @@
 				"navigationBarTitleText": "%courseDetails.chapter%"
 			}
 		}, {
-			"path": "pages/course/order",
+			"path": "pages/order/goodsConfirm",
 			"style": {
 				"navigationStyle": "custom",
-				"navigationBarTitleText": "%courseOrder.orderTitle%"
+				"navigationBarTitleText": "%order.confirmTitle%"
+			}
+		}, {
+			"path": "pages/order/vipConfirm",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "%order.confirmTitle%"
+			}
+		}, {
+			"path": "pages/vip/course",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "%order.courseVip%"
+			}
+		}, {
+			"path": "pages/vip/book",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "%order.bookVip%"
+			}
+		}, {
+			"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
+			"style": {
+				"disableScroll": true,
+				"app-plus": {
+					"backgroundColorTop": "transparent",
+					"background": "transparent",
+					"titleNView": false,
+					"scrollIndicator": false,
+					"popGesture": "none",
+					"animationType": "fade-in",
+					"animationDuration": 200
+				}
 			}
 		}
 	],

pages/book/detail.vue

@@ -202,6 +202,7 @@ onLoad((options: any) => {
 
 onShow(() => {
   loadBookInfo()
+  loadGoodsInfo()
   if (!isIOS.value) {
     loadComments()
   }
@@ -234,22 +235,24 @@ async function loadBookInfo() {
     
     if (res.bookInfo) {
       bookInfo.value = res.bookInfo
-      goodsList.value = [{
-        productId: bookId.value,
-        productName: bookInfo.value.name,
-        productImages: bookInfo.value.images,
-        price: bookInfo.value.priceData?.dictValue || 0,
-        vipPrice: null,
-        activityPrice: null,
-        isVipPrice: 0,
-        productAmount: 1,
-      }]
     }
   } catch (error) {
     console.error('Failed to load book info:', error)
   }
 }
 
+// 加载购买商品信息
+async function loadGoodsInfo() {
+  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() {
   try {
@@ -305,9 +308,9 @@ function closePurchasePopup() {
 }
 
 // 处理购买
-function handlePurchase() {
+function handlePurchase(goods: IGoods) {
   uni.navigateTo({
-    url: `/pages/book/order?id=${bookId.value}`
+    url: `/pages/order/goodsConfirm?goods=${goods.productId}`
   })
 }
 

pages/book/index.vue

@@ -162,9 +162,7 @@
           >
             <image :src="item.images" />
             <text class="book-text">{{ item.name }}</text>
-            <text v-if="formatPrice(item)" class="book-price">{{
-              formatPrice(item)
-            }}</text>
+            <text class="book-price">{{ item.minPrice }} 天医币</text>
             <text v-if="formatStats(item)" class="book-flag">{{
               formatStats(item)
             }}</text>

pages/course/details/course.vue

@@ -13,7 +13,7 @@
     </view>
 
     <!-- 课程信息 -->
-    <CourseInfo v-if="courseDetail" :course="courseDetail" class="pt-[40px]" />
+    <CourseInfo v-if="courseDetail" :course="courseDetail" :class="{'pt-10': !!vipTip}" />
 
     <!-- 课程内容包装器 -->
     <view class="course-content-wrapper">
@@ -259,60 +259,47 @@ onLoad(async (options: any) => {
  * 加载页面数据
  */
 const loadPageData = async () => {
-  try {
-    uni.showLoading({ title: '加载中...' })
+  // 获取课程详情
+  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 || []
     
-    // 获取课程详情
-    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) {
+      const totalProgress = catalogueList.value.reduce((sum, cat) => sum + cat.completion, 0)
+      learningProgress.value = Number((totalProgress / catalogueList.value.length).toFixed(2))
     }
     
-    // 检查VIP权益
-    await checkVipStatus()
-    
-    // 加载评论
-    await loadComments()
-    
-  } catch (error) {
-    console.error('加载页面数据失败:', error)
-  } finally {
-    uni.hideLoading()
+    // 默认选择第一个目录
+    if (catalogueList.value.length > 0) {
+      await switchCatalogue(0)
+    }
   }
+  
+  // 检查VIP权益
+  await checkVipStatus()
+  
+  // 加载评论
+  await loadComments()
 }
 
 /**
  * 检查VIP状态
  */
 const checkVipStatus = async () => {
-  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 || []
-        }
+  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)
   }
 }
 
@@ -324,21 +311,17 @@ const switchCatalogue = async (index: number) => {
   const catalogue = catalogueList.value[index]
   
   // 获取章节列表
-  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)
+  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
   }
 }
 
@@ -366,18 +349,12 @@ const handleChapterClick = (chapter: IChapter) => {
 const handleGetFreeCourse = async () => {
   if (!currentCatalogue.value) return
   
-  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()
+  uni.showLoading({ title: '领取中...' })
+  const res = await courseApi.startStudyForMF(currentCatalogue.value.id)
+  if (res.code === 0) {
+    uni.showToast({ title: '领取成功', icon: 'success' })
+    // 刷新页面数据
+    await loadPageData()
   }
 }
 
@@ -387,17 +364,13 @@ const handleGetFreeCourse = async () => {
 const handlePurchase = async () => {
   if (!currentCatalogue.value) return
   
-  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)
+  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' })
   }
 }
 
@@ -407,18 +380,14 @@ const handlePurchase = async () => {
 const handleRenew = async () => {
   if (!currentCatalogue.value) return
   
-  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)
+  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' })
   }
 }
 
@@ -449,24 +418,13 @@ const closeGoodsSelector = () => {
  */
 const confirmPurchase = () => {
   showProtocol.value = false
-  uni.showToast({ icon: 'none', title: '订单及支付功能开发中' })
-  return false
   if (!selectedGoods.value) return
   
   showProtocol.value = false
   
   // 跳转到确认订单页
-  const orderData = {
-    goods: [{ ...selectedGoods.value, productAmount: 1 }],
-    typeId: 0,
-    navTitle: courseDetail.value?.title,
-    title: courseDetail.value?.title,
-    isFudu: isFudu.value,
-    fuduId: isFudu.value ? fuduCatalogueId.value : undefined
-  }
-  
   uni.navigateTo({
-    url: `/pages/course/order?data=${encodeURIComponent(JSON.stringify(orderData))}`
+    url: `/pages/order/goodsConfirm?goods=${selectedGoods.value.productId}`
   })
 }
 
@@ -474,10 +432,8 @@ const confirmPurchase = () => {
  * 跳转到VIP页面
  */
 const goToVip = () => {
-  uni.showToast({ icon: 'none', title: 'VIP功能开发中' })
-  return false
   uni.navigateTo({
-    url: '/pages/user/wallet/index'
+    url: '/pages/vip/course'
   })
 }
 

pages/course/order.vue

@@ -1,672 +0,0 @@
-<template>
-  <view class="course-order-page">
-    <!-- 自定义导航栏 -->
-    <nav-bar :title="$t('courseOrder.orderTitle')" />
-    
-    <!-- 页面内容 -->
-    <view class="page-content">
-      <!-- 商品列表 -->
-      <view class="goods-section">
-        <view class="section-title">商品信息</view>
-        <view
-          v-for="(item, index) in goodsList"
-          :key="index"
-          class="goods-item"
-        >
-          <view class="goods-image">
-            <!-- VIP优惠标签 -->
-            <view
-              v-if="item.isVipPrice === 1 && item.vipPrice"
-              class="vip-badge"
-            >
-              VIP优惠
-            </view>
-            <image
-              :src="item.productImages || '/static/nobg.jpg'"
-              mode="aspectFit"
-            />
-          </view>
-          
-          <view class="goods-info">
-            <text class="goods-name">{{ item.productName }}</text>
-            
-            <!-- 价格信息 -->
-            <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">VIP到手价</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">活动价</text>
-                <text class="original-price">￥{{ item.price.toFixed(2) }}</text>
-              </view>
-              
-              <!-- 普通价格 -->
-              <view v-else class="price-row">
-                <text class="normal-price">￥{{ item.price.toFixed(2) }}</text>
-              </view>
-            </view>
-            
-            <!-- 数量 -->
-            <view class="quantity">
-              <text>数量：{{ item.productAmount || 1 }}</text>
-            </view>
-          </view>
-        </view>
-      </view>
-      
-      <!-- 收货地址（仅实体商品显示） -->
-      <view v-if="!isHideAddress" class="address-section">
-        <view class="section-title">收货地址</view>
-        <view v-if="selectedAddress" class="address-info" @click="selectAddress">
-          <view class="address-row">
-            <text class="name">{{ selectedAddress.name }}</text>
-            <text class="phone">{{ selectedAddress.phone }}</text>
-          </view>
-          <view class="address-detail">
-            {{ selectedAddress.province }} {{ selectedAddress.city }} {{ selectedAddress.district }} {{ selectedAddress.detail }}
-          </view>
-        </view>
-        <view v-else class="no-address" @click="selectAddress">
-          <wd-icon name="add-circle" size="24px" />
-          <text>添加收货地址</text>
-        </view>
-      </view>
-      
-      <!-- 订单信息 -->
-      <view class="order-info-section">
-        <view class="info-row">
-          <text class="label">商品金额</text>
-          <text class="value">￥{{ goodsAmount.toFixed(2) }}</text>
-        </view>
-        <view v-if="!isHideAddress" class="info-row">
-          <text class="label">运费</text>
-          <text class="value">￥{{ freight.toFixed(2) }}</text>
-        </view>
-        <view v-if="availablePoints > 0" class="info-row">
-          <text class="label">可用积分</text>
-          <text class="value">{{ availablePoints }} 分（可抵扣 ￥{{ pointsDiscount.toFixed(2) }}）</text>
-        </view>
-      </view>
-      
-      <!-- 订单总价 -->
-      <view class="total-section">
-        <view class="total-row">
-          <text class="label">订单总价</text>
-          <text class="value">￥{{ totalAmount.toFixed(2) }}</text>
-        </view>
-      </view>
-    </view>
-    
-    <!-- 底部操作栏 -->
-    <view class="bottom-bar">
-      <view class="total-info">
-        <text class="label">合计：</text>
-        <text class="amount">￥{{ totalAmount.toFixed(2) }}</text>
-      </view>
-      <wd-button
-        type="primary"
-        :loading="submitting"
-        @click="submitOrder"
-      >
-        提交订单
-      </wd-button>
-    </view>
-  </view>
-</template>
-
-<script setup lang="ts">
-import { ref, computed, onMounted } from 'vue'
-import { onLoad } from '@dcloudio/uni-app'
-import { useUserStore } from '@/stores/user'
-import NavBar from '@/components/nav-bar/nav-bar.vue'
-import type { IOrderGoods, IOrderInitData } from '@/types/course'
-
-interface OrderData {
-  goods: IOrderGoods[]
-  typeId?: number
-  navTitle?: string
-  title?: string
-  isFudu?: boolean
-  fuduId?: number
-  isVip?: boolean
-}
-
-// Stores
-const userStore = useUserStore()
-
-// 页面数据
-const orderData = ref<OrderData>({
-  goods: []
-})
-const goodsList = ref<IOrderGoods[]>([])
-const initData = ref<IOrderInitData | null>(null)
-const selectedAddress = ref<any>(null)
-const isHideAddress = ref(false)
-const availablePoints = ref(0)
-const freight = ref(0)
-const submitting = ref(false)
-
-/**
- * 商品金额
- */
-const goodsAmount = computed(() => {
-  return goodsList.value.reduce((sum, item) => {
-    const price = item.isVipPrice === 1 && item.vipPrice 
-      ? item.vipPrice 
-      : item.activityPrice || item.price
-    return sum + price * (item.productAmount || 1)
-  }, 0)
-})
-
-/**
- * 积分抵扣金额
- */
-const pointsDiscount = computed(() => {
-  // 假设100积分可抵扣1元
-  return Math.min(availablePoints.value / 100, goodsAmount.value * 0.1)
-})
-
-/**
- * 订单总价
- */
-const totalAmount = computed(() => {
-  return Math.max(0, goodsAmount.value + freight.value - pointsDiscount.value)
-})
-
-/**
- * 页面加载
- */
-onLoad(async (options: any) => {
-  if (options.data) {
-    try {
-      orderData.value = JSON.parse(decodeURIComponent(options.data))
-      goodsList.value = orderData.value.goods || []
-      
-      await initOrder()
-    } catch (error) {
-      console.error('解析订单数据失败:', error)
-      uni.showToast({
-        title: '订单数据错误',
-        icon: 'none'
-      })
-    }
-  }
-})
-
-/**
- * 初始化订单
- */
-const initOrder = async () => {
-  try {
-    uni.showLoading({ title: '加载中...' })
-    
-    // 根据订单类型调用不同的初始化接口
-    if (orderData.value.isVip) {
-      // VIP订单
-      await initVipOrder()
-    } else if (orderData.value.isFudu) {
-      // 复读订单
-      await initFuduOrder()
-    } else {
-      // 普通订单
-      await initNormalOrder()
-    }
-  } catch (error) {
-    console.error('初始化订单失败:', error)
-  } finally {
-    uni.hideLoading()
-  }
-}
-
-/**
- * 初始化普通订单
- */
-const initNormalOrder = async () => {
-  try {
-    const res = await uni.request({
-      url: uni.getStorageSync('baseURL') + 'common/buyOrder/initPrepareOrder',
-      method: 'POST',
-      header: {
-        'Content-Type': 'application/json',
-        'token': userStore.token
-      },
-      data: {
-        uid: userStore.userInfo.id,
-        productList: goodsList.value.map(item => ({
-          productId: item.productId,
-          quantity: item.productAmount || 1
-        }))
-      }
-    })
-    
-    const data = res.data as any
-    if (data.code === 0 && data.data) {
-      initData.value = data.data
-      isHideAddress.value = data.data.is_course || false
-      availablePoints.value = data.data.user?.jf || 0
-      
-      // 如果有默认地址，设置为选中地址
-      if (data.data.addressList && data.data.addressList.length > 0) {
-        selectedAddress.value = data.data.addressList.find((addr: any) => addr.isDefault === 1) 
-          || data.data.addressList[0]
-      }
-    }
-  } catch (error) {
-    console.error('初始化普通订单失败:', error)
-  }
-}
-
-/**
- * 初始化复读订单
- */
-const initFuduOrder = async () => {
-  // 复读订单不需要地址
-  isHideAddress.value = true
-  
-  // 获取用户信息
-  try {
-    const res = await uni.request({
-      url: uni.getStorageSync('baseURL') + 'common/user/getUserInfo',
-      method: 'POST',
-      header: {
-        'Content-Type': 'application/json',
-        'token': userStore.token
-      },
-      data: {}
-    })
-    
-    const data = res.data as any
-    if (data.code === 0 && data.result) {
-      initData.value = {
-        user: data.result,
-        is_course: true
-      }
-      availablePoints.value = data.result.jf || 0
-    }
-  } catch (error) {
-    console.error('获取用户信息失败:', error)
-  }
-}
-
-/**
- * 初始化VIP订单
- */
-const initVipOrder = async () => {
-  // VIP订单不需要地址
-  isHideAddress.value = true
-  
-  // 获取用户信息
-  try {
-    const res = await uni.request({
-      url: uni.getStorageSync('baseURL') + 'common/user/getUserInfo',
-      method: 'POST',
-      header: {
-        'Content-Type': 'application/json',
-        'token': userStore.token
-      },
-      data: {}
-    })
-    
-    const data = res.data as any
-    if (data.code === 0 && data.result) {
-      initData.value = {
-        user: data.result,
-        is_course: true
-      }
-      // VIP订单不使用积分
-      availablePoints.value = 0
-    }
-  } catch (error) {
-    console.error('获取用户信息失败:', error)
-  }
-}
-
-/**
- * 选择地址
- */
-const selectAddress = () => {
-  // 跳转到地址选择页面
-  uni.navigateTo({
-    url: '/pages/user/address/list'
-  })
-}
-
-/**
- * 提交订单
- */
-const submitOrder = async () => {
-  // 验证
-  if (!isHideAddress.value && !selectedAddress.value) {
-    uni.showToast({
-      title: '请选择收货地址',
-      icon: 'none'
-    })
-    return
-  }
-  
-  try {
-    submitting.value = true
-    
-    let orderUrl = ''
-    let orderParams: any = {}
-    
-    if (orderData.value.isVip) {
-      // VIP订单
-      orderUrl = 'common/userVip/placeVipOrder'
-      orderParams = {
-        vipConfigId: goodsList.value[0].productId,
-        payType: 1 // 默认支付方式
-      }
-    } else if (orderData.value.isFudu) {
-      // 复读订单
-      orderUrl = 'common/courseRelearn/relearnSave'
-      orderParams = {
-        catalogueId: orderData.value.fuduId,
-        productId: goodsList.value[0].productId,
-        quantity: 1
-      }
-    } else {
-      // 普通订单
-      orderUrl = 'book/buyOrder/placeOrder'
-      orderParams = {
-        uid: userStore.userInfo.id,
-        addressId: selectedAddress.value?.id,
-        productList: goodsList.value.map(item => ({
-          productId: item.productId,
-          quantity: item.productAmount || 1
-        })),
-        usePoints: pointsDiscount.value > 0
-      }
-    }
-    
-    const res = await uni.request({
-      url: uni.getStorageSync('baseURL') + orderUrl,
-      method: 'POST',
-      header: {
-        'Content-Type': 'application/json',
-        'token': userStore.token
-      },
-      data: orderParams
-    })
-    
-    const data = res.data as any
-    if (data.code === 0) {
-      uni.showToast({
-        title: '订单创建成功',
-        icon: 'success'
-      })
-      
-      // 跳转到支付页面或订单详情
-      setTimeout(() => {
-        uni.redirectTo({
-          url: `/pages/user/order/index`
-        })
-      }, 1500)
-    } else {
-      uni.showToast({
-        title: data.errMsg || '订单创建失败',
-        icon: 'none'
-      })
-    }
-  } catch (error) {
-    console.error('提交订单失败:', error)
-    uni.showToast({
-      title: '提交失败',
-      icon: 'none'
-    })
-  } finally {
-    submitting.value = false
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.course-order-page {
-  min-height: 100vh;
-  background-color: #f5f5f5;
-  padding-bottom: 120rpx;
-}
-
-.page-content {
-  padding: 20rpx;
-}
-
-.section-title {
-  font-size: 30rpx;
-  font-weight: 500;
-  color: #333;
-  margin-bottom: 20rpx;
-}
-
-.goods-section {
-  background-color: #fff;
-  padding: 20rpx;
-  border-radius: 12rpx;
-  margin-bottom: 20rpx;
-  
-  .goods-item {
-    display: flex;
-    padding: 20rpx 0;
-    border-bottom: 1px solid #f0f0f0;
-    
-    &:last-child {
-      border-bottom: none;
-    }
-    
-    .goods-image {
-      position: relative;
-      width: 140rpx;
-      height: 140rpx;
-      flex-shrink: 0;
-      margin-right: 20rpx;
-      background-color: #f5f5f5;
-      border-radius: 8rpx;
-      overflow: hidden;
-      
-      .vip-badge {
-        position: absolute;
-        top: 0;
-        left: 0;
-        padding: 4rpx 10rpx;
-        background-color: #f94f04;
-        color: #fff;
-        font-size: 20rpx;
-        border-radius: 8rpx 0 8rpx 0;
-        z-index: 1;
-      }
-      
-      image {
-        width: 100%;
-        height: 100%;
-      }
-    }
-    
-    .goods-info {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      
-      .goods-name {
-        font-size: 28rpx;
-        color: #333;
-        line-height: 1.4;
-        margin-bottom: 10rpx;
-      }
-      
-      .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 {
-        font-size: 24rpx;
-        color: #999;
-      }
-    }
-  }
-}
-
-.address-section {
-  background-color: #fff;
-  padding: 20rpx;
-  border-radius: 12rpx;
-  margin-bottom: 20rpx;
-  
-  .address-info {
-    padding: 20rpx;
-    background-color: #f7f8f9;
-    border-radius: 8rpx;
-    
-    .address-row {
-      display: flex;
-      justify-content: space-between;
-      margin-bottom: 10rpx;
-      
-      .name {
-        font-size: 28rpx;
-        font-weight: 500;
-        color: #333;
-      }
-      
-      .phone {
-        font-size: 28rpx;
-        color: #666;
-      }
-    }
-    
-    .address-detail {
-      font-size: 26rpx;
-      color: #666;
-      line-height: 1.5;
-    }
-  }
-  
-  .no-address {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 10rpx;
-    padding: 40rpx 20rpx;
-    background-color: #f7f8f9;
-    border-radius: 8rpx;
-    color: #999;
-    font-size: 28rpx;
-  }
-}
-
-.order-info-section {
-  background-color: #fff;
-  padding: 20rpx;
-  border-radius: 12rpx;
-  margin-bottom: 20rpx;
-  
-  .info-row {
-    display: flex;
-    justify-content: space-between;
-    padding: 15rpx 0;
-    font-size: 28rpx;
-    
-    .label {
-      color: #666;
-    }
-    
-    .value {
-      color: #333;
-      font-weight: 500;
-    }
-  }
-}
-
-.total-section {
-  background-color: #fff;
-  padding: 20rpx;
-  border-radius: 12rpx;
-  
-  .total-row {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    
-    .label {
-      font-size: 30rpx;
-      color: #333;
-      font-weight: 500;
-    }
-    
-    .value {
-      font-size: 36rpx;
-      color: #ff4444;
-      font-weight: bold;
-    }
-  }
-}
-
-.bottom-bar {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 20rpx;
-  background-color: #fff;
-  box-shadow: 0 -2px 12px rgba(0, 0, 0, 0.1);
-  z-index: 999;
-  
-  .total-info {
-    flex: 1;
-    
-    .label {
-      font-size: 28rpx;
-      color: #666;
-    }
-    
-    .amount {
-      font-size: 36rpx;
-      color: #ff4444;
-      font-weight: bold;
-      margin-left: 10rpx;
-    }
-  }
-}
-</style>

pages/order/goodsConfirm.vue

@@ -0,0 +1,239 @@
+<template>
+  <view>
+    <!-- 自定义导航栏 -->
+    <nav-bar :title="$t('order.confirmTitle')" />
+
+    <!-- 确认订单组件 -->
+    <Confirm :goodsList="goodsList" :userInfo="userInfo">
+      <template #goodsList>
+        <!-- 商品列表内容 -->
+        <view
+          v-for="(item, index) in goodsList"
+          :key="index"
+          class="goods-item"
+        >
+          <!-- VIP优惠标签 -->
+          <wd-tag v-if="item.isVipPrice === 1 && item.vipPrice" type="danger" mark custom-class="vip-badge">{{ $t('order.vipLabel') }}</wd-tag>
+          
+          <!-- 商品图片 -->
+          <view class="goods-image">
+            <image
+              :src="item.productImages || '/static/nobg.jpg'"
+              mode="aspectFit"
+            />
+          </view>
+          
+          <!-- 商品信息 -->
+          <view class="goods-info">
+            <text class="goods-name">{{ item.productName }}</text>
+            
+            <!-- 价格信息 -->
+            <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">
+              <text class="quantity-label">{{ $t('order.quantity') }}：</text>
+              <view v-if="showNumber" class="quantity-control">
+                <wd-number-box
+                  v-model="item.productAmount"
+                  :min="1"
+                  @change="handleQuantityChange(item, $event)"
+                />
+              </view>
+              <text v-else>X {{ item.productAmount }}</text>
+            </view> -->
+          </view>
+        </view>
+      </template>
+    </Confirm>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { orderApi } from '@/api/modules/order'
+import Confirm from '@/components/order/Confirm.vue';
+import type { IOrderGoods } from '@/types/order'
+
+/**
+ * 获取用户信息
+ */
+const userInfo = ref(null)
+const getUserInfo = async () => {
+  try {
+    const res = await orderApi.getUserInfo()
+    if (res.code === 0) {
+      userInfo.value = res.result || {}
+    }
+  } catch (error) {
+    console.error('获取用户信息失败:', error)
+  }
+}
+
+/**
+ * 获取商品列表
+ */
+const goodsIds = ref<string>('')
+const goodsList = ref<IOrderGoods[]>([])
+const getGoodsList = async () => {
+  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)
+  }
+}
+
+/**
+ * 页面加载
+ */
+onLoad(async (options: any) => {
+  if (options.goods) {
+    try {
+      // 获取用户信息
+      await getUserInfo()
+
+      // 根据商品ID获取商品详细信息
+      goodsIds.value = options.goods || ''
+      getGoodsList()
+    } catch (error) {
+      console.error('解析商品数据失败:', error)
+      uni.showToast({
+        title: '商品数据错误',
+        icon: 'none'
+      })
+    }
+  }
+})
+</script>
+
+<style lang="scss" scoped>
+.goods-item {
+  position: relative;
+  display: flex;
+  padding-bottom: 20rpx;
+  border-bottom: 1px solid #f0f0f0;
+  
+  &:last-child {
+    border-bottom: none;
+    padding-bottom: 0;
+  }
+  
+  .vip-badge {
+    position: absolute;
+    top: 20rpx;
+    left: 0;
+    z-index: 1;
+  }
+  
+  .goods-image {
+    width: 140rpx;
+    height: 140rpx;
+    flex-shrink: 0;
+    margin-right: 20rpx;
+    background-color: #f5f5f5;
+    border-radius: 8rpx;
+    overflow: hidden;
+    
+    image {
+      width: 100%;
+      height: 100%;
+    }
+  }
+  
+  .goods-info {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    
+    .goods-name {
+      font-size: 28rpx;
+      color: #333;
+      line-height: 1.4;
+      margin-bottom: 10rpx;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      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;
+      font-size: 24rpx;
+      color: #999;
+      
+      .quantity-label {
+        margin-right: 10rpx;
+      }
+      
+      .quantity-control {
+        display: flex;
+        align-items: center;
+      }
+    }
+  }
+}
+
+</style>

pages/order/vipConfirm.vue

@@ -0,0 +1,152 @@
+<template>
+  <view>
+    <!-- 自定义导航栏 -->
+    <nav-bar :title="$t('order.confirmTitle')" />
+
+    <!-- 确认订单组件 -->
+    <Confirm :goodsList="goodsList" :userInfo="userInfo" :orderType="orderType" :allowPointPay="isLengthen" :backStep="orderType === 'abroadVip' ? 2 : 1">
+      <!-- 商品列表内容 -->
+      <template #goodsList>
+        <view class="goods-item" v-for="goods in goodsList" :key="goods.productId">
+          <!-- VIP优惠标签 -->
+          <wd-tag v-if="goods.isVipPrice === 1 && goods.vipPrice" type="danger" mark custom-class="vip-badge">{{ $t('order.vipLabel') }}</wd-tag>
+          
+          <!-- 商品图片 -->
+          <view class="goods-image">
+            <image
+              :src="goods.productImages || '/static/nobg.jpg'"
+              mode="aspectFit"
+            />
+          </view>
+          
+          <!-- 商品信息 -->
+          <view class="goods-info">
+            <text class="goods-name">{{ goods.productName }}</text>
+            <!-- 商品价格组件 -->
+            <GoodsPrice :goods="goods" />
+          </view>
+        </view>
+      </template>
+    </Confirm>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+import { onLoad, onUnload } 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';
+
+/**
+ * 获取用户信息
+ */
+const userInfo = ref({})
+const getUserInfo = async () => {
+  const res = await orderApi.getUserInfo()
+  userInfo.value = res.result || {}
+}
+
+// 商品列表
+const goodsList = ref<IOrderGoods[]>([])
+const isLengthen = ref<boolean>(false)
+const orderType = ref<string>('')
+
+/**
+ * 页面加载
+ */
+onLoad(async () => {
+  try {
+    // 获取商品列表
+    uni.$on('selectedGoods', (data: IOrderGoods) => {
+      console.log('监听到传入的商品数据:', data)
+      isLengthen.value = data.state !== null
+      orderType.value = data.orderType || ''
+      goodsList.value = [ data ]
+    })
+    // 获取用户信息
+    getUserInfo()
+  } catch (error) {
+    console.error('解析商品数据失败:', error)
+    uni.showToast({
+      title: '商品数据错误',
+      icon: 'none'
+    })
+  }
+})
+
+onUnload(() => {
+  uni.$off('selectedGoods')
+})
+</script>
+
+<style lang="scss" scoped>
+.goods-item {
+  position: relative;
+  display: flex;
+  padding-bottom: 20rpx;
+  border-bottom: 1px solid #f0f0f0;
+  
+  &:last-child {
+    border-bottom: none;
+    padding-bottom: 0;
+  }
+  
+  .vip-badge {
+    position: absolute;
+    top: 20rpx;
+    left: 0;
+    z-index: 1;
+  }
+  
+  .goods-image {
+    width: 140rpx;
+    height: 140rpx;
+    flex-shrink: 0;
+    margin-right: 20rpx;
+    background-color: #f5f5f5;
+    border-radius: 8rpx;
+    overflow: hidden;
+    
+    image {
+      width: 100%;
+      height: 100%;
+    }
+  }
+  
+  .goods-info {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    
+    .goods-name {
+      font-size: 28rpx;
+      color: #333;
+      line-height: 1.4;
+      margin-bottom: 10rpx;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+    }
+    
+    .quantity-row {
+      display: flex;
+      align-items: center;
+      font-size: 24rpx;
+      color: #999;
+      
+      .quantity-label {
+        margin-right: 10rpx;
+      }
+      
+      .quantity-control {
+        display: flex;
+        align-items: center;
+      }
+    }
+  }
+}
+
+</style>

pages/user/index.vue

@@ -1,343 +1,421 @@
 <template>
-  <view class="user-page" :style="{ paddingTop: getNotchHeight() + 30 + 'px' }">
-    <!-- 设置图标 -->
-    <view class="settings-icon" :style="{ top: getNotchHeight() + 30 + 'px' }" @click="goSettings">
-      <wd-icon name="setting1" size="24px" color="#666" />
-      <text>{{ $t('user.settings') }}</text>
-    </view>
+	<view class="user-page" :style="{ paddingTop: getNotchHeight() + 30 + 'px' }">
+		<!-- 设置图标 -->
+		<view class="settings-icon" :style="{ top: getNotchHeight() + 30 + 'px' }" @click="goSettings">
+			<wd-icon name="setting1" size="24px" color="#666" />
+			<text>{{ $t('user.settings') }}</text>
+		</view>
 
-    <!-- 用户信息区域 -->
-    <view class="user-info-section">
-      <view class="user-info">
-        <image 
-          :src="userInfo.avatar || defaultAvatar" 
-          class="avatar"
-          @click="goProfile"
-        />
-        <view class="user-details">
-          <text class="nickname">{{ userInfo.nickname || $t('user.notSet') }}</text>
-          <text v-if="userInfo.email" class="email">{{ userInfo.email }}</text>
-          <text v-if="vipInfo.endTime && platform === 'ios'" class="vip-time">
-            VIP {{ vipInfo.endTime.split(' ')[0] }} {{ $t('user.vipExpireTime') }}
-          </text>
-        </view>
-      </view>
-    </view>
+		<!-- 用户信息区域 -->
+		<view class="user-info-section">
+			<view class="user-info">
+				<image :src="userInfo.avatar || defaultAvatar" class="avatar" @click="goProfile" />
+				<view class="user-details">
+					<text class="nickname">{{ userInfo.nickname || $t('user.notSet') }}</text>
+					<text v-if="userInfo.email" class="email">{{ userInfo.email }}</text>
+					<text v-if="vipInfo.endTime && platform === 'ios'" class="vip-time">
+						VIP {{ vipInfo.endTime.split(' ')[0] }} {{ $t('user.vipExpireTime') }}
+					</text>
+				</view>
+			</view>
+		</view>
 
-    <!-- VIP订阅卡片 -->
-    <view class="vip-card-section">
-      <view class="vip-card">
-        用户VIP功能重写中。。。
-        <!-- <view v-if="vipInfo.id" class="vip-info">
-          <text class="label">{{ $t('user.vip') }}</text>
-          <text class="value">{{ vipInfo.endTime ? vipInfo.endTime.split(' ')[0] : '' }}</text>
-        </view>
-        <wd-button 
-          v-else 
-          type="success"
-          size="small"
-          @click="goSubscribe"
-        >
-          {{ $t('user.subscribe') }}
-        </wd-button> -->
-      </view>
-    </view>
+		<!-- VIP订阅卡片 -->
+		<view class="vip-card-section">
+			<view class="vip-card">
+				<view class="vip-card-title">{{ $t('user.vip') }}</view>
+				<view class="vip-card-content">
+					<view class="vip-item-list">
+						<view v-if="vipInfo.length > 0" v-for="vip in vipInfo">{{ vipTypeDict[vip.type] }}（有效期到 {{ parseTime(vip.endTime, '{y}-{m}-{d}') }}）</view>
+						<view v-else>办理课程VIP，畅享更多权益</view>
+					</view>
+					<wd-button v-if="vipInfo.length > 0" plain type="primary" size="small" @click="goSubscribe">{{ $t('vip.renewal') }}</wd-button>
+					<wd-button v-else plain type="primary" size="small" @click="goSubscribe">{{ $t('vip.openVip') }}</wd-button>
+				</view>
+				<view class="vip-card-content">
+					<view class="vip-item-list">
+						<view v-if="vipInfoEbook.length > 0" v-for="vip in vipInfoEbook">电子书VIP{{ vipTypeDict[vip.type] }}（有效期到 {{ parseTime(vip.endTime, '{y}-{m}-{d}') }}）</view>
+						<view v-else>办理电子书VIP，畅享更多权益</view>
+					</view>
+					<wd-button v-if="!vipInfoEbook.length" plain type="primary" size="small" @click="goSubscribe">{{ $t('vip.openVip') }}</wd-button>
+				</view>
+			</view>
+		</view>
 
-    <!-- 我的资产 -->
-    <view class="vip-card-section wallet-section">
-      <view class="vip-card wallet_l">
-        我的资产功能重写中。。。
-        <!-- <text class="wallet_title">{{$t('my.coin')}}<uni-icons type="help" size="19" color="#666"></uni-icons></text>
+		<!-- 我的资产 -->
+		<view class="assets-card-section wallet-section">
+			<view class="assets-card wallet_l">
+				<view class="assets">
+					<view @click="goVirtualList">
+						<view class="assets_row">{{ t('global.coin') }}</view>
+						<view>{{userInfo.peanutCoin ?? 1}}</view>
+					</view>
+					<view>
+						<view class="assets_row">积分</view>
+						<view>{{userInfo.jf ?? 1}}</view>
+					</view>
+					<view>
+						<view class="assets_row">优惠卷</view>
+						<view>0</view>
+					</view>
+				</view>
+				<view class="chong_btn" @click="goRecharge">充 值</view>
+				<!-- <text class="wallet_title">{{$t('my.coin')}}<uni-icons type="help" size="19" color="#666"></uni-icons></text>
         <text class="wallet_count">{{userMes.peanutCoin}}</text> -->
-      </view>
-    </view>
+			</view>
+		</view>
 
-    <!-- 功能菜单列表 -->
-    <view class="menu-section">
-      <view class="menu-list">
-        <view 
-          v-for="item in menuItems" 
-          :key="item.id" 
-          class="menu-item" 
-          @click="handleMenuClick(item)"
-        >
-          <text class="menu-text">{{ item.name }}</text>
-          <wd-icon name="arrow-right" size="16px" color="#aaa" />
-        </view>
-      </view>
-    </view>
-  </view>
+		<!-- 功能菜单列表 -->
+		<view class="menu-section">
+			<view class="menu-list">
+				<view v-for="item in menuItems" :key="item.id" class="menu-item" @click="handleMenuClick(item)">
+					<text class="menu-text">{{ item.name }}</text>
+					<wd-icon name="arrow-right" size="16px" color="#aaa" />
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted } from 'vue'
-import { useUserStore } from '@/stores/user'
-import { getUserInfo, getVipInfo } from '@/api/modules/user'
-import type { IVipInfo } from '@/types/user'
-import { useI18n } from 'vue-i18n'
-import { getNotchHeight } from '@/utils/system'
+	import { ref, computed, onMounted } from 'vue'
+	import { useUserStore } from '@/stores/user'
+	import { useSysStore } from '@/stores/sys'
+	import { getUserInfo, getVipInfo } from '@/api/modules/user'
+	import type { IVipInfo } from '@/types/user'
+	import { getNotchHeight } from '@/utils/system'
+	import { parseTime } from '@/utils/index'
+	import { t } from '@/utils/i18n'
 
-const { t } = useI18n()
-const userStore = useUserStore()
+	const userStore = useUserStore()
+	const sysStore = useSysStore()
 
-// 默认头像
-const defaultAvatar = '/static/home_icon.png'
+	// 默认头像
+	const defaultAvatar = '/static/home_icon.png'
 
-// 用户信息
-const userInfo = computed(() => userStore.userInfo)
+	// 用户信息
+	const userInfo = computed(() => userStore.userInfo)
 
-// VIP信息
-const vipInfo = ref<IVipInfo>({
-  id: 0,
-  endTime: '',
-  vipType: 0
-})
+	// VIP信息
+	const vipInfo = computed(() => userStore.userVips)
+	const vipInfoEbook = computed(() => userStore.userEbookVip)
+		
+	// VIP类型字典
+	const vipTypeDict = sysStore.vipTypeDict
 
-// 平台信息
-const platform = ref('')
+	// 平台信息
+	const platform = ref('')
 
-// 菜单项
-const menuItems = computed(() => [
-  {
-    id: 1,
-    name: t('user.myOrders'),
-    url: '/pages/user/order/index',
-    type: 'pageJump'
-  },
-  {
-    id: 2,
-    name: t('user.myBooklist'),
-    url: '/pages/user/myBook/index',
-    type: 'pageJump'
-  },
-  {
-    id: 3,
-    name: t('user.profile'),
-    url: '/pages/user/profile/index',
-    type: 'pageJump'
-  },
-  {
-    id: 4,
-    name: t('user.about'),
-    url: '/pages/user/about/index',
-    type: 'pageJump'
-  },
-  {
-    id: 5,
-    name: t('user.feedback'),
-    url: '/pages/user/feedback/index',
-    type: 'pageJump'
-  }
-])
+	// 菜单项
+	const menuItems = computed(() => [
+		{
+			id: 1,
+			name: t('user.myOrders'),
+			url: '/pages/user/order/index',
+			type: 'pageJump'
+		},
+		{
+			id: 2,
+			name: t('user.myBooklist'),
+			url: '/pages/user/myBook/index',
+			type: 'pageJump'
+		},
+		{
+			id: 3,
+			name: t('user.profile'),
+			url: '/pages/user/profile/index',
+			type: 'pageJump'
+		},
+		{
+			id: 4,
+			name: t('user.about'),
+			url: '/pages/user/about/index',
+			type: 'pageJump'
+		},
+		{
+			id: 5,
+			name: t('user.feedback'),
+			url: '/pages/user/feedback/index',
+			type: 'pageJump'
+		}
+	])
 
-/**
- * 获取平台信息
- */
-const getPlatform = () => {
-  const systemInfo = uni.getSystemInfoSync()
-  platform.value = systemInfo.platform === 'android' ? 'android' : 'ios'
-}
+	/**
+	 * 获取平台信息
+	 */
+	const getPlatform = () => {
+		const systemInfo = uni.getSystemInfoSync()
+		platform.value = systemInfo.platform === 'android' ? 'android' : 'ios'
+	}
 
-/**
- * 获取数据
- */
-const getData = async () => {
-  try {
-    // 获取用户信息
-    const userRes = await getUserInfo()
-    if (userRes.user) {
-      userStore.setUserInfo(userRes.user)
-    }
+	/**
+	 * 获取数据
+	 */
+	const getData = async () => {
+		// 获取用户信息
+		const userInfoRes = await getUserInfo()
+		if (userInfoRes.result) {
+			userStore.setUserInfo(userInfoRes.result)
+		}
+	}
 
-    // 获取VIP信息
-    const vipRes = await getVipInfo()
-    if (vipRes.vipInfo) {
-      vipInfo.value = vipRes.vipInfo
-    }
-  } catch (error) {
-    console.error('获取数据失败:', error)
-  }
-}
+	/**
+	 * 跳转到设置页面
+	 */
+	const goSettings = () => {
+		uni.navigateTo({
+			url: '/pages/user/settings/index'
+		})
+	}
 
-/**
- * 跳转到设置页面
- */
-const goSettings = () => {
-  uni.navigateTo({
-    url: '/pages/user/settings/index'
-  })
-}
+	/**
+	 * 跳转到个人资料页面
+	 */
+	const goProfile = () => {
+		uni.navigateTo({
+			url: '/pages/user/profile/index'
+		})
+	}
 
-/**
- * 跳转到个人资料页面
- */
-const goProfile = () => {
-  uni.navigateTo({
-    url: '/pages/user/profile/index'
-  })
-}
+	/**
+	 * 跳转到订阅页面
+	 */
+	const goSubscribe = () => {
+		uni.navigateTo({
+			url: '/pages/vip/book'
+		})
+	}
 
-/**
- * 跳转到订阅页面
- */
-const goSubscribe = () => {
-  uni.navigateTo({
-    url: '/pages/user/wallet/index'
-  })
-}
+	/**
+	 * 处理菜单点击
+	 */
+	const handleMenuClick = (item : any) => {
+		switch (item.type) {
+			case 'pageJump':
+				uni.navigateTo({
+					url: item.url
+				})
+				break
+			case 'switchTab':
+				uni.switchTab({
+					url: item.url
+				})
+				break
+		}
+	}
 
-/**
- * 处理菜单点击
- */
-const handleMenuClick = (item: any) => {
-  switch (item.type) {
-    case 'pageJump':
-      uni.navigateTo({
-        url: item.url
-      })
-      break
-    case 'switchTab':
-      uni.switchTab({
-        url: item.url
-      })
-      break
-  }
-}
-
-onMounted(() => {
-  getPlatform()
-  getData()
-})
+	/**
+	 * 跳转充值页面
+	 */
+	const goRecharge = () => {
+		uni.navigateTo({
+			url: '/pages/user/recharge/index'
+		})
+	}
+	
+	/**
+	 * 跳转虚拟币页面
+	 */
+	const goVirtualList = () => {
+		uni.navigateTo({
+			url: '/pages/user/virtual/index'
+		})
+	}
+	
+	
+	
+	onMounted(() => {
+		getPlatform()
+		getData()
+	})
 </script>
 
 <style lang="scss" scoped>
-$theme-color: #54a966;
+	$theme-color: #54a966;
 
-.user-page {
-  min-height: 100vh;
-  background-color: #f7faf9;
-}
+	.user-page {
+		min-height: 100vh;
+		background-color: #f7faf9;
+	}
 
-.settings-icon {
-  position: absolute;
-  right: 20px;
-  z-index: 2;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  line-height: 1.2;
-  
-  text {
-    display: block;
-    font-size: 28rpx;
-    color: #333;
-  }
-}
+	.settings-icon {
+		position: absolute;
+		right: 20px;
+		z-index: 2;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		line-height: 1.2;
 
-.user-info-section {
-  padding: 0 30rpx;
-  margin-bottom: 50rpx;
-}
+		text {
+			display: block;
+			font-size: 28rpx;
+			color: #333;
+		}
+	}
 
-.user-info {
-  display: flex;
-  align-items: center;
-  
-  .avatar {
-    width: 100rpx;
-    height: 100rpx;
-    border-radius: 100rpx;
-    margin-right: 30rpx;
-  }
-  
-  .user-details {
-    flex: 1;
-    
-    .nickname {
-      display: block;
-      font-size: 38rpx;
-      font-weight: bold;
-      color: #333;
-      margin-bottom: 10rpx;
-    }
-    
-    .email {
-      display: block;
-      font-size: 28rpx;
-      color: #333;
-      margin-bottom: 10rpx;
-    }
-    
-    .vip-time {
-      display: block;
-      font-size: 28rpx;
-      color: #333;
-    }
-  }
-}
+	.user-info-section {
+		padding: 0 30rpx;
+		margin-bottom: 50rpx;
+	}
 
-.vip-card-section {
-  padding: 0 20rpx;
-  margin-bottom: 20rpx;
-}
+	.user-info {
+		display: flex;
+		align-items: center;
 
-.vip-card {
-  background: #fff;
-  border-radius: 15rpx;
-  padding: 40rpx;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
-  
-  .vip-info {
-    text-align: center;
-    
-    .label {
-      display: block;
-      font-size: 32rpx;
-      color: #333;
-      margin-bottom: 10rpx;
-    }
-    
-    .value {
-      display: block;
-      font-size: 30rpx;
-      color: $theme-color;
-    }
-  }
-}
+		.avatar {
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 100rpx;
+			margin-right: 30rpx;
+		}
 
-.menu-section {
-  padding: 20rpx 20rpx 0;
-}
+		.user-details {
+			flex: 1;
 
-.menu-list {
-  background: #fff;
-  border-radius: 15rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
-}
+			.nickname {
+				display: block;
+				font-size: 38rpx;
+				font-weight: bold;
+				color: #333;
+				margin-bottom: 10rpx;
+			}
 
-.menu-item {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 30rpx;
-  border-bottom: 1px solid #e0e0e0;
-  
-  &:last-child {
-    border-bottom: none;
-  }
-  
-  &:active {
-    background-color: #f5f5f5;
-  }
-  
-  .menu-text {
-    font-size: 30rpx;
-    color: #333;
-    line-height: 40rpx;
-  }
-}
-</style>
+			.email {
+				display: block;
+				font-size: 28rpx;
+				color: #333;
+				margin-bottom: 10rpx;
+			}
+
+			.vip-time {
+				display: block;
+				font-size: 28rpx;
+				color: #333;
+			}
+		}
+	}
+
+	// vip 卡片
+	.vip-card-section {
+		padding: 0 20rpx;
+		margin-bottom: 20rpx;
+
+		.vip-card {
+			background: linear-gradient(135deg, #3E7EF5 0%, #9134EA 100%);
+			border-radius: 15rpx;
+			padding: 26rpx 30rpx 10rpx;
+			box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
+			
+			.vip-card-title {
+				font-size: 32rpx;
+				color: #fff;
+				font-weight: bold;
+				margin-bottom: 20rpx;
+			}
+			
+			.vip-card-content {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				background-color: rgba(255, 255, 255, 0.2);
+				border-radius: 8px;
+				padding: 30rpx;
+				margin-bottom: 20rpx;
+			}
+			.vip-item-list {
+				font-size: 28rpx;
+				color: #fff;
+				font-weight: bold;
+			}
+		}
+	}
+
+	.assets-card-section {
+		padding: 0 20rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.assets-card {
+		background: #fff;
+		border-radius: 15rpx;
+		padding: 40rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+
+		.assets-info {
+			text-align: center;
+
+			.label {
+				display: block;
+				font-size: 32rpx;
+				color: #333;
+				margin-bottom: 10rpx;
+			}
+
+			.value {
+				display: block;
+				font-size: 30rpx;
+				color: $theme-color;
+			}
+		}
+	}
+
+	.menu-section {
+		padding: 20rpx 20rpx 0;
+	}
+
+	.menu-list {
+		background: #fff;
+		border-radius: 15rpx;
+		overflow: hidden;
+		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.menu-item {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 30rpx;
+		border-bottom: 1px solid #e0e0e0;
+
+		&:last-child {
+			border-bottom: none;
+		}
+
+		&:active {
+			background-color: #f5f5f5;
+		}
+
+		.menu-text {
+			font-size: 30rpx;
+			color: #333;
+			line-height: 40rpx;
+		}
+	}
+
+
+
+	.chong_btn {
+		font-size: 26rpx;
+		display: block;
+		border-radius: 50rpx;
+		color: #fffbf6;
+		padding: 10rpx 32rpx;
+		background-image: linear-gradient(90deg, #3ab3ae 0%, #d5ecdd 200%);
+	}
+
+	.assets {
+		display: flex;
+		flex: 1;
+		justify-content: space-around;
+		text-align: center;
+		transform:translateX(-20px);
+
+		.assets_row {
+			margin-bottom: 20rpx;
+		}
+	}
+</style>

pages/user/order/index.vue

@@ -10,34 +10,32 @@
 
     <!-- 订单列表 -->
     <view class="order-list">
-      <view 
-        v-for="order in orderList" 
-        :key="order.id" 
-        class="order-item"
-      >
-        <view class="order-header">
-          <text class="book-name">{{ order.bookEntity.name }}</text>
-          <view class="price-info">
-            <image 
-              v-if="order.paymentMethod === '4'" 
-              src="/static/icon/coin.png" 
-              class="payment-icon"
-            />
-            <image 
-              v-else 
-              src="/static/icon/currency.png" 
-              class="payment-icon"
-            />
-            <text class="price">{{ order.orderMoney }}</text>
-            <text class="currency">NZD</text>
+      <wd-card v-for="order in orderList" :key="order.id" type="rectangle" custom-class="order-item">
+        <template #title>
+          <view class="order-item-title">
+            <view class="order-item-sn">
+              {{ order.orderSn }}
+              <wd-icon name="file-copy" size="14px" color="#65A1FA" class="ml-1!" @click="copyToClipboard(order.orderSn)"></wd-icon>
+              <!-- <wd-button type="icon" icon="file-copy" size="small"></wd-button> -->
+            </view>
+            <view class="order-item-status">{{ orderStatusMap[order.orderStatus] }}</view>
           </view>
-        </view>
-        <text class="order-sn">
-          {{ $t('user.orderSn') }}
-          {{ order.orderSn }}
-        </text>
-        <text class="create-time">{{ order.createTime }}</text>
-      </view>
+        </template>
+        
+        <!-- 三种订单类型商品信息 -->
+        <ProductInfo v-if="order.orderType === 'order'" :data="order.productList" :type="order.orderType" />
+        <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 }} 天医币</view>
+
+        <template #footer>
+          <view>
+            <!-- <wd-button size="small" plain>申请售后</wd-button> -->
+            <wd-button v-if="order.orderStatus === 0" size="small" plain class="ml-2.5!">继续付款</wd-button>
+          </view>
+        </template>
+      </wd-card>
     </view>
   </z-paging>
 </template>
@@ -45,8 +43,10 @@
 <script setup lang="ts">
 import { ref, onMounted } from 'vue'
 import { getOrderList } from '@/api/modules/user'
-import type { IOrder } from '@/types/user'
+import type { IOrder } from '@/types/order'
 import { useI18n } from 'vue-i18n'
+import { copyToClipboard } from '@/utils/index'
+import ProductInfo from '@/components/order/ProductInfo.vue'
 
 const { t } = useI18n()
 const paging = ref<any>(null)
@@ -71,6 +71,12 @@ const ordersTabs = [
   },
 ]
 
+// 订单状态映射
+const orderStatusMap = {
+  '0': '待付款',
+  '3': '已完成',
+}
+
 /**
  * 处理订单状态切换
  */
@@ -96,135 +102,127 @@ const getData = async (page: number, pageSize: number) => {
     console.error('获取订单列表失败:', error)
   }
 }
+
+/**
+ * 获取订单图片
+ */
+const getOrderImage = (order: IOrder) => {
+  switch (order.orderType) {
+    case 'order':
+      return order.productList[0]?.product?.productImages || ''
+    case 'abroadBook':
+      return order.bookEntity?.images || ''
+    case 'vip':
+      return '/static/vip.png'
+    case 'point':
+      return '/static/jifen.png'
+    default:
+      return ''
+  }
+}
+
+const getOrderTitle = (order: IOrder) => {
+  switch (order.orderType) {
+    case 'order':
+      return order.productList[0]?.product?.productName || ''
+    case 'abroadBook':
+      return order.bookEntity?.name || ''
+    case 'vip':
+      return order.vipBuyConfigEntity?.title || ''
+    case 'point':
+      return ''
+    default:
+      return ''
+  }
+}
+
+
 </script>
 
 <style lang="scss" scoped>
-$theme-color: #54a966;
-
 .order-page {
   min-height: 100vh;
   background-color: #f7faf9;
 }
 
-.custom-navbar {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 999;
-  background-color: #fff;
-  border-bottom: 1rpx solid #e5e5e5;
-
-  .navbar-content {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 44px;
-    position: relative;
-
-    .navbar-left {
-      position: absolute;
-      left: 10px;
-      display: flex;
-      align-items: center;
-      padding: 10rpx;
-    }
-
-    .navbar-title {
-      font-size: 16px;
-      font-weight: 700;
-      color: #333;
-    }
-  }
-}
-
-.order-scroll {
-  height: 100vh;
-}
-
 .order-list {
-  padding: 0 20rpx 10rpx;
+  padding: 10px;
+  padding-bottom: 0;
 }
 
 .order-item {
-  background: #fff;
-  border-radius: 15rpx;
-  padding: 30rpx;
-  margin-top: 20rpx;
-  box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1) !important;
+  border-radius: 8px !important;
 
-  .order-header {
+  &:last-child {
+    margin-bottom: 0;
+  }
+
+  :deep() {
+    .wd-card__title-content {
+      padding: 0 !important;
+    }
+    .wd-card__content{
+      padding: 10px 0 !important;
+    }
+  }
+
+  .order-item-title {
+    font-size: 12px;
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-bottom: 20rpx;
+  }
 
-    .book-name {
-      flex: 1;
-      font-size: 34rpx;
-      color: #333;
-      font-weight: bold;
-      max-width: 85%;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
+  .order-item-sn {
+    display: flex;
+    align-items: center;
+    height: 36px;
+    line-height: 36px;
+  }
 
-    .price-info {
+  .order-item-status {
+    font-size: 12px;
+    color: #e55f18;
+  }
+
+  .order-item-content {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 14px;
+
+    .order-item-product-info {
       display: flex;
+      flex-direction: row;
+      justify-content: flex-start;
       align-items: center;
 
-      .payment-icon {
-        width: 38rpx;
-        height: 38rpx;
-        margin-right: 5rpx;
+      .order-item-product-name {
+        color: #333;
       }
+    }
+    .order-item-product-price {
+      font-weight: bold;
+      color: #333;
+      text-align: right;
+      font-size: 12px;
 
-      .price {
-        font-size: 36rpx;
-        color: $theme-color;
-        font-weight: bold;
-      }
-
-      .currency {
-        font-size: 32rpx;
-        color: $theme-color;
-        font-weight: bold;
-        margin-left: 5rpx;
+      .count {
+        font-weight: normal;
+        color: #999;
       }
     }
   }
 
-  .order-sn {
-    display: block;
-    font-size: 30rpx;
-    color: #666;
-    line-height: 38rpx;
-    margin-bottom: 10rpx;
-  }
-
-  .create-time {
-    display: block;
-    font-size: 28rpx;
-    color: #aaa;
-  }
-}
-
-.load-tips {
-  padding: 40rpx 0 20rpx;
-  text-align: center;
-}
-
-.empty-state {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  min-height: 60vh;
-  padding-top: 100rpx;
-
-  .empty-text {
-    font-size: 30rpx;
-    color: #999;
+  .order-item-total-price {
+    font-weight: bold;
+    font-size: 14px;
+    color: #333;
+    margin-top: 10px;
+    text-align: right;
+    line-height: 1;
   }
 }
 </style>

pages/user/recharge/index.vue

@@ -0,0 +1,450 @@
+<template>
+	<view class="recharge-page">
+		<!-- 自定义导航栏 -->
+		<nav-bar :title="$t('order.recharge')"></nav-bar>
+		<view class="block">
+			<view class="text">{{$t('order.rechargeAmount')}}</view>
+			<view class="recharge">
+				<view class="recharge_block" @click="chosPric(item)"
+					:class="aloneItem.priceTypeId === item.priceTypeId ? 'selected' : ''"
+					v-for="item in rechargeList.bookBuyConfigList" :key="item.priceTypeId">
+					<view class="recharge_money">￥{{item.money}}</view>
+					<view>{{item.realMoney}}{{$t('order.virtualCoin')}}</view>
+					<!-- 红框位置的618活动标签 -->
+					<!-- <view class="activity-tag">618活动</view> -->
+					<span class="activity-label" v-if="item.givejf >0">618充值活动</span>
+					<text class="recharge_give" v-if="item.givejf >0">（赠{{item.givejf}}币）</text>
+				</view>
+			</view>
+		</view>
+		<view class="activity-container">
+			<view v-html="remark.remark"></view>
+		</view>
+		<view class="cha_fangsh">
+			<view class="cf_title PM_font">{{$t('user.paymentMethod')}}</view>
+			<view class="cf_radio">
+				<radio-group v-for="item in iosPaylist" @click="choseType(item.id)">
+					<view style="width: 100%">
+						<view :class="payType == item.id ? 'Tab_xf cf_xuanx' : 'cf_xuanx'">
+							<!-- <image class="pay_item_img" :src="item.imgUrl" mode="aspectFil">
+							</image> -->
+							<text>{{ item.title }}</text>
+							<radio :checked="payType === item.id"></radio>
+						</view>
+					</view>
+				</radio-group>
+			</view>
+		</view>
+		<view class="agree_wo flexbox">
+			<radio-group class="agree" v-for="(item, index) in argee" :key="index" @click="radioCheck">
+				<view>
+					<radio class="agreeRadio" :value="item.id" :checked="state" color="#007bff"></radio>
+				</view>
+			</radio-group>
+			<view>{{$t('order.readAgree')}}<span class="highlight" @click="showAgreement">《{{$t('order.valueAddedServices')}}》</span></view>
+		</view>
+		<view class="bottom-button-container">
+			<button class="recharge-button" @click="handleRecharge">{{$t('order.recharge')}}</button>
+		</view>
+		<wd-popup v-model="agreemenState" position="bottom" :closeable="true">
+			<view class="agreement">
+				<view class="agreement_title">{{ agreementObj.title }}</view>
+				<view class="agreement_row">
+					<view v-html="agreementObj.content"></view>
+				</view>
+			</view>
+		</wd-popup>
+
+		<wd-message-box />
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref, computed, onMounted, toRefs, reactive } from 'vue'
+  import { useI18n } from 'vue-i18n'
+	import { useMessage } from '@/uni_modules/wot-design-uni'
+	import { getBookBuyConfigList, getAgreement, getActivityDescription } from '@/api/modules/user'
+	// const googlePay = uni.requireNativePlugin("sn-googlepay5");
+	const { t } = useI18n()
+	const message = useMessage()
+	const payType = ref('1')
+	const iosPaylist = ref([
+		{
+			title: "Google Pay",
+			id: '1',
+			// imgUrl: "/static/icon/currency.png"
+		}
+	])
+	// 充值列表
+	const rechargeList = ref([])
+	// 金额列表单独每项
+	const aloneItem = ref({})
+
+	// 充值列表type-固定传值
+	const type = ref('point')
+
+	const qudao = ref('')
+	const state = ref(false)
+	const argee = ref([
+		{
+			value: false,
+			id: "1",
+		},
+	])
+
+	const popup = ref(null)
+	const agreemenState = ref(false)
+	// 协议id
+	const id = ref(101)
+
+	const richTextContent = ref('');
+	// 协议数据
+	const agreementObj = reactive({
+		title: '',
+		content: '',
+	})
+	const isAndroid = ref()
+
+	const remark = ref({})
+	const isConnected = ref(false)
+
+
+  /**
+	 * 获取使用环境
+	 */
+	const getDevName = () => {
+		
+		if (uni.getSystemInfoSync().platform === "android") {
+			qudao.value = 'Google'
+			isAndroid.value = true;
+			console.log('运行Android上')
+		} else {
+			qudao.value = 'Google'
+			console.log('运行iOS上')
+		}
+		getData()
+	}
+
+	// 点击金额
+	const chosPric = (item : any) => {
+		console.log(item,'金额每项');
+		aloneItem.value = item;
+	};
+
+	/**
+	 * 勾选协议
+	 */
+	const radioCheck = () => {
+		state.value = !state.value
+		console.log('点击了', state.value);
+	}
+
+	/**
+	 * 协议弹窗显示
+	 */
+	const showAgreement = () => {
+		agreemenState.value = true
+	}
+	/**
+	 * 获取充值列表数据
+	 */
+	const getData = async () => {
+		try {
+			rechargeList.value = await getBookBuyConfigList(type.value, qudao.value)
+			console.log(rechargeList.value.bookBuyConfigList, '充值列表');
+			// 默认选择第一个金额
+			aloneItem.value = rechargeList.value.bookBuyConfigList[0]
+		} catch (error) {
+			console.error('获取订单列表失败:', error)
+		}
+	}
+
+	/**
+	 * 获取协议数据
+	 */
+	const getAgreementData = async () => {
+		try {
+			const text = reactive(await getAgreement(id.value))
+			const { title, content } = toRefs(text.agreement)
+			agreementObj.title = title.value
+			agreementObj.content = content.value.replace(/<\/h5>/g, "</view>");
+			// console.log(agreementObj, '协议数据');
+		} catch (error) {
+			console.error('获取协议数据:', error)
+		}
+	}
+
+	/**
+	 * 获取活动说明数据
+	 */
+	const getActivityDescriptionData = async () => {
+		try {
+			const text = ref(await getActivityDescription())
+			remark.value = text.value.res[0]
+			// console.log(remark.value, '活动说明内容');
+
+		} catch (error) {
+			console.error('获取协议数据:', error)
+		}
+	}
+
+	/**
+	 * 切换支付方式
+	 */
+	const choseType = () => {
+		// payType.value = val;
+	}
+
+	const handleRecharge = () => {
+		if(!state.value){
+			uni.showToast({
+			  title: t('order.readAgreeServices'),
+			  icon: 'none'
+			})
+			return
+		}
+		uni.showLoading({ title: '加载中...' })
+		console.log('立即充值');
+		getGooglePay()
+	}
+
+	/**
+	 * 初始化
+	 */
+	const getGooglePay = () => {
+		googlePay.init({
+		}, (e:any) => {
+			console.log('init', e);
+			if (e.code == 0) {
+				isConnected.value = true;
+				getQuerySku()
+				// 初始化成功
+			} else {
+				// 初始化失败
+				isConnected.value = false;
+			}
+		});
+	}
+	
+	/**
+	 * 查询sku
+	 */
+	const getQuerySku = () =>{
+		const id = aloneItem.value.priceTypeId
+		console.log(id, '获取每项');
+		googlePay.querySku(
+		  {
+		    inapp: [id], // 与subs二选一, 参数为商品ID（字符串）数组
+		  },
+		  (e:any) => {
+		    if (e.code == 0) {
+		      // 查询成功.
+					console.log('查询成功',e);
+		      // e.list; // 查询结果, array
+		    } else {
+					console.log('查询失败');
+		      // 查询失败
+		    }
+		  }
+		)
+		}
+	
+	const getPayAll = () =>{
+		googlePay.payAll(
+		  {
+		    productId: "", // 产品id
+		
+		  },
+		  (e) => {
+		    if (e.code == 0) {
+		      // 支付成功
+		      e.data; //支付结果, array [ {original:{ }, signature: ''} ]
+		    } else {
+		      // 支付失败
+		    }
+		  },
+		)
+	}
+	
+
+	onMounted(() => {
+		getDevName();
+		getActivityDescriptionData()
+		getAgreementData()
+	})
+</script>
+
+<style lang="scss" scoped>
+	$theme-color: #54a966;
+
+	.recharge-page {
+		min-height: 100vh;
+		background-color: #f7faf9;
+	}
+
+	.text {
+		font-size: 30rpx;
+		color: #007bff;
+		padding: 30rpx 0 20rpx 20rpx;
+	}
+
+	.recharge {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 20rpx 0 20rpx 30rpx;
+
+		.recharge_block {
+			box-shadow: 0 0 20rpx 0 #0000001a;
+			float: left;
+			width: 46%;
+			margin: 0 3% 30rpx 0;
+			text-align: center;
+			padding: 30rpx 0 0;
+			border-radius: 15rpx;
+			position: relative;
+			height: 160rpx;
+
+			.recharge_money {
+				font-size: 30rpx;
+				margin-bottom: 10rpx;
+
+			}
+
+			.recharge_give {
+				font-size: 16rpx;
+				color: #FF0033;
+			}
+		}
+	}
+
+	.selected {
+		border: 2rpx solid #007bff;
+		color: #007bff;
+	}
+
+	.bottom-button-container {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		padding: 30rpx;
+		background-color: #ffffff;
+		border-top: 1px solid #f0f0f0;
+		z-index: 999;
+	}
+
+	.recharge-button {
+		width: 100%;
+		height: 50rpx;
+		line-height: 50rpx;
+		background-color: #007bff;
+		color: #ffffff;
+		font-size: 18rpx;
+		border-radius: 25rpx;
+		border: none;
+	}
+
+	.recharge-button::after {
+		border: none;
+	}
+
+	.activity-container {
+		margin: 0 20rpx 20rpx 20rpx;
+		padding: 15rpx;
+		background-color: #e6f4ff;
+		border-radius: 8rpx;
+		font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+	}
+
+	.activity-label {
+		position: absolute;
+		top: -10rpx;
+		right: -6rpx;
+		font-size: 16rpx;
+		font-weight: 600;
+		color: #ffffff;
+		background-color: #007bff;
+		border-radius: 16rpx 0;
+		padding: 6rpx 10rpx;
+		letter-spacing: 0.5rpx;
+	}
+
+	.cha_fangsh {
+		padding: 20rpx 20rpx 60rpx 20rpx;
+
+		.cf_title {
+			font-size: 30rpx;
+			color: #007bff;
+		}
+
+		.cf_radio {
+			margin-top: 20rpx;
+
+			.cf_xuanx {
+				font-size: 24rpx;
+				padding: 10rpx 0;
+				margin-bottom: 20rpx;
+				border-bottom: 1px solid #ededed;
+				display: flex;
+				justify-content: space-between;
+				align-items:center;
+
+				image {
+					width: 40rpx;
+					height: 40rpx;
+					display: inline-block;
+					margin-right: 20rpx;
+					vertical-align: bottom;
+				}
+			}
+
+			.Tab_xf {
+				// background-color: #fdf1e9cc;
+			}
+		}
+	}
+
+	.pay_item_img {
+		width: 50rpx;
+		height: 50rpx;
+		float: left;
+		margin-right: 20rpx;
+	}
+
+
+	.agree_wo {
+		display: flex;
+		padding: 20rpx 20rpx 160rpx 20rpx;
+		color: #aaa;
+		font-size: 18rpx;
+		align-items: center;
+
+		.highlight {
+			color: #007bff;
+		}
+	}
+
+
+	.agreeRadio {
+		display: flex;
+		zoom: 0.7;
+	}
+
+	.agreement {
+		padding: 40rpx 30rpx 40rpx 30rpx;
+		position: relative;
+
+		.agreement_title {
+			font-size: 32rpx;
+			margin-bottom: 50rpx;
+			color: #555;
+			text-align: center;
+			font-weight: bold;
+		}
+
+		.agreement_row {
+			max-height: 1000rpx;
+			overflow-y: scroll
+		}
+	}
+</style>

pages/user/virtual/index.vue

@@ -0,0 +1,135 @@
+<template>
+	<z-paging ref="paging" v-model="bookList" auto-show-back-to-top class="my-book-page" @query="rechargeList" :default-page-size="10">
+		<template #top>
+			<!-- 自定义导航栏 -->
+			<nav-bar :title="$t('user.consumptionRecord')"></nav-bar>
+		</template>
+		<view class="recharge-record" v-if="(bookList && bookList.length > 0)">
+			<view class="go-gecharge" @click="goRecharge">
+				<view>{{$t('order.recharge')}}</view>
+				<view><wd-icon name="arrow-right" size="16px" color="#fff"/></view>
+			</view>
+			<view class="title">{{$t('order.rechargeConsumptionList')}}</view>
+			<view class="recharge-record-block" v-for="(item, index) in bookList" :key="index">
+				<view class="recharge-record-block-row">{{item.orderType}}<text class="text">{{item.changeAmount}}</text></view>
+				<view class="time">{{item.createTime}}</view>
+			</view>
+		</view>
+	</z-paging>
+</template>
+
+<script setup lang="ts">
+	import { ref } from 'vue'
+	import { useI18n } from 'vue-i18n'
+	import { useUserStore } from '@/stores/user'
+	import { getTransactionDetailsList } from '@/api/modules/user'
+
+	const { t } = useI18n()
+	const paging = ref<any>()
+	const userStore = useUserStore()
+
+	// 数据状态
+	const bookList = ref([])
+	const loading = ref(false)
+	const firstLoad = ref(true)
+
+	// 充值记录列表
+	async function rechargeList(pageNo : number, pageSize : number) {
+		const userId = userStore.userInfo.id
+		loading.value = true
+		try {
+			const res = await getTransactionDetailsList(pageNo, pageSize, userId)
+			console.log(res, 'res');
+			paging.value.complete(res.transactionDetailsList.records)
+		} catch (error) {
+			paging.value.complete(false)
+			console.error('Failed to load book list:', error)
+		} finally {
+			firstLoad.value = false
+			loading.value = false
+		}
+	}
+	
+	/**
+	 * 跳转充值页面
+	 */
+	const goRecharge = () => {
+		uni.navigateTo({
+			url: '/pages/user/recharge/index'
+		})
+	}
+</script>
+
+<style lang="scss" scoped>
+	.my-book-page {
+		background: #f7faf9;
+		min-height: 100vh;
+
+		.recharge-record {
+			background: #fff;
+			border-radius: 15rpx;
+			overflow: hidden;
+			box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
+			// padding: 20rpx;
+			margin: 20rpx;
+			
+			.go-gecharge{
+				//height: 100rpx;
+				background: linear-gradient(to right, #007bff, #17a2b8);
+				font-size: 30rpx;
+				font-weight: bold;
+				color: #fff;
+				padding: 20rpx;
+				margin-bottom: 20rpx;
+				display: flex;justify-content:space-between;align-items:center
+			}
+			
+			.title {
+				font-size: 30rpx;
+				padding-left:20rpx;
+				margin-bottom: 30rpx;
+				color: #007bff;
+				font-weight: bold;
+			}
+
+			.recharge-record-block {
+				border-bottom: 1px solid #e0e0e0;
+				padding: 20rpx;
+				
+				.time{
+					font-size: 20rpx;
+				}
+
+				.recharge-record-block-row {
+					display: flex;
+					justify-content: space-between;
+					margin-bottom: 20rpx;
+					
+					.text{
+						color: #007bff;
+					}
+				}
+			}
+		}
+	}
+	.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;
+	  }
+	}
+	
+</style>

pages/vip/book.vue

@@ -0,0 +1,400 @@
+<template>
+  <view class="page-wrapper">
+    <!-- 自定义导航栏 -->
+    <nav-bar :title="$t('vip.bookVip')" />
+
+    <!-- VIP介绍卡片 -->
+    <view class="vip-intro-card">
+      <view class="vip-intro-header">
+        <text class="vip-intro-title">📚 读书VIP特权</text>
+        <!-- <text class="vip-intro-subtitle">畅享海量电子图书</text> -->
+      </view>
+      <view class="vip-intro-features">
+        <view class="feature-item">
+          <wd-icon name="check-circle" size="16px" color="#258feb" />
+          <text>畅享海量电子图书</text>
+        </view>
+      </view>
+    </view>
+
+    <!-- VIP套餐列表 -->
+    <view class="vip-packages">
+      <text class="section-title">选择套餐</text>
+      <view class="package-grid">
+        <view 
+          class="package-card"
+          :class="{ 'package-card--popular': vip.isRecommend }"
+          v-for="(vip, index) in vipList"
+          :key="index"
+          @click="selectPackage(vip)"
+        >
+          <view class="package-header">
+            <view class="package-title-wrapper">
+              <text class="package-title package-title--vip">{{ vip.title }}</text>
+            </view>
+          </view>
+          
+          <view class="package-price">
+            <text class="price-amount">{{ vip.money }}</text>
+            <text class="price-unit">{{ $t('global.coin') }}</text>
+          </view>
+          
+          <view class="package-duration">
+            <view class="duration-text">{{ vip.days }} {{ $t('global.days') }}</view>
+            <view class="daily-price">{{ $t('vip.daily') }}{{ Math.round(vip.money / vip.days * 100) / 100 }}{{ $t('global.coin') }}</view>
+          </view>
+
+          <wd-button 
+            type="primary" 
+            size="small" 
+            class="package-btn"
+            @click="handlePurchase(vip)"
+          >
+            {{ $t('vip.openVip') }}
+          </wd-button>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { ref, onMounted } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
+import { useUserStore } from '@/stores/user'
+import { vipApi } from '@/api/modules/vip'
+
+const userStore = useUserStore()
+
+const vipList = ref([])
+const getVipList = async () => {
+  const res = await vipApi.getBookVipList()
+  // 模拟推荐标识，实际项目中应该从后端获取
+  vipList.value = res.lableList || []
+}
+
+// 选择套餐
+const selectPackage = (vip: any) => {
+  // 这里可以添加跳转到订单确认页面的逻辑
+  uni.showToast({
+    title: `已选择: ${vip.title}`,
+    icon: 'none'
+  })
+}
+
+// 处理购买
+const handlePurchase = (vip: any) => {
+  const selectedGoods = { 
+    productId: vip.id,
+    productName: `${vip.title}`,
+    price: vip.money,
+    productImages: '/static/vip.png',
+    state: null,
+    orderType: 'abroadVip'
+  }
+  uni.navigateTo({
+    url: `/pages/order/vipConfirm`,
+    success: () => {
+      setTimeout(() => {
+        uni.$emit('selectedGoods', selectedGoods)
+      }, 100)
+    }
+  })
+}
+
+onShow(() => {
+  getVipList()
+})
+</script>
+
+<style lang="scss" scoped>
+.page-wrapper {
+  padding: 20rpx;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  min-height: 100vh;
+}
+
+// VIP介绍卡片
+.vip-intro-card {
+  background: rgba(255, 255, 255, 0.95);
+  border-radius: 20rpx;
+  padding: 30rpx 30rpx;
+  margin-bottom: 30rpx;
+  box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.1);
+  backdrop-filter: blur(10rpx);
+}
+
+.vip-intro-header {
+  text-align: center;
+}
+
+.vip-intro-title {
+  display: block;
+  font-size: 40rpx;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 10rpx;
+}
+
+.vip-intro-subtitle {
+  display: block;
+  font-size: 28rpx;
+  color: #666;
+}
+
+.vip-intro-features {
+  margin-top: 20rpx;
+  display: flex;
+  justify-content: space-around;
+  flex-wrap: wrap;
+}
+
+.feature-item {
+  display: flex;
+  align-items: center;
+  margin: 10rpx;
+  font-size: 28rpx;
+  color: #555;
+}
+
+.feature-item text {
+  margin-left: 8rpx;
+}
+
+// 套餐区域
+.vip-packages {
+  margin-bottom: 30rpx;
+}
+
+.section-title {
+  display: block;
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #fff;
+  margin-bottom: 20rpx;
+  text-align: center;
+}
+
+.package-grid {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  gap: 20rpx;
+}
+
+.package-card {
+  flex: 0 0 calc(50% - 10rpx);
+  background: rgba(255, 255, 255, 0.95);
+  border-radius: 20rpx;
+  padding: 30rpx;
+  box-shadow: 0 8rpx 25rpx rgba(0, 0, 0, 0.15);
+  backdrop-filter: blur(10rpx);
+  transition: all 0.3s ease;
+  position: relative;
+  overflow: hidden;
+  
+  &:active {
+    transform: scale(0.98);
+  }
+}
+
+.package-card--popular {
+  background: linear-gradient(135deg, #ff9a9e 0%, #fecfef 50%, #fecfef 100%);
+  border: 2rpx solid #ff6b6b;
+  
+  &::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 0;
+    height: 0;
+    border-left: 60rpx solid transparent;
+    border-top: 60rpx solid #ff6b6b;
+  }
+}
+
+.package-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20rpx;
+}
+
+// .package-title-wrapper {
+//   position: relative;
+//   display: inline-block;
+// }
+
+.package-title {
+  font-size: 36rpx;
+  font-weight: bold;
+  position: absolute;
+  top: 0;
+  right: 0;
+  z-index: 2;
+  display: inline-block;
+  width: 3em;
+  text-align: center;
+  padding: 8rpx 0;
+  border-radius: 12rpx;
+  transition: all 0.3s ease;
+}
+
+.package-title--vip {
+  background: linear-gradient(135deg, #ffd700 0%, #ffed4e 25%, #ffd700 50%, #ffed4e 75%, #ffd700 100%);
+  color: #8b4513;
+  box-shadow: 
+    0 4rpx 15rpx rgba(255, 215, 0, 0.6),
+    0 0 20rpx rgba(255, 215, 0, 0.4),
+    inset 0 2rpx 0 rgba(255, 255, 255, 0.3);
+  border: 1rpx solid rgba(255, 215, 0, 0.5);
+  text-shadow: 0 1rpx 2rpx rgba(0, 0, 0, 0.2);
+}
+
+.package-title--popular {
+  background: linear-gradient(135deg, #ffd700 0%, #ffed4e 25%, #ffd700 50%, #ffed4e 75%, #ffd700 100%);
+  color: #8b4513;
+  box-shadow: 
+    0 6rpx 20rpx rgba(255, 215, 0, 0.8),
+    0 0 30rpx rgba(255, 215, 0, 0.6),
+    inset 0 2rpx 0 rgba(255, 255, 255, 0.4);
+  border: 2rpx solid rgba(255, 215, 0, 0.7);
+  text-shadow: 0 1rpx 3rpx rgba(0, 0, 0, 0.3);
+  font-size: 38rpx;
+}
+
+.title-decoration {
+  position: absolute;
+  top: -10rpx;
+  right: -10rpx;
+  width: 20rpx;
+  height: 20rpx;
+  background: linear-gradient(45deg, #ffd700, #ffed4e);
+  border-radius: 50%;
+  animation: decorationPulse 2s ease-in-out infinite;
+  z-index: 1;
+}
+
+@keyframes crownFloat {
+  0%, 100% { transform: translateY(0rpx); }
+  50% { transform: translateY(-4rpx); }
+}
+
+@keyframes starSparkle {
+  0%, 100% { 
+    transform: scale(1) rotate(0deg);
+    filter: brightness(1);
+  }
+  50% { 
+    transform: scale(1.2) rotate(180deg);
+    filter: brightness(1.3);
+  }
+}
+
+@keyframes decorationPulse {
+  0%, 100% { 
+    transform: scale(1);
+    opacity: 0.8;
+  }
+  50% { 
+    transform: scale(1.3);
+    opacity: 1;
+  }
+}
+
+.popular-badge {
+  background: #ff6b6b;
+  padding: 4rpx 12rpx;
+  border-radius: 20rpx;
+}
+
+.popular-text {
+  color: #fff;
+  font-size: 20rpx;
+  font-weight: bold;
+}
+
+.package-price {
+  text-align: center;
+  margin-bottom: 20rpx;
+}
+
+.price-amount {
+  font-size: 48rpx;
+  font-weight: bold;
+  color: #ff6b6b;
+}
+
+.price-unit {
+  font-size: 28rpx;
+  color: #666;
+  margin-left: 8rpx;
+}
+
+.package-duration {
+  margin-bottom: 20rpx;
+  padding: 15rpx;
+  background: rgba(102, 126, 234, 0.1);
+  border-radius: 12rpx;
+  text-align: center;
+}
+
+.duration-text {
+  font-size: 28rpx;
+  color: #333;
+  font-weight: bold;
+  margin-bottom: 10rpx;
+}
+
+.daily-price {
+  font-size: 24rpx;
+  color: #666;
+}
+
+.package-features {
+  margin-bottom: 30rpx;
+}
+
+.feature-dot {
+  font-size: 24rpx;
+  color: #555;
+  margin-bottom: 10rpx;
+  padding-left: 20rpx;
+  position: relative;
+  
+  &::before {
+    content: '•';
+    position: absolute;
+    left: 0;
+    color: #667eea;
+    font-weight: bold;
+  }
+}
+
+.package-btn {
+  width: 100%;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  border: none !important;
+  border-radius: 50rpx !important;
+  font-size: 28rpx !important;
+  font-weight: bold;
+  padding: 30rpx !important;
+  transition: all 0.3s ease;
+  
+  &:active {
+    transform: scale(0.95);
+  }
+}
+
+.package-btn--popular {
+  background: linear-gradient(135deg, #ff6b6b 0%, #ee5a6f 100%) !important;
+}
+
+// 响应式设计
+@media (max-width: 480px) {
+  .package-grid {
+    grid-template-columns: 1fr;
+  }
+}
+</style>

pages/vip/course.vue

@@ -0,0 +1,251 @@
+<template>
+  <view class="page-wrapper">
+    <!-- 自定义导航栏 -->
+    <nav-bar :title="$t('vip.courseVip')" />
+    <view
+      class="info"
+      :class="{
+        'vip-item-special': item.type == 1 || item.type == 2,
+        'vip-item-overdue': item.state == 1,
+        'vip-item-special-effective': (item.type == 1 || item.type == 2) && item.state == 0,
+        'vip-item-ordinary-effective': item.type != 1 && item.type != 2 && item.state == 0,
+      }"
+      v-for="(item, index) in list"
+      :key="index"
+    >
+      <!-- 购买按钮 -->
+      <wd-button
+        type="error"
+        size="small"
+        plain
+        class="vip-item-btn"
+        @click="handlePurchase(item)"
+      >
+        {{ item.state == null ? '去办理' : '去续费' }}
+      </wd-button>
+
+      <!-- vip标志 -->
+      <view>
+        <text class="vip-item-title">{{ item.title }}</text>
+        <text v-if="item.tip && item.tip < 100">
+          <wd-icon name="warning" size="14px" color="#ff1f00"/> 还有{{ item.tip }}天到期
+        </text>
+        <text v-if="item.state == 1">
+          <wd-icon name="warning" size="14px" color="#999"/> 已过期
+        </text>
+      </view>
+      
+      <view class="info-row pt-1">
+        <text class="info-label">课程价格：</text>
+        <view class="info-content">一年<text class="course-price">{{ item.originalPrice || 0 }}</text>天医币</view>
+      </view>
+
+      <view class="info-row">
+        <text class="info-label">
+          <template v-if="item.state !== null">延期价格：</template>
+          <template v-else>{{ `${item.type == 1 || item.type == 2 ? '超级' : ''}VIP价格：` }}</template>
+        </text>
+        <view class="info-content">
+          <text
+            class="vip-product"
+            v-for="(item_price, index_price) in (item.yanqiList ?? item.vcbList)"
+            :key="index_price"
+            @click="openorderModal(item, index_price)"
+          >
+            {{ item_price.year }}年<text>{{ item_price.rebateFee }}</text>{{ t('global.coin') }}
+          </text>
+        </view>
+      </view>
+      <view class="info-row">
+        <text class="info-label" style="display: block">{{ `${item.type == 1 || item.type == 2 ? '超级' : ''}VIP权限：` }}</text>
+        <view class="info-content" v-html="vipIntro[item.type]"></view>
+      </view>
+    </view>
+
+    <!-- 商品选择器 -->
+    <GoodsSelector
+      :show="showGoodsSelector"
+      :goods="goodsList"
+      @select="handleGoodsSelect"
+      @confirm="handleGoodsConfirm"
+      @close="closeGoodsSelector"
+    />
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
+import { vipApi } from '@/api/modules/vip'
+import { t } from '@/utils/i18n'
+import type { IVipItem, IVipItemProduct } from '@/types/vip'
+import type { IGoods } from '@/types/order'
+import GoodsSelector from '@/components/order/GoodsSelector.vue'
+
+const vipIntro = {
+  1: '<p>无限制观看中医学、中西汇通学、针灸学、肿瘤学四个板块任意课程；</p><p>购买电子图书价格享受<b style="font-size: 16px; color: #ff1f00;">8折</b>优惠。</p>',
+  2: '<p>无限制观看国学与心理学任意课程；</p><p>购买电子图书价格享受<b style="font-size: 16px; color: #ff1f00;">8折</b>优惠。</p>',
+  4: '<p>无限制观看中医任意课程；</p><p>购买电子图书价格享受<b style="font-size: 16px; color: #ff1f00;">9折</b>优惠。</p>',
+  5: '<p>无限制观看针灸任意课程；</p><p>购买电子图书价格享受<b style="font-size: 16px; color: #ff1f00;">9折</b>优惠。</p>',
+  6: '<p>无限制观看肿瘤学任意课程；</p><p>购买电子图书价格享受<b style="font-size: 16px; color: #ff1f00;">9折</b>优惠。</p>',
+  7: '<p>无限制观看国学任意课程；</p><p>购买电子图书价格享受<b style="font-size: 16px; color: #ff1f00;">9折</b>优惠。</p>',
+  8: '<p>无限制观看心理学任意课程；</p><p>购买电子图书价格享受<b style="font-size: 16px; color: #ff1f00;">9折</b>优惠。</p>',
+  9: '<p>无限制观看中医学板块任意课程；</p><p>购买电子图书价格享受<b style="font-size: 16px; color: #ff1f00;">9折</b>优惠。</p>'
+}
+
+// 获取VIP列表
+const list = ref<IVipItem[]>([])
+const getData = async () => {  
+  const res = await vipApi.getVipBuyConfigList()
+  list.value = res.res
+}
+onShow(() => {
+  getData()
+})
+
+// 商品选择
+const showGoodsSelector = ref(false)
+const goodsList = ref<IGoods[]>([])
+const selectedGoods = ref<IGoods | null>(null)
+
+/**
+ * 打开商品选择器
+ */
+const handlePurchase = async (item: IVipItem) => {
+  const currentVipProductList = item[item.state == null ? 'vcbList' : 'yanqiList']
+  goodsList.value = currentVipProductList.map((e: IVipItemProduct) => {
+    return { 
+      productId: e.id,
+      productName: `${e.title} ${e.year}年`,
+      price: item.state == null ? e.fee : e.rebateFee,
+      productImages: '/static/vip.png',
+      state: item.state,
+      orderType: 'vip'
+    }
+  })
+  showGoodsSelector.value = true
+}
+/**
+ * 关闭商品选择器
+ */
+const closeGoodsSelector = () => {
+  showGoodsSelector.value = false
+}
+
+// 处理选择商品
+const handleGoodsSelect = (data: IGoods) => {
+  selectedGoods.value = data
+}
+
+// 购买商品
+const handleGoodsConfirm = () => {
+  uni.navigateTo({
+    url: `/pages/order/vipConfirm`,
+    success: () => {
+      setTimeout(() => {
+        uni.$emit('selectedGoods', selectedGoods.value)
+      }, 100)
+    }
+  })
+}
+
+</script>
+
+<style lang="scss" scoped>
+.page-wrapper {
+  padding: 20rpx;
+}
+
+.info {
+  width: 100%;
+  padding: 20rpx 30rpx;
+  background-color: #fff;
+  border-radius: 10px;
+  box-shadow: 0px 0px 5px 0px #a7bbe4;
+  margin-bottom: 20rpx;
+  position: relative;
+  font-size: 28rpx;
+
+  .info-row {
+    display: flex;
+    margin-bottom: 3px;
+    font-size: 28rpx;
+    line-height: 40rpx;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+  .info-label {
+    display: inline-block;
+    white-space: nowrap;
+    font-weight: bold;
+  }
+  .info-content {
+    display: inline-block;
+  }
+}
+
+.course-price {
+  font-size: 34rpx !important;
+  color: #258feb;
+  font-weight: bold;
+  text-decoration: line-through;
+  font-style: italic;
+  padding: 0 5rpx;
+}
+.vip-product {
+  display: inline-block;
+  color: #ff1f00;
+  border: 1rpx solid #ff1f00;
+  border-radius: 10rpx;
+  margin-right: 15rpx;
+  margin-bottom: 10rpx;
+  padding: 0 10rpx;
+}
+.vip-item-btn {
+  position: absolute !important;
+  right: 20rpx;
+  top: 20rpx;
+  padding: 2rpx 10rpx !important;
+  height: auto !important;
+  line-height: 1.5 !important;
+  border-radius: 5px !important;
+}
+.vip-item-title {
+  display: inline-block;
+  font-size: 24rpx;
+  font-weight: bold;
+  line-height: 1;
+  color: #fff;
+  padding: 10rpx 12rpx;
+  border-radius: 15rpx;
+  background-image: linear-gradient(90deg, #258feb 0%, #00e1ec 100%);
+}
+
+// 超级vip
+.vip-item-special {
+  .vip-item-title {
+    font-size: 26rpx;
+    background-image: linear-gradient(90deg, #ff1f00 0%, #fa9f93 100%);
+  }
+}
+// 已过期
+.vip-item-overdue{
+  background: rgba(220, 223, 225, 0.9) !important;
+  opacity: 0.75;
+  
+  .vip-item-title {
+    background-image: linear-gradient(90deg, #999 0%, #ccc 100%);
+    color: #000;
+  }
+}
+// 普通vip生效中
+.vip-item-ordinary-effective {
+  background-color: rgba(64, 148, 222, 0.3) !important;
+}
+// 超级vip生效中
+.vip-item-special-effective {
+  background: rgba(227, 120, 125, 0.3) !important;
+}
+</style>

stores/sys.ts

@@ -6,6 +6,16 @@ import type { IUserInfo } from '@/types/user'
 export const useSysStore = defineStore('sys', {
   state: (): IUserInfo => ({
     language: uni.getStorageSync('appLanguage') || 'zh-CN',
+    vipTypeDict: {
+      1: '医学超V',
+      2: '国学与心理学超V',
+      4: '中医学VIP',
+      5: '针灸学VIP',
+      6: '肿瘤学VIP',
+      7: '国学VIP',
+      8: '心理学VIP',
+      9: '中西汇通学VIP',
+    }
   }),
 
   getters: {

style/tailwind.css

@@ -8,6 +8,8 @@
     --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono",
       "Courier New", monospace;
     --color-red-500: oklch(63.7% 0.237 25.331);
+    --spacing: 0.25rem;
+    --font-weight-bold: 700;
     --ease-in-out: cubic-bezier(0.4, 0, 0.2, 1);
     --default-transition-duration: 150ms;
     --default-transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
@@ -203,6 +205,21 @@
       max-width: 96rem;
     }
   }
+  .mr-1 {
+    margin-right: calc(var(--spacing) * 1);
+  }
+  .ml-1 {
+    margin-left: calc(var(--spacing) * 1);
+  }
+  .ml-1\! {
+    margin-left: calc(var(--spacing) * 1) !important;
+  }
+  .ml-2 {
+    margin-left: calc(var(--spacing) * 2);
+  }
+  .ml-2\.5\! {
+    margin-left: calc(var(--spacing) * 2.5) !important;
+  }
   .block {
     display: block;
   }
@@ -236,6 +253,9 @@
   .flex-shrink {
     flex-shrink: 1;
   }
+  .border-collapse {
+    border-collapse: collapse;
+  }
   .transform {
     transform: var(--tw-rotate-x,) var(--tw-rotate-y,) var(--tw-rotate-z,) var(--tw-skew-x,) var(--tw-skew-y,);
   }
@@ -258,15 +278,37 @@
   .bg-\[transparent\] {
     background-color: transparent;
   }
+  .pt-1 {
+    padding-top: calc(var(--spacing) * 1);
+  }
+  .pt-10 {
+    padding-top: calc(var(--spacing) * 10);
+  }
   .pt-\[40px\] {
     padding-top: 40px;
   }
+  .pb-0 {
+    padding-bottom: calc(var(--spacing) * 0);
+  }
+  .pb-0\! {
+    padding-bottom: calc(var(--spacing) * 0) !important;
+  }
   .text-center {
     text-align: center;
   }
+  .text-right {
+    text-align: right;
+  }
+  .font-bold {
+    --tw-font-weight: var(--font-weight-bold);
+    font-weight: var(--font-weight-bold);
+  }
   .text-\[\#000\] {
     color: #000;
   }
+  .text-\[\#7dc1f0\] {
+    color: #7dc1f0;
+  }
   .text-\[\#fff\] {
     color: #fff;
   }
@@ -283,6 +325,9 @@
     --tw-ordinal: ordinal;
     font-variant-numeric: var(--tw-ordinal,) var(--tw-slashed-zero,) var(--tw-numeric-figure,) var(--tw-numeric-spacing,) var(--tw-numeric-fraction,);
   }
+  .underline {
+    text-decoration-line: underline;
+  }
   .ring {
     --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
     box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
@@ -352,6 +397,10 @@
   inherits: false;
   initial-value: solid;
 }
+@property --tw-font-weight {
+  syntax: "*";
+  inherits: false;
+}
 @property --tw-ordinal {
   syntax: "*";
   inherits: false;
@@ -544,6 +593,7 @@
       --tw-skew-x: initial;
       --tw-skew-y: initial;
       --tw-border-style: solid;
+      --tw-font-weight: initial;
       --tw-ordinal: initial;
       --tw-slashed-zero: initial;
       --tw-numeric-figure: initial;

style/ui.scss

@@ -1,10 +1,10 @@
 :root,
 page {
 	/* 文字字号 */
-	--wot-fs-title: 18px; // 标题字号/重要正文字号
-	--wot-fs-content: 16px; // 普通正文
-	--wot-fs-secondary: 14px; // 次要信息，注释/补充/正文
-	--wot-fs-tertiary: 12px; // 次次要信息，注释/补充/正文
+	--wot-fs-title: 36rpx; // 标题字号/重要正文字号
+	--wot-fs-content: 28rpx; // 普通正文
+	--wot-fs-secondary: 24rpx; // 次要信息，注释/补充/正文
+	--wot-fs-tertiary: 20rpx; // 次次要信息，注释/补充/正文
 	
 	// 导航栏
 	--wot-navbar-background: #fff;
@@ -16,7 +16,7 @@ page {
 	// --wot-tabbar-item-title-font-size: 16px;
 	
 	// cell
-	--wot-cell-title-fs: 16px;
+	--wot-cell-title-fs: 28rpx;
 	
 	// dropdown
 	// --wot-drop-menu-selected-color: #5355C8;

tailwind.config.js

@@ -15,10 +15,10 @@ module.exports = {
 
 // 指定要处理的文件  
     content: [  
-        './pages/**/*.{vue,js}',  
-        './components/**/*.{vue,js}',
-        './main.js',  
-        './App.vue',  
+        './pages/**/*.{vue,js,ts}',
+        './components/**/*.{vue,js,ts}',
+        './main.js',
+        './App.vue',
         './index.html'  
     ],  
     theme: {  

types/order.d.ts

@@ -4,71 +4,131 @@
 export interface IGoods {
   productId: number
   productName: string
-  productImages: string
+  productImages?: string
   price: number
-  vipPrice: number | null
-  activityPrice: number | null
-  isVipPrice: number               // 是否有VIP优惠 0-否 1-是
-  productAmount: number            // 购买数量
+  vipPrice?: number | null
+  activityPrice?: number | null
+  isVipPrice?: number               // 是否有VIP优惠 0-否 1-是
+  productAmount?: number            // 购买数量
   delFlag?: number                 // 删除标记 -1-已下架
 }
 
 /**
- * 订单创建参数接口
- */
-export interface ICreateOrderParams {
-  paymentMethod: '4' | '5'  // 支付方式: 4-虚拟币, 5-Google Pay
-  orderMoney: number | string  // 订单金额
-  abroadBookId: number  // 图书ID
-  orderType: 'abroadBook'  // 订单类型
+ * 获取优惠价格参数
+ **/
+export interface IGoodsDiscountParams {
+  productId: number
+  quantity: number
 }
 
 /**
- * Google Pay 验证参数接口
+ * 订单接口
  */
-export interface IGooglePayVerifyParams {
-  purchaseToken: string  // 购买凭证
-  orderSn: string  // 订单号
-  productId: string  // 产品ID
+export interface IOrder {
+  id: number
+  orderSn: string
+  orderMoney: number
+  paymentMethod: string  // '4'-虚拟货币, '5'-真实货币
+  createTime: string
+  [key: string]: any
 }
 
 /**
- * 订单创建响应接口
+ * 课程订单商品信息
  */
-export interface ICreateOrderResponse {
-  code: number
-  orderSn: string  // 订单号
-  msg?: string
+export interface IOrderGoods {
+  productId: number
+  productName: string
+  productImages?: string
+  price: number
+  vipPrice?: number | null
+  activityPrice?: number | null
+  isVipPrice?: number          // 是否有VIP优惠 0-否 1-是
+  productAmount?: number       // 购买数量
+  goodsType: string           // 商品类型 "05" for course
 }
 
 /**
- * Google Pay SKU 信息接口
+ * 优惠券实体信息
  */
-export interface IGooglePaySku {
-  productId: string
-  type: string
-  price: string
-  price_amount_micros: number
-  price_currency_code: string
-  title: string
-  description: string
+export interface ICouponEntity {
+  id: number
+  couponName: string
+  couponAmount: number
+  useLevel: number            // 满多少可用
+  couponRange: number         // 0-全场 1-指定课程 2-指定品类
+  remark?: string
 }
 
 /**
- * Google Pay 支付结果接口
+ * 优惠券信息
  */
-export interface IGooglePayResult {
-  code: number
-  data?: Array<{
-    original: {
-      purchaseToken: string
-      orderId: string
-      packageName: string
-      productId: string
-      purchaseTime: number
-      purchaseState: number
-    }
+export interface ICoupon {
+  id: number
+  couponId: number
+  canUse: number              // 0-不可用 1-可用
+  canUseReason?: string
+  effectType: number          // 0-永久有效
+  endTime?: string
+  couponEntity: ICouponEntity
+}
+
+/**
+ * 课程订单创建参数
+ */
+export interface ICourseOrderCreateParams {
+  buyType: number             // 0-商品页直接下单 1-购物车结算
+  userId: number
+  paymentMethod: number       // 4-天医币
+  orderMoney: number          // 订单金额
+  realMoney: number           // 实收金额
+  jfDeduction: number         // 积分抵扣
+  couponId?: number           // 优惠券ID
+  couponName?: string         // 优惠券名称
+  vipDiscountAmount: number   // VIP折扣金额
+  districtMoney: number       // 地区优惠金额
+  remark?: string             // 备注
+  productList: Array<{
+    productId: number
+    quantity: number
   }>
+  orderType: string           // "order"
+  addressId: number           // 0 for course products
+  appName: string             // "wumen"
+  come: number                // 2
+}
+
+/**
+ * 价格明细项
+ */
+export interface IPriceBreakdownItem {
+  type: number                // 1-商品总价 2-运费 3-优惠券 4-积分 5-活动立减 6-VIP立减
+  text: string
+  imgUrl?: string
+  icon?: string
+}
+
+/**
+ * 订单状态
+ */
+export interface IOrderState {
+  goodsList: IOrderGoods[]
+  totalPrice: number
+  vipPrice: number
+  districtAmount: number
+  actualPayment: number
+  jfNumber: number
+  jfNumberMax: number
+  jfNumberShow: string
+  couponList: ICoupon[]
+  selectedCoupon: ICoupon | null
+  showCouponPopup: boolean
+  remark: string
+  showRemarkPopup: boolean
+  payType: number
+  loading: boolean
+  submitting: boolean
+  buyingFlag: boolean
 }
 
 /**

types/user.ts

@@ -68,23 +68,6 @@ export interface IVipInfo {
   [key: string]: any
 }
 
-/**
- * 订单接口
- */
-export interface IOrder {
-  id: number
-  orderSn: string
-  bookEntity: {
-    id: number
-    name: string
-    images: string
-  }
-  orderMoney: number
-  paymentMethod: string  // '4'-虚拟货币, '5'-真实货币
-  createTime: string
-  [key: string]: any
-}
-
 /**
  * VIP套餐接口
  */

types/vip.d.ts

@@ -0,0 +1,27 @@
+/**
+ * vip套餐项
+ */
+export interface IVipItem {
+  courseCount: number | null // 课程数量
+  state: number | null // 状态 0：在有效期, 1：已过期, null: 未购买
+  originalPrice: number | null // 原价
+  title: string // 套餐名称
+  type: number
+  vcbList?: IVipItemProduct[] // 未办理过使用的商品列表
+  yanqiList?: IVipItemProduct[] // 延期使用商品列表
+  [key: string]: any
+}
+
+/**
+ * vip套餐项商品
+ */
+export interface IVipItemProduct {
+  id: number
+  type: number
+  title: string
+  year: number // vip年数
+  rebateFee: number | null, // 折扣后价格
+  fee: number | null, // 课程价格
+  lastFee?: number | null, // 未使用字段
+  [key: string]: any
+}

uni_modules/uni-config-center/changelog.md

@@ -0,0 +1,6 @@
+## 0.0.3（2022-11-11）
+- 修复 config 方法获取根节点为数组格式配置时错误的转化为了对象的Bug
+## 0.0.2（2021-04-16）
+- 修改插件package信息
+## 0.0.1（2021-03-15）
+- 初始化项目

uni_modules/uni-config-center/package.json

@@ -0,0 +1,81 @@
+{
+  "id": "uni-config-center",
+  "displayName": "uni-config-center",
+  "version": "0.0.3",
+  "description": "uniCloud 配置中心",
+  "keywords": [
+    "配置",
+    "配置中心"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "type": "unicloud-template-function"
+  },
+  "directories": {
+    "example": "../../../scripts/dist"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "u"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-config-center/readme.md

@@ -0,0 +1,93 @@
+# 为什么使用uni-config-center
+
+实际开发中很多插件需要配置文件才可以正常运行，如果每个插件都单独进行配置的话就会产生下面这样的目录结构
+
+```bash
+cloudfunctions
+└─────common 公共模块
+        ├─plugin-a // 插件A对应的目录
+        │  ├─index.js
+        │  ├─config.json // plugin-a对应的配置文件
+        │  └─other-file.cert  // plugin-a依赖的其他文件
+        └─plugin-b // plugin-b对应的目录
+           ├─index.js
+           └─config.json // plugin-b对应的配置文件
+```
+
+假设插件作者要发布一个项目模板，里面使用了很多需要配置的插件，无论是作者发布还是用户使用都是一个大麻烦。
+
+uni-config-center就是用了统一管理这些配置文件的，使用uni-config-center后的目录结构如下
+
+```bash
+cloudfunctions
+└─────common 公共模块
+        ├─plugin-a // 插件A对应的目录
+        │  └─index.js
+        ├─plugin-b // plugin-b对应的目录
+        │  └─index.js
+        └─uni-config-center
+           ├─index.js // config-center入口文件
+           ├─plugin-a
+           │  ├─config.json  // plugin-a对应的配置文件
+           │  └─other-file.cert  // plugin-a依赖的其他文件
+           └─plugin-b
+              └─config.json  // plugin-b对应的配置文件
+```
+
+使用uni-config-center后的优势
+
+- 配置文件统一管理，分离插件主体和配置信息，更新插件更方便
+- 支持对config.json设置schema，插件使用者在HBuilderX内编写config.json文件时会有更好的提示（后续HBuilderX会提供支持）
+
+# 用法
+
+在要使用uni-config-center的公共模块或云函数内引入uni-config-center依赖，请参考：[使用公共模块](https://uniapp.dcloud.net.cn/uniCloud/cf-common)
+
+```js
+const createConfig = require('uni-config-center')
+
+const uniIdConfig = createConfig({
+    pluginId: 'uni-id', // 插件id
+    defaultConfig: { // 默认配置
+        tokenExpiresIn: 7200,
+        tokenExpiresThreshold: 600,
+    },
+    customMerge: function(defaultConfig, userConfig) { // 自定义默认配置和用户配置的合并规则，不设置的情况侠会对默认配置和用户配置进行深度合并
+        // defaudltConfig 默认配置
+        // userConfig 用户配置
+        return Object.assign(defaultConfig, userConfig)
+    }
+})
+
+
+// 以如下配置为例
+// {
+//   "tokenExpiresIn": 7200,
+//   "passwordErrorLimit": 6,
+//   "bindTokenToDevice": false,
+//   "passwordErrorRetryTime": 3600,
+//   "app-plus": {
+//     "tokenExpiresIn": 2592000
+//   },
+//   "service": {
+//     "sms": {
+//       "codeExpiresIn": 300
+//     }
+//   }
+// }
+
+// 获取配置
+uniIdConfig.config() // 获取全部配置，注意：uni-config-center内不存在对应插件目录时会返回空对象
+uniIdConfig.config('tokenExpiresIn') // 指定键值获取配置，返回：7200
+uniIdConfig.config('service.sms.codeExpiresIn') // 指定键值获取配置，返回：300
+uniIdConfig.config('tokenExpiresThreshold', 600) // 指定键值获取配置，如果不存在则取传入的默认值，返回：600
+
+// 获取文件绝对路径
+uniIdConfig.resolve('custom-token.js') // 获取uni-config-center/uni-id/custom-token.js文件的路径
+
+// 引用文件（require）
+uniIDConfig.requireFile('custom-token.js') // 使用require方式引用uni-config-center/uni-id/custom-token.js文件。文件不存在时返回undefined，文件内有其他错误导致require失败时会抛出错误。
+
+// 判断是否包含某文件
+uniIDConfig.hasFile('custom-token.js') // 配置目录是否包含某文件，true: 文件存在，false: 文件不存在
+```

uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "uni-config-center",
+  "version": "0.0.3",
+  "description": "配置中心",
+  "main": "index.js",
+  "keywords": [],
+  "author": "DCloud",
+  "license": "Apache-2.0"
+}

uni_modules/uni-id-common/changelog.md

@@ -0,0 +1,32 @@
+## 1.0.16（2023-04-25）
+- 新增maxTokenLength配置，用于限制数据库用户记录token数组的最大长度
+## 1.0.15（2023-04-06）
+- 修复部分语言国际化出错的Bug
+## 1.0.14（2023-03-07）
+- 修复 admin用户包含其他角色时未包含在token的Bug
+## 1.0.13（2022-07-21）
+- 修复 创建token时未传角色权限信息生成的token不正确的bug
+## 1.0.12（2022-07-15）
+- 提升与旧版本uni-id的兼容性（补充读取配置文件时回退平台app-plus、h5），但是仍推荐使用新平台名进行配置（app、web）
+## 1.0.11（2022-07-14）
+- 修复 部分情况下报`read property 'reduce' of undefined`的错误
+## 1.0.10（2022-07-11）
+- 将token存储在用户表的token字段内，与旧版本uni-id保持一致
+## 1.0.9（2022-07-01）
+- checkToken兼容token内未缓存角色权限的情况，此时将查库获取角色权限
+## 1.0.8（2022-07-01）
+- 修复clientDB默认依赖时部分情况下获取不到uni-id配置的Bug
+## 1.0.7（2022-06-30）
+- 修复config文件不合法时未抛出具体错误的Bug
+## 1.0.6（2022-06-28）
+- 移除插件内的数据表schema
+## 1.0.5（2022-06-27）
+- 修复使用多应用配置时报`Cannot read property 'appId' of undefined`的Bug
+## 1.0.4（2022-06-27）
+- 修复使用自定义token内容功能报错的Bug [详情](https://ask.dcloud.net.cn/question/147945)
+## 1.0.2（2022-06-23）
+- 对齐旧版本uni-id默认配置
+## 1.0.1（2022-06-22）
+- 补充对uni-config-center的依赖
+## 1.0.0（2022-06-21）
+- 提供uni-id token创建、校验、刷新接口，简化旧版uni-id公共模块

uni_modules/uni-id-common/package.json

@@ -0,0 +1,84 @@
+{
+	"id": "uni-id-common",
+	"displayName": "uni-id-common",
+	"version": "1.0.16",
+	"description": "包含uni-id token生成、校验、刷新功能的云函数公共模块",
+	"keywords": [
+        "uni-id-common",
+        "uniCloud",
+        "token",
+        "权限"
+    ],
+	"repository": "https://gitcode.net/dcloud/uni-id-common",
+	"engines": {
+		"HBuilderX": "^3.1.0"
+	},
+    "dcloudext": {
+        "sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+        "npmurl": "",
+        "type": "unicloud-template-function"
+	},
+	"uni_modules": {
+		"dependencies": ["uni-config-center"],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "u",
+					"vue3": "u"
+				},
+				"App": {
+					"app-vue": "u",
+					"app-nvue": "u"
+				},
+				"H5-mobile": {
+					"Safari": "u",
+					"Android Browser": "u",
+					"微信浏览器(Android)": "u",
+					"QQ浏览器(Android)": "u"
+				},
+				"H5-pc": {
+					"Chrome": "u",
+					"IE": "u",
+					"Edge": "u",
+					"Firefox": "u",
+					"Safari": "u"
+				},
+				"小程序": {
+					"微信": "u",
+					"阿里": "u",
+					"百度": "u",
+					"字节跳动": "u",
+					"QQ": "u",
+					"钉钉": "u",
+					"快手": "u",
+					"飞书": "u",
+                    "京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+	}
+}

uni_modules/uni-id-common/readme.md

@@ -0,0 +1,3 @@
+# uni-id-common
+
+文档请参考：[uni-id-common](https://uniapp.dcloud.net.cn/uniCloud/uni-id-common.html)

uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "uni-id-common",
+  "version": "1.0.16",
+  "description": "uni-id token生成、校验、刷新",
+  "main": "index.js",
+  "homepage": "https://uniapp.dcloud.io/uniCloud/uni-id-common.html",
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitee.com/dcloud/uni-id-common.git"
+  },
+  "author": "DCloud",
+  "license": "Apache-2.0",
+  "dependencies": {
+    "uni-config-center": "file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
+  }
+}

uni_modules/uni-upgrade-center-app/changelog.md

@@ -0,0 +1,70 @@
+## 0.6.4（2023-09-01）
+chore: 优化代码结构
+## 0.6.3（2023-08-30）
+- 修复 下载 wgt 时如果后缀名不正确，重命名后安装
+## 0.6.2（2022-11-21）
+- 处理 cloudfunctions 目录
+## 0.6.1（2022-08-17）
+- 修复 后台添加应用市场，但都没有启用的情况下报错的Bug （需要 uni-admin 1.9.3+）
+## 0.6.0（2022-07-19）
+- 新增 支持多应用商店配置（需要 uni-admin 1.9.3+）
+## 0.4.1（2022-05-27）
+- 修复 上版引出的报错问题
+## 0.4.0（2022-05-27）
+- 新增 Android 支持跳转手机自带商店，填写升级包地址时请填写跳转商店链接
+- 新增 改为云对象调用方式，使用更直观
+## 0.3.3（2022-04-14）
+- 修复  调用 check-update，当 code 为 0 时没有回调
+## 0.3.2（2022-01-12）
+- 优化显示逻辑
+## 0.3.1（2021-11-24）
+- 修复 vue3 上图片不显示的Bug
+## 0.3.0（2021-11-18）
+- 移除 wgt 安装成功后提示，防止重启过快弹框不消失
+## 0.2.2（2021-08-25）
+- 兼容vue3.0
+## 0.2.1（2021-07-26）
+- 修复  使用腾讯云并手动填写地址时，导致下载链接失效的bug
+## 0.2.0（2021-07-13）
+- 更新文档  关于报错local_storage_key 为空，请不要将页面路径设置为pages.json中第一项
+## 0.1.9（2021-06-28）
+- 更新文档
+- 修复  wgt安装失败时，按钮状态不对
+## 0.1.8（2021-06-16）
+- 修复  跳转安装时，导致上次下载的apk还没安装就被删掉的bug
+## 0.1.7（2021-06-03）
+- 修改  移除static中的图片
+## 0.1.6（2021-06-03）
+- 修改  下载更新按钮使用CSS渐变色
+## 0.1.5（2021-04-22）
+- 更新check-update函数。现在返回一个Promise，有更新时成功回调，其他情况错误回调
+## 0.1.4（2021-04-13）
+- 更新文档。明确云函数调用结果
+## 0.1.3（2021-04-13）
+- 解耦云函数与弹框处理。utils中新增 call-check-version.js，可用于单独检测是否有更新
+## 0.1.2（2021-04-07）
+- 更新版本对比函数 compare
+## 0.1.1（2021-04-07）
+- 修复 腾讯云空间下载链接不能下载问题
+## 0.1.0（2021-04-07）
+- 新增使用uni.showModal提示升级示例
+- 修改iOS升级提示方式
+## 0.0.7（2021-04-02）
+- 修复在iOS上打开弹框报错
+## 0.0.6（2021-04-01）
+- 兼容旧版本安卓
+## 0.0.5（2021-04-01）
+- 修复低版本安卓上进度条错位
+## 0.0.4（2021-04-01）
+- 更新readme
+- 修复check-update语法错误
+## 0.0.3（2021-04-01）
+- 新增前台更新弹框，详见readme
+- 更新前台检查更新方法
+
+## 0.0.2（2021-03-29）
+- 更新文档
+- 移除 dependencies
+
+## 0.0.1（2021-03-25）
+- 升级中心前台检查更新

uni_modules/uni-upgrade-center-app/package.json

@@ -0,0 +1,99 @@
+{
+  "id": "uni-upgrade-center-app",
+  "displayName": "升级中心 uni-upgrade-center - App",
+  "version": "0.6.4",
+  "description": "uni升级中心 - 客户端检查更新",
+  "keywords": [
+    "uniCloud",
+    "update",
+    "升级",
+    "wgt"
+  ],
+  "repository": "https://gitee.com/dcloud/uni-upgrade-center/tree/master/uni_modules/uni-upgrade-center-app",
+  "engines": {
+    "HBuilderX": "^3.2.14",
+    "uni-app": "^3.1.0",
+    "uni-app-x": "^3.1.0"
+  },
+  "dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "type": "unicloud-template-page",
+    "darkmode": "-",
+    "i18n": "-",
+    "widescreen": "-"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "√",
+        "aliyun": "√"
+      },
+      "client": {
+        "uni-app": {
+          "vue": {
+            "vue2": "-",
+            "vue3": "-"
+          },
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "vue": "-",
+            "nvue": "-",
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-",
+            "alipay": "-",
+            "toutiao": "-",
+            "baidu": "-",
+            "kuaishou": "-",
+            "jd": "-",
+            "harmony": "-",
+            "qq": "-",
+            "lark": "-"
+          },
+          "quickapp": {
+            "huawei": "-",
+            "union": "-"
+          }
+        },
+        "uni-app-x": {
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-"
+          }
+        }
+      }
+    }
+  }
+}

uni_modules/uni-upgrade-center-app/pages/upgrade-popup.vue

@@ -0,0 +1,555 @@
+<template>
+	<view class="mask flex-center">
+		<view class="content botton-radius">
+			<view class="content-top">
+				<text class="content-top-text">{{title}}</text>
+				<image class="content-top" style="top: 0;" width="100%" height="100%" src="../images/bg_top.png">
+				</image>
+			</view>
+			<view class="content-header"></view>
+			<view class="content-body">
+				<view class="title">
+					<text>{{subTitle}}</text>
+					<!-- <text style="padding-left:20rpx;font-size: 0.5em;color: #666;">v.{{version}}</text> -->
+				</view>
+				<view class="body">
+					<scroll-view class="box-des-scroll" scroll-y="true">
+						<text class="box-des">
+							{{contents}}
+						</text>
+					</scroll-view>
+				</view>
+				<view class="footer flex-center">
+					<template v-if="isAppStore">
+						<button class="content-button" style="border: none;color: #fff;" plain @click="jumpToAppStore">
+							{{downLoadBtnTextiOS}}
+						</button>
+					</template>
+					<template v-else>
+						<template v-if="!downloadSuccess">
+							<view class="progress-box flex-column" v-if="downloading">
+								<progress class="progress" border-radius="35" :percent="downLoadPercent" activeColor="#3DA7FF" show-info
+									stroke-width="10" />
+								<view style="width:100%;font-size: 28rpx;display: flex;justify-content: space-around;">
+									<text>{{downLoadingText}}</text>
+									<text>({{downloadedSize}}/{{packageFileSize}}M)</text>
+								</view>
+							</view>
+
+							<button v-else class="content-button" style="border: none;color: #fff;" plain @click="updateApp">
+								{{downLoadBtnText}}
+							</button>
+						</template>
+						<button v-else-if="downloadSuccess && !installed" class="content-button" style="border: none;color: #fff;"
+							plain :loading="installing" :disabled="installing" @click="installPackage">
+							{{installing ? '正在安装……' : '下载完成，立即安装'}}
+						</button>
+
+						<button v-if="installed && isWGT" class="content-button" style="border: none;color: #fff;" plain
+							@click="restart">
+							安装完毕，点击重启
+						</button>
+					</template>
+				</view>
+			</view>
+
+			<image v-if="!is_mandatory" class="close-img" src="../images/app_update_close.png" @click.stop="closeUpdate">
+			</image>
+		</view>
+	</view>
+</template>
+
+<script>
+	const localFilePathKey = 'UNI_ADMIN_UPGRADE_CENTER_LOCAL_FILE_PATH'
+	const platform_iOS = 'iOS';
+	let downloadTask = null;
+	let openSchemePromise
+
+	/**
+	 * 对比版本号，如需要，请自行修改判断规则
+	 * 支持比对	("3.0.0.0.0.1.0.1", "3.0.0.0.0.1")	("3.0.0.1", "3.0")	("3.1.1", "3.1.1.1") 之类的
+	 * @param {Object} v1
+	 * @param {Object} v2
+	 * v1 > v2 return 1
+	 * v1 < v2 return -1
+	 * v1 == v2 return 0
+	 */
+	function compare(v1 = '0', v2 = '0') {
+		v1 = String(v1).split('.')
+		v2 = String(v2).split('.')
+		const minVersionLens = Math.min(v1.length, v2.length);
+
+		let result = 0;
+		for (let i = 0; i < minVersionLens; i++) {
+			const curV1 = Number(v1[i])
+			const curV2 = Number(v2[i])
+
+			if (curV1 > curV2) {
+				result = 1
+				break;
+			} else if (curV1 < curV2) {
+				result = -1
+				break;
+			}
+		}
+
+		if (result === 0 && (v1.length !== v2.length)) {
+			const v1BiggerThenv2 = v1.length > v2.length;
+			const maxLensVersion = v1BiggerThenv2 ? v1 : v2;
+			for (let i = minVersionLens; i < maxLensVersion.length; i++) {
+				const curVersion = Number(maxLensVersion[i])
+				if (curVersion > 0) {
+					v1BiggerThenv2 ? result = 1 : result = -1
+					break;
+				}
+			}
+		}
+
+		return result;
+	}
+
+	export default {
+		data() {
+			return {
+				// 从之前下载安装
+				installForBeforeFilePath: '',
+
+				// 安装
+				installed: false,
+				installing: false,
+
+				// 下载
+				downloadSuccess: false,
+				downloading: false,
+
+				downLoadPercent: 0,
+				downloadedSize: 0,
+				packageFileSize: 0,
+
+				tempFilePath: '', // 要安装的本地包地址
+
+				// 默认安装包信息
+				title: '更新日志',
+				contents: '',
+				is_mandatory: false,
+
+				// 可自定义属性
+				subTitle: '发现新版本',
+				downLoadBtnTextiOS: '立即跳转更新',
+				downLoadBtnText: '立即下载更新',
+				downLoadingText: '安装包下载中，请稍后'
+			}
+		},
+		onLoad({
+			local_storage_key
+		}) {
+			if (!local_storage_key) {
+				console.error('local_storage_key为空，请检查后重试')
+				uni.navigateBack()
+				return;
+			};
+
+			const localPackageInfo = uni.getStorageSync(local_storage_key);
+			if (!localPackageInfo) {
+				console.error('安装包信息为空，请检查后重试')
+				uni.navigateBack()
+				return;
+			};
+
+			const requiredKey = ['version', 'url', 'type']
+			for (let key in localPackageInfo) {
+				if (requiredKey.indexOf(key) !== -1 && !localPackageInfo[key]) {
+					console.error(`参数 ${key} 必填，请检查后重试`)
+					uni.navigateBack()
+					return;
+				}
+			}
+
+			Object.assign(this, localPackageInfo)
+			this.checkLocalStoragePackage()
+		},
+		onBackPress() {
+			// 强制更新不允许返回
+			if (this.is_mandatory) {
+				return true
+			}
+
+			downloadTask && downloadTask.abort()
+		},
+		onHide() {
+			openSchemePromise = null
+		},
+		computed: {
+			isWGT() {
+				return this.type === 'wgt'
+			},
+			isiOS() {
+				return !this.isWGT ? this.platform.includes(platform_iOS) : false;
+			},
+			isAppStore() {
+				return this.isiOS || (!this.isiOS && !this.isWGT && this.url.indexOf('.apk') === -1)
+			}
+		},
+		methods: {
+			checkLocalStoragePackage() {
+				// 如果已经有下载好的包，则直接提示安装
+				const localFilePathRecord = uni.getStorageSync(localFilePathKey)
+				if (localFilePathRecord) {
+					const {
+						version,
+						savedFilePath,
+						installed
+					} = localFilePathRecord
+
+					// 比对版本
+					if (!installed && compare(version, this.version) === 0) {
+						this.downloadSuccess = true;
+						this.installForBeforeFilePath = savedFilePath;
+						this.tempFilePath = savedFilePath
+					} else {
+						// 如果保存的包版本小 或 已安装过，则直接删除
+						this.deleteSavedFile(savedFilePath)
+					}
+				}
+			},
+			async closeUpdate() {
+				if (this.downloading) {
+					if (this.is_mandatory) {
+						return uni.showToast({
+							title: '下载中，请稍后……',
+							icon: 'none',
+							duration: 500
+						})
+					}
+					uni.showModal({
+						title: '是否取消下载？',
+						cancelText: '否',
+						confirmText: '是',
+						success: res => {
+							if (res.confirm) {
+								downloadTask && downloadTask.abort()
+								uni.navigateBack()
+							}
+						}
+					});
+					return;
+				}
+
+				if (this.downloadSuccess && this.tempFilePath) {
+					// 包已经下载完毕，稍后安装，将包保存在本地
+					await this.saveFile(this.tempFilePath, this.version)
+					uni.navigateBack()
+					return;
+				}
+
+				uni.navigateBack()
+			},
+			updateApp() {
+				this.checkStoreScheme().catch(() => {
+					this.downloadPackage()
+				})
+			},
+			// 跳转应用商店
+			checkStoreScheme() {
+				const storeList = (this.store_list || []).filter(item => item.enable)
+				if (storeList && storeList.length) {
+					storeList
+						.sort((cur, next) => next.priority - cur.priority)
+						.map(item => item.scheme)
+						.reduce((promise, cur, curIndex) => {
+							openSchemePromise = (promise || (promise = Promise.reject())).catch(() => {
+								return new Promise((resolve, reject) => {
+									plus.runtime.openURL(cur, (err) => {
+										reject(err)
+									})
+								})
+							})
+							return openSchemePromise
+						}, openSchemePromise)
+					return openSchemePromise
+				}
+
+				return Promise.reject()
+			},
+			downloadPackage() {
+				this.downloading = true;
+
+				//下载包
+				downloadTask = uni.downloadFile({
+					url: this.url,
+					success: res => {
+						if (res.statusCode == 200) {
+							this.downloadSuccess = true;
+							// fix: wgt 文件下载完成后后缀不是 wgt
+						//	if (this.isWGT && res.tempFilePath.split('.').slice(-1) !== 'wgt') {
+							if (this.isWGT && res.tempFilePath.split('.').slice(-1)[0] !== 'wgt'){
+								const failCallback = (e) => {
+									console.log('[FILE RENAME FAIL]：', JSON.stringify(e));
+								}
+								plus.io.resolveLocalFileSystemURL(res.tempFilePath, function(entry) {
+									entry.getParent((parent) => {
+										const newName = `new_wgt_${Date.now()}.wgt`
+										entry.copyTo(parent, newName, (res) => {
+											this.tempFilePath = res.fullPath
+											this.downLoadComplete()
+										}, failCallback)
+									}, failCallback)
+								}, failCallback);
+							} else {
+								this.tempFilePath = res.tempFilePath
+								this.downLoadComplete()
+							}
+						}
+					}
+				});
+
+				downloadTask.onProgressUpdate(res => {
+					this.downLoadPercent = res.progress;
+					this.downloadedSize = (res.totalBytesWritten / Math.pow(1024, 2)).toFixed(2);
+					this.packageFileSize = (res.totalBytesExpectedToWrite / Math.pow(1024, 2)).toFixed(2);
+				});
+			},
+			downLoadComplete() {
+				this.downloading = false;
+			
+				this.downLoadPercent = 0
+				this.downloadedSize = 0
+				this.packageFileSize = 0
+			
+				downloadTask = null;
+
+				// 强制更新，直接安装
+				if (this.is_mandatory) {
+					this.installPackage();
+				}
+			},
+			installPackage() {
+				// #ifdef APP-PLUS
+				// wgt资源包安装
+				if (this.isWGT) {
+					this.installing = true;
+				}
+				plus.runtime.install(this.tempFilePath, {
+					force: false
+				}, async res => {
+					this.installing = false;
+					this.installed = true;
+
+					// wgt包，安装后会提示 安装成功，是否重启
+					if (this.isWGT) {
+						// 强制更新安装完成重启
+						if (this.is_mandatory) {
+							uni.showLoading({
+								icon: 'none',
+								title: '安装成功，正在重启……'
+							})
+
+							setTimeout(() => {
+								uni.hideLoading()
+								this.restart();
+							}, 1000)
+						}
+					} else {
+						const localFilePathRecord = uni.getStorageSync(localFilePathKey)
+						uni.setStorageSync(localFilePathKey, {
+							...localFilePathRecord,
+							installed: true
+						})
+					}
+				}, async err => {
+					// 如果是安装之前的包，安装失败后删除之前的包
+					if (this.installForBeforeFilePath) {
+						await this.deleteSavedFile(this.installForBeforeFilePath)
+						this.installForBeforeFilePath = '';
+					}
+
+					// 安装失败需要重新下载安装包
+					this.installing = false;
+					this.installed = false;
+
+					uni.showModal({
+						title: '更新失败，请重新下载',
+						content: err.message,
+						showCancel: false
+					});
+				});
+
+				// 非wgt包，安装跳出覆盖安装，此处直接返回上一页
+				if (!this.isWGT && !this.is_mandatory) {
+					uni.navigateBack()
+				}
+				// #endif
+			},
+			restart() {
+				this.installed = false;
+				// #ifdef APP-PLUS
+				//更新完重启app
+				plus.runtime.restart();
+				// #endif
+			},
+			saveFile(tempFilePath, version) {
+				return new Promise((resolve, reject) => {
+					uni.saveFile({
+						tempFilePath,
+						success({
+							savedFilePath
+						}) {
+							uni.setStorageSync(localFilePathKey, {
+								version,
+								savedFilePath
+							})
+						},
+						complete() {
+							resolve()
+						}
+					})
+				})
+			},
+			deleteSavedFile(filePath) {
+				uni.removeStorageSync(localFilePathKey)
+				return uni.removeSavedFile({
+					filePath
+				})
+			},
+			jumpToAppStore() {
+				plus.runtime.openURL(this.url);
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background: transparent;
+	}
+
+	.flex-center {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+	}
+
+	.mask {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, .65);
+	}
+
+	.botton-radius {
+		border-bottom-left-radius: 30rpx;
+		border-bottom-right-radius: 30rpx;
+	}
+
+	.content {
+		position: relative;
+		top: 0;
+		width: 600rpx;
+		background-color: #fff;
+		box-sizing: border-box;
+		padding: 0 50rpx;
+		font-family: Source Han Sans CN;
+	}
+
+	.text {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		line-height: 200px;
+		text-align: center;
+		color: #FFFFFF;
+	}
+
+	.content-top {
+		position: absolute;
+		top: -195rpx;
+		left: 0;
+		width: 600rpx;
+		height: 270rpx;
+	}
+
+	.content-top-text {
+		font-size: 45rpx;
+		font-weight: bold;
+		color: #F8F8FA;
+		position: absolute;
+		top: 120rpx;
+		left: 50rpx;
+		z-index: 1;
+	}
+
+	.content-header {
+		height: 70rpx;
+	}
+
+	.title {
+		font-size: 33rpx;
+		font-weight: bold;
+		color: #3DA7FF;
+		line-height: 38px;
+	}
+
+	.footer {
+		height: 150rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+	}
+
+	.box-des-scroll {
+		box-sizing: border-box;
+		padding: 0 40rpx;
+		height: 200rpx;
+		text-align: left;
+	}
+
+	.box-des {
+		font-size: 26rpx;
+		color: #000000;
+		line-height: 50rpx;
+	}
+
+	.progress-box {
+		width: 100%;
+	}
+
+	.progress {
+		width: 90%;
+		height: 40rpx;
+		border-radius: 35px;
+	}
+
+	.close-img {
+		width: 70rpx;
+		height: 70rpx;
+		z-index: 1000;
+		position: absolute;
+		bottom: -120rpx;
+		left: calc(50% - 70rpx / 2);
+	}
+
+	.content-button {
+		text-align: center;
+		flex: 1;
+		font-size: 30rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+		border-radius: 40rpx;
+		margin: 0 18rpx;
+
+		height: 80rpx;
+		line-height: 80rpx;
+
+		background: linear-gradient(to right, #1785ff, #3DA7FF);
+	}
+
+	.flex-column {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+</style>

uni_modules/uni-upgrade-center-app/readme.md

@@ -0,0 +1,126 @@
+## 升级中心 - app插件与 `uni-admin` 版本关系
+
+### `uni-admin >= 1.9.3`：云函数 `checkVersion` 废弃，使用 uni-admin 自带的 `uni-upgrade-center` 云函数。
+
+# uni-upgrade-center - App
+
+### 概述
+
+> 统一管理App及App在`Android`、`iOS`平台上`App安装包`和`wgt资源包`的发布升级
+
+> uni升级中心分为业务插件和后台管理插件。本插件为业务插件，包括uni升级中心客户端检查更新的前后端逻辑。后台管理系统另见 [uni-upgrade-center - Admin](https://ext.dcloud.net.cn/plugin?id=4470)
+
+### uni升级中心 - 客户端检查更新插件
+  - 一键式检查更新，同时支持整包升级与wgt资源包更新
+  - 好看、实用、可自定义的客户端提示框
+
+## 安装指引
+
+1. 依赖数据库`opendb-app-versions`，如果没有此库，请在云服务空间中创建。
+
+2. 使用`HBuilderX 3.1.0+`，因为要使用到`uni_modules`
+
+3. 在插件市场打开本插件页面，在右侧点击`使用 HBuilderX 导入插件`，选择要导入的项目点击确定
+
+4. 绑定一个服务空间。自 `0.6.0` 起，依赖 `uni-admin 1.9.3+` 的 `uni-upgrade-center 云函数`，请和 uni-admin 项目关联同一个服务空间
+
+5. 找到`/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/check-version`，右键上传部署。自 `0.6.0` 起，依赖 `uni-admin 1.9.3+` 的 `uni-upgrade-center 云函数`，插件不再单独提供云函数，这样可以省下一个云函数名额。
+
+6. 在`pages.json`中添加页面路径。**注：请不要设置为pages.json中第一项**
+```json
+"pages": [
+		// ……其他页面配置
+		{
+			"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
+			"style": {
+				"disableScroll": true,
+				"app-plus": {
+					"backgroundColorTop": "transparent",
+					"background": "transparent",
+					"titleNView": false,
+					"scrollIndicator": false,
+					"popGesture": "none",
+					"animationType": "fade-in",
+					"animationDuration": 200
+
+				}
+			}
+		}
+]
+```
+
+7. 将`@/uni_modules/uni-upgrade-center-app/utils/check-update`import到需要用到的地方，调用一下即可
+	1. 默认使用当前绑定的服务空间，如果要请求其他服务空间，可以使用其他服务空间的 `callFunction`。[详情](https://uniapp.dcloud.io/uniCloud/cf-functions.html#call-by-function-cross-space)
+
+8. 升级弹框可自行编写，也可以使用`uni.showModal`，或使用现有的升级弹框样式，如果不满足UI需求请自行替换资源文件。在`utils/check-update.js`中都有实例。
+
+9. wgt更新时，打包前请务必将manifest.json中的版本修改为更高版本。
+
+### 更新下载安装`check-update.js`
+
+*该函数在utils目录下*
+
+1. 如果是静默更新，则不会打开更新弹框，会在后台下载后安装，下次启动应用生效
+
+2. 如果是 iOS，则会直接打开AppStore的链接
+
+3. 其他情况，会将`check-version`返回的结果保存在localStorage中，并跳转进入`upgrade-popup.vue`打开更新弹框
+
+### 检查更新函数`check-version`
+
+*该函数在uniCloud/cloudfunctions目录下*
+
+1. 使用检查更新需要传递三个参数 `appid`、`appVersion`、`wgtVersion`
+
+2. `appid` 使用 plus.runtime.appid 获取，*注：真机运行时为固定值HBuilder，在调试的时候请使用本地调试云函数*
+
+3. `appVersion` 使用 plus.runtime.version 获取
+
+4. `wgtVersion` 使用 plus.runtime.getProperty(plus.runtime.appid,(wgtInfo) => { wgtInfo.version }) 获取
+
+5. `check-version`云函数内部会自动获取 App 平台
+
+
+**Tips**
+
+1. `check-version`云函数内部有版本对比函数（compare）。
+	- 使用多段式版本格式（如："3.0.0.0.0.1.0.1", "3.0.0.0.0.1"）。如果不满足对比规则，请自行修改。
+	- 如果修改，请将*pages/upgrade-popup.vue*中*compare*函数一并修改
+
+## 项目代码说明
+
+### 更新弹框
+- `upgrade-popup.vue` - 更新应用：
+	- 如果云函数`check-version`返回的参数表明需要更新，则将参数保存在localStorage中，带着键值跳转该页面
+	- 进入时会先从localStorage中尝试取出之前存的安装包路径（此包不会是强制安装类型的包）
+	- 如果有已经保存的包，则和传进来的 `version` 进行比较，如果相等则安装。大于和小于都不进行安装，因为admin端可能会调整包的版本。不符合更新会将此包删除
+	- 如果本地没有包或者包不符合安装条件，则进行下载安装包
+	- 点击下载会有进度条、已下载大小和下载包的大小
+	- 下载完成会提示安装：
+		- 如果是 wgt 包，安装时则会提示 正在安装…… 和 安装完成。安装完成会提示是否重启
+		- 如果是 原生安装包，则直接跳出去覆盖安装
+	- 下载过程中，如果退出会提示是否取消下载。如果是强制更新，则只会提示正在下载请稍后，此时不可退出
+	- 如果是下载完成了没有安装就退出，则会将下载完成的包保存在本地。将包的本地路径和包version保存在localStorage中
+
+### 工具类 utils
+- `call-check-version`
+	- 请求云函数`check-version`拿取版本检测结果
+- `check-update`
+	- 调用`call-check-version`并根据结果判断是否显示更新弹框
+
+### 云函数
+- `check-version` - 检查应用更新：
+	- 根据传参，先检测传参是否完整，appid appVersion wgtVersion 必传
+	- 先从数据库取出所有该平台（会从上下文读取平台信息）的所有线上发行更新
+	- 再从所有线上发行更新中取出版本最大的一版。如果可以，尽量先检测wgt的线上发行版更新
+	- 使用上一步取出的版本包的版本号 和传参 appVersion、wgtVersion 来检测是否有更新。必须同时大于这两项，因为上一次可能是wgt热更新，否则返回暂无更新
+	- 如果库中 wgt包 版本大于传参 appVersion，但是不满足 min_uni_version < appVersion，则不会使用wgt更新，会接着判断库中 app包version 是否大于 appVersion
+	- 返回结果：
+
+		|code|message|
+		|:-:|:-:|
+		|0|当前版本已经是最新的，不需要更新|
+		|101|wgt更新|
+		|102|整包更新|
+		|-101|暂无更新或检查appid是否填写正确|
+		|-102|请检查传参是否填写正确|

uni_modules/uni-upgrade-center-app/uniCloud/database/db_init.json

@@ -0,0 +1 @@
+{}

uni_modules/uni-upgrade-center-app/utils/call-check-version.js

@@ -0,0 +1,33 @@
+export default function() {
+	// #ifdef APP-PLUS
+	return new Promise((resolve, reject) => {
+		plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
+			console.log('哈哈哈哈', widgetInfo)
+			let data = {
+				action: 'checkVersion',
+				appid: plus.runtime.appid,
+				appVersion: plus.runtime.version,
+				wgtVersion: widgetInfo.version
+			}
+			uniCloud.callFunction({
+				name: 'uni-upgrade-center',
+				data,
+				success: (e) => {
+					console.log("e: ", e);
+					resolve(e)
+				},
+				fail: (error) => {
+					reject(error)
+				}
+			})
+		})
+	})
+	// #endif
+	// #ifndef APP-PLUS
+	return new Promise((resolve, reject) => {
+		reject({
+			message: '请在App中使用'
+		})
+	})
+	// #endif
+}

uni_modules/uni-upgrade-center-app/utils/check-update.js

@@ -0,0 +1,159 @@
+import callCheckVersion from './call-check-version'
+
+// 推荐再App.vue中使用
+const PACKAGE_INFO_KEY = '__package_info__'
+
+export default function() {
+	// #ifdef APP-PLUS
+	return new Promise((resolve, reject) => {
+		callCheckVersion().then(async (e) => {
+			console.log('hhhhhhhhhhhh', e)
+			if (!e.result) return;
+			const {
+				code,
+				message,
+				is_silently, // 是否静默更新
+				url, // 安装包下载地址
+				platform, // 安装包平台
+				type // 安装包类型
+			} = e.result;
+
+			// 此处逻辑仅为实例，可自行编写
+			if (code > 0) {
+				// 腾讯云和阿里云下载链接不同，需要处理一下，阿里云会原样返回
+				const {
+					fileList
+				} = await uniCloud.getTempFileURL({
+					fileList: [url]
+				});
+				if (fileList[0].tempFileURL)
+					e.result.url = fileList[0].tempFileURL;
+
+				resolve(e)
+
+				// 静默更新，只有wgt有
+				if (is_silently) {
+					uni.downloadFile({
+						url: e.result.url,
+						success: res => {
+							if (res.statusCode == 200) {
+								// 下载好直接安装，下次启动生效
+								plus.runtime.install(res.tempFilePath, {
+									force: false
+								});
+							}
+						}
+					});
+					return;
+				}
+
+				/**
+				 * 提示升级一
+				 * 使用 uni.showModal
+				 */
+				// return updateUseModal(e.result)
+
+				/**
+				 * 提示升级二
+				 * 官方适配的升级弹窗，可自行替换资源适配UI风格
+				 */
+				uni.setStorageSync(PACKAGE_INFO_KEY, e.result)
+				uni.navigateTo({
+					url: `/uni_modules/uni-upgrade-center-app/pages/upgrade-popup?local_storage_key=${PACKAGE_INFO_KEY}`,
+					fail: (err) => {
+						console.error('更新弹框跳转失败', err)
+						uni.removeStorageSync(PACKAGE_INFO_KEY)
+					}
+				})
+
+				return
+			} else if (code < 0) {
+				// TODO 云函数报错处理
+				console.error(message)
+				return reject(e)
+			}
+			return resolve(e)
+		}).catch(err => {
+			// TODO 云函数报错处理
+			console.error(err.message)
+			reject(err)
+		})
+	});
+	// #endif
+}
+
+/**
+ * 使用 uni.showModal 升级
+ */
+function updateUseModal(packageInfo) {
+	const {
+		title, // 标题
+		contents, // 升级内容
+		is_mandatory, // 是否强制更新
+		url, // 安装包下载地址
+		platform, // 安装包平台
+		type // 安装包类型
+	} = packageInfo;
+
+	let isWGT = type === 'wgt'
+	let isiOS = !isWGT ? platform.includes('iOS') : false;
+	let confirmText = isiOS ? '立即跳转更新' : '立即下载更新'
+
+	return uni.showModal({
+		title,
+		content: contents,
+		showCancel: !is_mandatory,
+		confirmText,
+		success: res => {
+			if (res.cancel) return;
+
+			// 安装包下载
+			if (isiOS) {
+				plus.runtime.openURL(url);
+				return;
+			}
+
+			uni.showToast({
+				title: '后台下载中……',
+				duration: 1000
+			});
+
+			// wgt 和 安卓下载更新
+			downloadTask = uni.downloadFile({
+				url,
+				success: res => {
+					if (res.statusCode !== 200) {
+						console.error('下载安装包失败', err);
+						return;
+					}
+					// 下载好直接安装，下次启动生效
+					plus.runtime.install(res.tempFilePath, {
+						force: false
+					}, () => {
+						if (is_mandatory) {
+							//更新完重启app
+							plus.runtime.restart();
+							return;
+						}
+						uni.showModal({
+							title: '安装成功是否重启？',
+							success: res => {
+								if (res.confirm) {
+									//更新完重启app
+									plus.runtime.restart();
+								}
+							}
+						});
+					}, err => {
+						uni.showModal({
+							title: '更新失败',
+							content: err
+								.message,
+							showCancel: false
+						});
+					});
+				}
+			});
+		}
+	});
+}

utils/index.ts

@@ -1,6 +1,7 @@
 import { t } from '@/utils/i18n'
 /**
  * 页面跳转
+ * @param {string} path - 要跳转的页面路径
  */
 export const onPageJump = (path: string) => {
   uni.navigateTo({
@@ -17,8 +18,10 @@ export const onPageBack = () => {
 
 /**
  * 拨打电话
+ * @param {string} phoneNumber - 要拨打的电话号码
+ * @param {string} title - 拨打电话提示的标题，默认值为空字符串
  */
-export const makePhoneCall = (phoneNumber: string, title: string) => {
+export const makePhoneCall = (phoneNumber: string, title: string = '') => {
   uni.showModal({
     title: title,
     content: phoneNumber,
@@ -42,8 +45,10 @@ export const makePhoneCall = (phoneNumber: string, title: string) => {
 
 /**
  * 复制到剪贴板
+ * @param {string} content - 要复制的内容
+ * @param {string} title - 复制成功提示的标题，默认值为空字符串
  */
-export const copyToClipboard = (content: string, title: string, t: Function) => {
+export const copyToClipboard = (content: string, title: string = '') => {
   uni.setClipboardData({
     data: content,
     success: () => {
@@ -52,8 +57,76 @@ export const copyToClipboard = (content: string, title: string, t: Function) =>
         icon: 'none'
       })
     },
-    fail: (error) => {
+    fail: (error: any) => {
       console.error('复制失败:', error)
     }
   })
+}
+
+/**
+ * 计算最低价格
+ * @param {object} priceData - 价格数据对象，键为价格类型，值为价格
+ * @returns {object} - 包含最低价格的键值对，{ key: 价格类型, value: 最低价格 }
+ */
+export const calculateLowestPrice = (priceData: object): { key: string, value: number } => {
+  const validEntries = Object.entries(priceData)
+        .filter(([, value]) => typeof value === 'number' && value !== 0);
+    
+    if (validEntries.length === 0) {
+        throw new Error('No valid non-zero price found in the data');
+    }
+    
+    const [minKey, minValue] = validEntries.reduce((min, curr) => 
+        curr[1] < min[1] ? curr : min
+    );
+    
+    return { key: minKey, value: minValue };
+}
+
+/**
+ * Parse the time to string
+ * @param {(Object|string|number)} time
+ * @param {string} cFormat
+ * @returns {string | null}
+ */
+export function parseTime(time: any, cFormat: string) {
+  if (arguments.length === 0 || !time) {
+    return null
+  }
+  const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if (typeof time === 'object') {
+    date = time
+  } else {
+    if ((typeof time === 'string')) {
+      if ((/^[0-9]+$/.test(time))) {
+        // support "1548221490638"
+        time = parseInt(time)
+      } else {
+        // support safari
+        time = time.replace(new RegExp(/-/gm), '/')
+      }
+    }
+
+    if ((typeof time === 'number') && (time.toString().length === 10)) {
+      time = time * 1000
+    }
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  }
+  const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
+    const value = formatObj[key as keyof typeof formatObj]
+    // Note: getDay() returns 0 on Sunday
+    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value as number] }
+    return value.toString().padStart(2, '0')
+  })
+  return time_str
 }