修复：合并丢失的代码

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')

api/modules/order.ts

@@ -8,7 +8,8 @@ import type {
   IOrderGoods,
   ICoupon,
   ICourseOrderCreateParams,
-  IOrderInitData
+  IOrderInitData,
+  IGoodsDiscountParams
 } from '@/types/order'
 import type { IUserInfo } from '@/types/user'
 
@@ -108,7 +109,7 @@ export const orderApi = {
    * 获取地区优惠金额
    * @param productList 商品列表
    */
-  async getDistrictAmount(productList: Array<{ productId: number; quantity: number }>) {
+  async getDistrictAmount(productList: IGoodsDiscountParams[]) {
     const res = await mainClient.request<IApiResponse<{ districtAmount: number }>>({
       url: 'book/buyOrder/getDistrictAmount',
       method: 'POST',
@@ -144,10 +145,10 @@ export const orderApi = {
   },
 
   /**
-   * 创建课程订单
+   * 创建订单
    * @param data 订单数据
    */
-  async placeCourseOrder(data: ICourseOrderCreateParams) {
+  async placeOrder(data: ICourseOrderCreateParams) {
     const res = await mainClient.request<IApiResponse<{ orderSn: string; money: number }>>({
       url: 'book/buyOrder/placeOrder',
       method: 'POST',

api/modules/user.ts

@@ -253,4 +253,16 @@ export async function getActivityDescription() {
     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

@@ -26,53 +26,47 @@
       <!-- 商品总价 -->
       <view class="price-item">
         <text class="label">{{ $t('order.totalPrice') }}</text>
-        <text class="value">{{ totalPrice.toFixed(2) }} 天医币</text>
+        <text class="value">{{ totalAmount.toFixed(2) }} {{ t('global.coin') }}</text>
       </view>
       
       <!-- 优惠券 -->
       <!-- <coupon v-model="selectedCoupon" /> -->
       
       <!-- 活动立减 -->
-      <view v-if="hasActivityDiscount" class="price-item">
+      <view v-if="promotionDiscounted > 0" class="price-item">
-        <text class="label">{{ $t('order.activityDiscount') }}</text>
+        <text class="label">{{ $t('order.promotionDiscounted') }}</text>
-        <text class="discount-value">-￥{{ activityDiscountAmount.toFixed(2) }}</text>
+        <text class="discount-value">-{{ promotionDiscounted.toFixed(2) }} {{ t('global.coin') }}</text>
       </view>
       
       <!-- VIP专享立减 -->
-      <view v-if="vipPrice > 0" class="price-item">
+      <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">-￥{{ vipPrice.toFixed(2) }}</text>
+        <text class="discount-value">-{{ vipDiscounted.toFixed(2) }} {{ t('global.coin') }}</text>
-      </view>
-      
-      <!-- 地区优惠 -->
-      <view v-if="districtAmount > 0" class="price-item">
-        <text class="label">{{ $t('order.districtDiscount') }}</text>
-        <text class="discount-value">-￥{{ districtAmount.toFixed(2) }}</text>
       </view>
       
       <!-- 积分 -->
-      <view v-if="allowPointPay && userInfo.jf > 0" class="price-item">
+      <view v-if="allowPointPay && userInfo?.jf > 0" class="price-item">
         <view class="label-row">
           <image src="/static/icon/jifen.png" class="icon-img" />
           <text class="label">{{ $t('order.points') }}</text>
           <text class="points-total">
-            ({{ $t('order.allPoints') }}：{{ userInfo.jf }})
+            ({{ $t('order.allPoints') }}：{{ userInfo?.jf || 0 }})
           </text>
         </view>
-        <text class="discount-value">-{{ jfNumber.toFixed(2) }}</text>
+        <text class="discount-value">-{{ pointsDiscounted.toFixed(2) }}</text>
       </view>
       
       <!-- 积分输入 -->
-      <view v-if="allowPointPay && userInfo.jf > 0" class="points-input-section">
+      <view v-if="allowPointPay && userInfo?.jf > 0" class="points-input-section">
         <text class="points-label">
-          {{ $t('order.maxPoints', { max: jfNumberMax }) }}
+          {{ $t('order.maxPoints', { max: pointsUsableMax }) }}
         </text>
         <view class="points-input-box">
           <input
-            v-model="jfNumber"
+            v-model="pointsDiscounted"
             type="number"
             clearable
             :placeholder="$t('order.pointsPlaceholder')"
@@ -94,9 +88,9 @@
     <view class="bottom-bar">
       <view class="total-info">
         <text class="label">{{ $t('order.total') }}：</text>
-        <text class="amount">{{ actualPayment.toFixed(2) }} 天医币</text>
+        <text class="amount">{{ finalAmount }} {{ t('global.coin') }}</text>
       </view>
-      <wd-button type="primary" :loading="submitting" @click="handleSubmit">
+      <wd-button type="primary" @click="handleSubmit">
         {{ $t('order.submit') }}
       </wd-button>
     </view>
@@ -120,7 +114,7 @@
         </view>
         
         <view class="popup-footer">
-          <wd-button type="primary" block @click="handleRemarkConfirm">{{ $t('global.ok') }}</wd-button>
+          <wd-button type="primary" block @click="showRemarkPopup = false">{{ $t('global.ok') }}</wd-button>
         </view>
       </view>
     </wd-popup>
@@ -128,93 +122,67 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch } from 'vue'
+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 { IOrderGoods } from '@/types/order'
+import type { IGoods, IGoodsDiscountParams } from '@/types/order'
 import PayWay from '@/components/order/PayWay.vue'
 
+const userStore = useUserStore()
+
 // 使用页面传参
 interface Props {
-  goodsList: IOrderGoods[],
+  goodsList: IGoods[],
   userInfo: object,
   allowPointPay: boolean,
+  orderType: string,
+  backStep: number // 购买完成后返回几层页面
 }
 const props = withDefaults(defineProps<Props>(), {
   goodsList: () => [],
   userInfo: () => ({}),
-  allowPointPay: () => true
+  allowPointPay: true,
+  orderType: 'order',
+  backStep: 1
 })
 
-// 价格相关
-const totalPrice = ref(0)
-const vipPrice = ref(0)
-const districtAmount = ref(0)
-const actualPayment = ref(0)
-
-// 积分相关
-const jfNumber = ref(0)
-const jfNumberMax = ref(0)
-
-// 优惠券相关
-
-
 // 订单备注
 const remark = ref('')
 const showRemarkPopup = ref(false)
 
-// 支付相关
+// 价格相关
+const totalAmount = ref(0) // 商品总价
+const vipDiscounted = ref(0) // VIP专享立减
+const promotionDiscounted = ref(0) // 活动优惠金额
+const couponDiscounted = ref(0) // 优惠券优惠金额
+const finalAmount = ref<string | number>('--') // 最终支付金额
 
-// UI状态
+// 积分相关
-const submitting = ref(false)
+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 hasActivityDiscount = computed(() => {
-  return props.goodsList.some(item => item.activityPrice && item.activityPrice > 0)
-})
-
-/**
- * 活动优惠金额
- */
-const activityDiscountAmount = computed(() => {
-  return props.goodsList.reduce((sum, item) => {
-    if (item.activityPrice && item.activityPrice > 0) {
-      return sum + (item.price - item.activityPrice) * item.productAmount
-    }
-    return sum
-  }, 0)
-})
-
-/**
- * 处理商品数量变化
- */
-const handleQuantityChange = async (item: IOrderGoods, value: number) => {
-  try {
-    // 更新购物车
-    await orderApi.updateCart({
-      productId: item.productId,
-      productAmount: value,
-      price: item.price
-    })
-    
-    // 重新获取商品列表和计算价格
-    // await getGoodsList()
-  } catch (error) {
-    console.error('更新数量失败:', error)
-    uni.showToast({
-      title: '更新失败',
-      icon: 'none'
-    })
-  }
-}
-
 /**
  * 计算所有价格
  */
@@ -223,15 +191,17 @@ const calculateAllPrices = async () => {
     // 计算商品总价
     calculateTotalPrice()
     
-    // 获取VIP优惠
+    props.orderType === 'order' && await Promise.all([
-    // await calculateVipDiscount()
+      // 获取VIP优惠
-    
+      calculateVipDiscounted(),
-    // 获取地区优惠
+      
-    // await calculateDistrictDiscount()
+      // 获取活动优惠
-    
+      calculatePromotionDiscounted()
-    // 获取优惠券列表
+
-    // await getAvailableCoupons()
+      // 获取优惠券列表
-    
+      // await getAvailableCoupons()
+    ])
+
     // 计算最终价格
     calculateFinalPrice()
   } catch (error) {
@@ -243,8 +213,7 @@ const calculateAllPrices = async () => {
  * 计算商品总价
  */
 const calculateTotalPrice = () => {
-  console.log('商品列表:', props.goodsList)
+  totalAmount.value = props.goodsList.reduce((sum: number, item: IGoods) => {
-  totalPrice.value = props.goodsList.reduce((sum, item) => {
     // return sum + (item.price * item.productAmount)
     return sum + (item.price * 1)
   }, 0)
@@ -253,95 +222,47 @@ const calculateTotalPrice = () => {
 /**
  * 计算VIP优惠
  */
-const calculateVipDiscount = async () => {
+const calculateVipDiscounted = async () => {
-  try {
+  const res = await orderApi.getVipDiscountAmount(goodsListParams.value)
-    const productList = props.goodsList.map(item => ({
+  vipDiscounted.value = res.discountAmount
-      productId: item.productId,
-      quantity: item.productAmount
-    }))
-    
-    const res = await orderApi.getVipDiscountAmount(productList)
-    if (res.code === 0 && res.data) {
-      vipPrice.value = res.data.discountAmount
-    }
-  } catch (error) {
-    console.error('获取VIP优惠失败:', error)
-  }
 }
 
 /**
  * 计算活动优惠
  */
-const calculateDistrictDiscount = async () => {
+const calculatePromotionDiscounted = async () => {
-  try {
+  const res = await orderApi.getDistrictAmount(goodsListParams.value)
-    const productList = props.goodsList.map(item => ({
+  promotionDiscounted.value = res.districtAmount
-      productId: item.productId,
-      quantity: item.productAmount
-    }))
-    
-    const res = await orderApi.getDistrictAmount(productList)
-    if (res.code === 0 && res.data) {
-      districtAmount.value = res.data.districtAmount
-    }
-  } catch (error) {
-    console.error('获取地区优惠失败:', error)
-  }
 }
 
 /**
  * 获取可用优惠券
  */
-const getAvailableCoupons = async () => {
+// const getAvailableCoupons = async () => {
-  try {
+//   try {
-    const shopProductInfos = props.goodsList.map(item => {
+//     const shopProductInfos = props.goodsList.map(item => {
-      const price = item.activityPrice && item.activityPrice > 0 ? item.activityPrice : item.price
+//       const price = item.activityPrice && item.activityPrice > 0 ? item.activityPrice : item.price
-      return `${item.productId}:${price}:${item.productAmount}`
+//       return `${item.productId}:${price}:${item.productAmount}`
-    }).join(',')
+//     }).join(',')
     
-    const res = await orderApi.getCouponListPayment(shopProductInfos)
+//     const res = await orderApi.getCouponListPayment(shopProductInfos)
-    if (res.code === 0 && res.data) {
+//     if (res.code === 0 && res.data) {
-      couponList.value = res.data.couponHistoryList || []
+//       couponList.value = res.data.couponHistoryList || []
       
-      // 如果当前选中的优惠券不可用，清除选择
+//       // 如果当前选中的优惠券不可用，清除选择
-      if (selectedCoupon.value) {
+//       if (selectedCoupon.value) {
-        const stillAvailable = couponList.value.find(
+//         const stillAvailable = couponList.value.find(
-          c => c.couponId === selectedCoupon.value?.couponId && c.canUse === 1
+//           c => c.couponId === selectedCoupon.value?.couponId && c.canUse === 1
-        )
+//         )
-        if (!stillAvailable) {
+//         if (!stillAvailable) {
-          selectedCoupon.value = null
+//           selectedCoupon.value = null
-        }
+//         }
-      }
+//       }
-    }
+//     }
-  } catch (error) {
+//   } catch (error) {
-    console.error('获取优惠券失败:', error)
+//     console.error('获取优惠券失败:', error)
-  }
+//   }
-}
+// }
-
-/**
- * 计算最终价格
- */
-const calculateFinalPrice = () => {
-  // const couponAmount = selectedCoupon.value?.couponEntity.couponAmount || 0
-  const couponAmount = 0
-  
-  // 计算最大可用积分
-  const orderAmountAfterDiscount = totalPrice.value - districtAmount.value - vipPrice.value
-  jfNumberMax.value = Math.min(
-    props.userInfo.jf || 0,
-    Math.floor(orderAmountAfterDiscount - couponAmount)
-  )
-  
-  // 限制当前积分不超过最大值
-  if (jfNumber.value > jfNumberMax.value) {
-    jfNumber.value = jfNumberMax.value
-  }
-  
-  // 计算实付款
-  actualPayment.value = Math.max(
-    0,
-    totalPrice.value - couponAmount - jfNumber.value - districtAmount.value - vipPrice.value
-  )
-}
 
 /**
  * 处理积分输入
@@ -353,7 +274,7 @@ const handlePointsInput = (value: any) => {
   val = val.replace(/[^0-9]/g, '')
   
   if (val === '0' || val === '') {
-    jfNumber.value = 0
+    pointsDiscounted.value = 0
   } else {
     let numericValue = parseInt(val, 10)
     if (numericValue < 0 || isNaN(numericValue)) {
@@ -361,11 +282,11 @@ const handlePointsInput = (value: any) => {
     }
     
     // 确保不超过最大值
-    if (numericValue >= jfNumberMax.value) {
+    if (numericValue >= pointsUsableMax.value) {
-      numericValue = jfNumberMax.value
+      numericValue = pointsUsableMax.value
     }
     
-    jfNumber.value = numericValue
+    pointsDiscounted.value = numericValue
   }
   
   // 重新计算实付款
@@ -376,32 +297,52 @@ const handlePointsInput = (value: any) => {
  * 清除积分输入
  */
 const handlePointsClear = () => {
-  jfNumber.value = 0
+  pointsDiscounted.value = 0
   calculateFinalPrice()
 }
 
 /**
- * 跳转到充值页面
+ * 计算最终价格
  */
-const goToRecharge = () => {
+const calculateFinalPrice = () => {
-  uni.navigateTo({
+  // const couponAmount = selectedCoupon.value?.couponEntity.couponAmount || 0
-    url: '/pages/user/wallet/recharge/index?source=order'
+  const couponAmount = 0
-  })
+  
-}
+  // 计算最大可用积分
-
+  const orderAmountAfterDiscount = totalAmount.value - promotionDiscounted.value - vipDiscounted.value
-/**
+  pointsUsableMax.value = Math.min(
- * 确认备注
+    props?.userInfo?.jf || 0,
- */
+    Math.floor(orderAmountAfterDiscount - couponAmount)
-const handleRemarkConfirm = () => {
+  )
-  showRemarkPopup.value = false
+  
+  // 限制当前积分不超过最大值
+  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 (actualPayment.value > props.userInfo.peanutCoin) {
+  if (finalAmount.value > props.userInfo.peanutCoin) {
     uni.showToast({
       title: t('order.insufficientBalance'),
       icon: 'none'
@@ -415,77 +356,56 @@ const validateOrder = (): boolean => {
 /**
  * 提交订单
  */
-const handleSubmit = async () => {
+const handleSubmit = async () => {  
-  if (submitting.value) {
-    uni.showToast({
-      title: t('order.tooFrequent'),
-      icon: 'none'
-    })
-    return
-  }
-  
   // 验证订单
-  if (!validateOrder()) {
+  if (!validateOrder()) return
-    return
-  }
-  
-  try {
-    submitting.value = true
-    
-    // 创建订单 此app用天医币支付，创建订单成功即支付成功
-    await createOrder()
 
-    uni.showToast({
+  // 创建订单 此app用天医币支付，创建订单成功即支付成功
-      title: t('order.orderSuccess'),
+  await createOrder()
-      icon: 'success'
+
-    })
+  // 重新获取用户信息更新store和本地缓存
-    
+  const res = await getUserInfo()
-  } catch (error) {
+  userStore.setUserInfo(res.result)
-    console.error('提交订单失败:', error)
+
-    uni.showToast({
+  uni.showToast({
-      title: t('order.orderFailed'),
+    title: t('order.orderSuccess'),
-      icon: 'none'
+    icon: 'success'
-    })
+  })
-  } finally {
+
-    submitting.value = false
+  // 返回上一页
-  }
+  uni.navigateBack({
+    delta: props.backStep
+  })
 }
 
 /**
  * 创建订单
  */
 const createOrder = async (): Promise<string | null> => {
-  try {    
+  const orderParams = {
-    const orderParams = {
+    userId: props.userInfo.id,
-      userId: props.userInfo.id,
+    paymentMethod: 4, // 天医币
-      paymentMethod: 4, // 天医币
+    orderMoney: totalAmount.value,
-      orderMoney: totalPrice.value,
+    realMoney: finalAmount.value,
-      realMoney: actualPayment.value,
+    jfDeduction: pointsDiscounted.value,
-      jfDeduction: jfNumber.value,
+    // couponId: selectedCoupon.value?.id,
-      // couponId: selectedCoupon.value?.id,
+    // couponName: selectedCoupon.value?.couponEntity.couponName,
-      // couponName: selectedCoupon.value?.couponEntity.couponName,
+    vipDiscountAmount: vipDiscounted.value,
-      // vipDiscountAmount: vipPrice.value,
+    districtMoney: promotionDiscounted.value,
-      // districtMoney: districtAmount.value,
+    remark: remark.value,
-      remark: remark.value,
+    orderType: props.orderType,
-      productList: props.goodsList.map(item => ({
+    productList: props.orderType === 'order' ? goodsListParams.value : null,
-        productId: item.productId,
+    vipBuyConfigId: props.orderType === 'vip' ? props.goodsList[0].productId : null,
-        quantity: item.productAmount || 1
+    abroadVipId: props.orderType === 'abroadVip' ? props.goodsList[0].productId : null,
-      })),
+    come: 10
-      orderType: 'order',
-      come: 10
-    }
-    
-    const res = await orderApi.placeCourseOrder(orderParams)
-    
-    if (res.code === 0 && res.orderSn) {
-      return res.orderSn
-    }
-    
-    return null
-  } catch (error) {
-    console.error('创建订单失败:', error)
-    throw error
   }
+  
+  const res = await orderApi.placeOrder(orderParams)
+  
+  if (res.orderSn) {
+    return res.orderSn
+  }
+  return null
 }
 </script>
 

components/order/GoodsSelector.vue

@@ -9,11 +9,8 @@
         <image :src="goods[selectedIndex].productImages" mode="aspectFit" class="goods-cover" />
         <view class="info">
           <view class="name">{{ goods[selectedIndex].productName }}</view>
-          <view class="price-info">
+          <!-- 商品价格组件 -->
-            <text class="price">{{ selectedGoodsPrice.lowestPrice }} 天医币</text>
+          <GoodsPrice :goods="goods[selectedIndex]" />
-            <text class="price-label">{{ selectedGoodsPrice.priceLabel }}</text>
-            <text v-if="selectedGoodsPrice.priceLabel" class="original-price">{{ goods[selectedIndex].price }} 天医币</text>
-          </view>
         </view>
       </view>
       
@@ -32,11 +29,8 @@
           <view class="goods-info">
             <text class="goods-name">{{ item.productName }}</text>
 
-            <view class="price-info">
+            <!-- 商品价格组件 -->
-              <text class="price">{{ calculatePrice(item).lowestPrice }} 天医币</text>
+            <GoodsPrice :goods="item" />
-              <text class="price-label">{{ calculatePrice(item).priceLabel }}</text>
-              <text v-if="calculatePrice(item).priceLabel" class="original-price">{{ item.price }} 天医币</text>
-            </view>
           </view>
         </view>
       </view>
@@ -52,12 +46,10 @@
 <script setup lang="ts">
 import { ref, computed, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { useUserStore } from '@/stores/user'
-import { calculateLowestPrice } from '@/utils/index'
 import type { IGoods } from '@/types/order'
+import GoodsPrice from '@/components/order/GoodsPrice.vue';
 
 const { t } = useI18n()
-const userStore = useUserStore()
 
 interface Props {
   show: boolean
@@ -80,38 +72,8 @@ const visible = computed({
   }
 })
 
-// 计算商品价格
+// 选中商品的索引
-const calculatePrice = (goods: IGoods) => {
-  const { activityPrice, vipPrice, price } = goods
-  const isVipUser = userStore.userVips && userStore.userVips.length > 0
-  const priceLabel = {
-    vipPrice: 'VIP优惠价',
-    activityPrice: '活动价',
-    price: ''
-  }
-  
-  let priceData = null
-  if (isVipUser) {
-    priceData = { activityPrice, vipPrice, price }
-  } else {
-    priceData = { activityPrice, price }
-  }
-  const lowestPrice = calculateLowestPrice(priceData)
-  
-  return {
-    lowestPrice: parseFloat(lowestPrice.value).toFixed(2),
-    priceLabel: priceLabel[lowestPrice.key as keyof typeof priceLabel]
-  }
-}
-
 const selectedIndex = ref(-1)
-// 选中商品的价格
-const selectedGoodsPrice = computed(() => {
-  if (selectedIndex.value === -1) return 0
-  const selectedGoods = props.goods[selectedIndex.value]
-  return calculatePrice(selectedGoods)
-})
-
 /**
  * 选择商品
  */
@@ -132,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) {
@@ -175,30 +141,6 @@ watch(() => props.show, (newVal: boolean) => {
   }
 }
 
-.price-info {
-  display: flex;
-  align-items: baseline;
-  gap: 10rpx;
-  color: #e97512;
-  
-  .price {
-    font-size: 16px;
-    font-weight: bold;
-    color: #e97512;
-  }
-  
-  .price-label {
-    font-size: 12px;
-    color: #e97512;
-  }
-  
-  .original-price {
-    font-size: 12px;
-    color: #8a8a8a;
-    text-decoration: line-through;
-  }
-}
-
 .goods-info-mini {
   display: flex;
   align-items: center;
@@ -226,10 +168,10 @@ watch(() => props.show, (newVal: boolean) => {
 
     .price-info {
       padding-top: 20rpx;
-    }
+
-    
+      :deep(.price) {
-    .price {
+        font-size: 36rpx;
-      font-size: 36rpx;
+      }
     }
   }
 }

components/order/ProductInfo.vue

@@ -9,7 +9,7 @@
       <view class="order-item-product-name" v-html="title"></view>
     </view>
     <view class="order-item-product-price">
-      <view class="price">{{ price }} 天医币</view>
+      <view class="price">{{ price }} {{ t('global.coin') }}</view>
       <view class="count">x {{ 1 }}</view>
     </view>
   </view>
@@ -17,6 +17,7 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue'
+import { t } from '@/utils/i18n'
 interface Props {
   data: any
   type: string

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",
@@ -420,11 +423,9 @@
     "coupon": "Coupon",
     "points": "Points",
     "vipDiscount": "VIP Exclusive Discount",
-    "activityDiscount": "Activity Discount",
+    "promotionDiscounted": "Promotion Discount",
-    "districtDiscount": "Regional Discount",
     "actualPayment": "Total",
     "paymentMethod": "Payment Method",
-    "virtualCoin": "Virtual Coin",
     "balance": "Balance",
     "recharge": "Recharge Now",
     "remark": "Order Remark",
@@ -451,14 +452,11 @@
     "duplicateConfirm": "Continue",
     "duplicateCancel": "Cancel",
     "customerService": "Customer Service",
-    "paymentTip": "1 Virtual Coin = 1 CNY",
     "paymentTipTitle": "Notes",
-    "paymentTip1": "1. 1 Virtual Coin = 1 CNY",
+    "paymentTip1": "1.1 points = 1 Tianyi coin",
-    "paymentTip2": "2. For questions, please call customer service",
+    "paymentTip2-1": "2.1 For assistance, please contact our customer service on WeChat",
-    "paymentTip3": "3. Non-mainland China users can pay by credit card. Simple and fast, recommended! Credit cards with Visa or MasterCard logos are accepted. Please send payment request to email",
+    "paymentTip2-2": "or by email at",
-    "paymentTip3_1": "(click to copy) with course name, amount, registered name and phone number, or add WeChat customer service (",
+    "ensureBalance": "Ensure sufficient Tianyi coin balance",
-    "paymentTip3_2": ") (click to copy). We will send payment link within 24 hours.",
-    "ensureBalance": "Ensure sufficient virtual coin balance",
     "vipLabel": "VIP Discount",
     "activityLabel": "Activity Price",
     "vipPriceLabel": "VIP Price",
@@ -471,6 +469,18 @@
     "couponType0": "All Products",
     "couponType1": "Specific Courses",
     "couponType2": "Course Categories",
-    "couponCount": "{count} coupons"
+    "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": "创建订单中...",
@@ -421,11 +423,9 @@
     "coupon": "优惠券",
     "points": "积分",
     "vipDiscount": "VIP专享立减",
-    "activityDiscount": "活动立减",
+    "promotionDiscounted": "活动立减",
-    "districtDiscount": "地区优惠",
     "actualPayment": "实付款",
     "paymentMethod": "支付方式",
-    "virtualCoin": "天医币",
     "balance": "余额",
     "recharge": "立即充值",
     "remark": "订单备注",
@@ -444,6 +444,7 @@
     "pointsPlaceholder": "请输入积分",
     "allPoints": "全部积分",
     "insufficientBalance": "天医币余额不足",
+    "invalidPaymentAmount": "实付金额计算未完成",
     "orderCreating": "正在请求订单",
     "orderSuccess": "购买成功",
     "orderFailed": "失败,请重新下单",
@@ -452,13 +453,10 @@
     "duplicateConfirm": "继续操作",
     "duplicateCancel": "点错了",
     "customerService": "客服",
-    "paymentTip": "1天医币 = 1元人民币",
     "paymentTipTitle": "说明",
-    "paymentTip1": "1. 1天医币 = 1元人民币",
+    "paymentTip1": "1. 1积分=1天医币",
-    "paymentTip2": "2.若有疑问或意见请致电客服",
+    "paymentTip2-1": "2. 若有疑问请加客服微信：{ customerServiceWechat }  { customerServiceEmail }",
-    "paymentTip3": "3.非中国大陆用户可以信用卡支付。简单快捷，推荐使用！支付时使用的信用卡需要带有Visa或MasterCard的标识。请向邮箱",
+    "paymentTip2-2": "或邮箱联系",
-    "paymentTip3_1": "（点击复制）发送支付请求，内容需包含：拟购买的课程名称、支付金额、APP注册姓名及手机号码，或者加一路健康客服微信（",
-    "paymentTip3_2": "）（点击复制）联系我们，我们将在24小时内向您的邮箱或者微信发送支付链接，根据提示即可完成信用卡支付，无需兑换外币。",
     "ensureBalance": "确保您的天医币足够支付",
     "vipLabel": "VIP优惠",
     "activityLabel": "活动价",
@@ -472,6 +470,18 @@
     "couponType0": "全场通用",
     "couponType1": "指定课程可用",
     "couponType2": "指定课程品类可用",
-    "couponCount": "共 {count} 张"
+    "couponCount": "共 {count} 张",
+		"rechargeConsumptionList": "充值消费记录",
+		"rechargeAmount": "充值金额",
+		"valueAddedServices": "增值服务",
+		"readAgree": "我已阅读并同意",
+		"readAgreeServices": "请先阅读并同意增值服务"
+  },
+  "vip": {
+    "courseVip": "课程VIP",
+    "bookVip": "电子书VIP",
+    "openVip": "立即开通",
+    "renewal": "续费",
+    "daily": "日均"
   }
 }

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "com.amazinglimited",
+    "name" : "太湖国际",
     "appid" : "__UNI__1250B39",
-    "description" : "Amazing Limited",
+    "description" : "太湖国际",
-    "versionName" : "1.0.2",
+    "versionName" : "1.0.4",
-    "versionCode" : 102,
+    "versionCode" : 104,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages.json

@@ -169,6 +169,38 @@
 				"navigationStyle": "custom",
 				"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
+				}
+			}
 		}
 	],
 	"tabBar": {

pages/book/detail.vue

@@ -235,16 +235,6 @@ 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.abroadPrice || 0,
-        vipPrice: null,
-        activityPrice: null,
-        isVipPrice: 0,
-        productAmount: 1,
-      }]
     }
   } catch (error) {
     console.error('Failed to load book info:', error)

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 (catalogueList.value.length > 0) {
-    if (res.code === 0 && res.data) {
+      const totalProgress = catalogueList.value.reduce((sum, cat) => sum + cat.completion, 0)
-      courseDetail.value = res.data.course
+      learningProgress.value = Number((totalProgress / catalogueList.value.length).toFixed(2))
-      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)
-      }
     }
     
-    // 检查VIP权益
+    // 默认选择第一个目录
-    await checkVipStatus()
+    if (catalogueList.value.length > 0) {
-    
+      await switchCatalogue(0)
-    // 加载评论
+    }
-    await loadComments()
-    
-  } catch (error) {
-    console.error('加载页面数据失败:', error)
-  } finally {
-    uni.hideLoading()
   }
+  
+  // 检查VIP权益
+  await checkVipStatus()
+  
+  // 加载评论
+  await loadComments()
 }
 
 /**
  * 检查VIP状态
  */
 const checkVipStatus = async () => {
-  try {
+  const res = await courseApi.checkCourseVip(courseId.value)
-    const res = await courseApi.checkCourseVip(courseId.value)
+  if (res.code === 0) {
-    if (res.code === 0) {
+    userVip.value = res.userVip || null
-      userVip.value = res.userVip || null
+    
-      
+    // 如果不是VIP，获取需要的VIP类型
-      // 如果不是VIP，获取需要的VIP类型
+    if (!userVip.value) {
-      if (!userVip.value) {
+      const moduleRes = await courseApi.getCourseVipModule(courseId.value)
-        const moduleRes = await courseApi.getCourseVipModule(courseId.value)
+      if (moduleRes.code === 0) {
-        if (moduleRes.code === 0) {
+        vipModuleList.value = moduleRes.list || []
-          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)
-    const res = await courseApi.getCatalogueChapterList(catalogue.id)
+  if (res.code === 0) {
-    if (res.code === 0) {
+    chapterList.value = res.chapterList || []
-      chapterList.value = res.chapterList || []
+  }
-    }
+  
-    
+  // 检查是否支持复读
-    // 检查是否支持复读
+  if (catalogue.isBuy === 0 && !userVip.value) {
-    if (catalogue.isBuy === 0 && !userVip.value) {
+    const renewRes = await courseApi.checkRenewPayment(catalogue.id)
-      const renewRes = await courseApi.checkRenewPayment(catalogue.id)
+    showRenewBtn.value = renewRes.canRelearn || false
-      showRenewBtn.value = renewRes.canRelearn || false
+  } else {
-    } else {
+    showRenewBtn.value = false
-      showRenewBtn.value = false
-    }
-  } catch (error) {
-    console.error('切换目录失败:', error)
   }
 }
 
@@ -366,18 +349,12 @@ const handleChapterClick = (chapter: IChapter) => {
 const handleGetFreeCourse = async () => {
   if (!currentCatalogue.value) return
   
-  try {
+  uni.showLoading({ title: '领取中...' })
-    uni.showLoading({ title: '领取中...' })
+  const res = await courseApi.startStudyForMF(currentCatalogue.value.id)
-    const res = await courseApi.startStudyForMF(currentCatalogue.value.id)
+  if (res.code === 0) {
-    if (res.code === 0) {
+    uni.showToast({ title: '领取成功', icon: 'success' })
-      uni.showToast({ title: '领取成功', icon: 'success' })
+    // 刷新页面数据
-      // 刷新页面数据
+    await loadPageData()
-      await loadPageData()
-    }
-  } catch (error) {
-    console.error('领取免费课程失败:', error)
-  } finally {
-    uni.hideLoading()
   }
 }
 
@@ -387,17 +364,13 @@ const handleGetFreeCourse = async () => {
 const handlePurchase = async () => {
   if (!currentCatalogue.value) return
   
-  try {
+  isFudu.value = false
-    isFudu.value = false
+  const res = await courseApi.getProductListForCourse(currentCatalogue.value.id)
-    const res = await courseApi.getProductListForCourse(currentCatalogue.value.id)
+  if (res.code === 0 && res.productList.length > 0) {
-    if (res.code === 0 && res.productList.length > 0) {
+    goodsList.value = res.productList
-      goodsList.value = res.productList
+    showGoodsSelector.value = true
-      showGoodsSelector.value = true
+  } else {
-    } else {
+    uni.showToast({ title: '此课程暂无购买方式', icon: 'none' })
-      uni.showToast({ title: '此课程暂无购买方式', icon: 'none' })
-    }
-  } catch (error) {
-    console.error('获取商品列表失败:', error)
   }
 }
 
@@ -407,18 +380,14 @@ const handlePurchase = async () => {
 const handleRenew = async () => {
   if (!currentCatalogue.value) return
   
-  try {
+  isFudu.value = true
-    isFudu.value = true
+  fuduCatalogueId.value = currentCatalogue.value.id
-    fuduCatalogueId.value = currentCatalogue.value.id
+  const res = await courseApi.getRenewProductList(currentCatalogue.value.id)
-    const res = await courseApi.getRenewProductList(currentCatalogue.value.id)
+  if (res.code === 0 && res.productList.length > 0) {
-    if (res.code === 0 && res.productList.length > 0) {
+    goodsList.value = res.productList
-      goodsList.value = res.productList
+    showGoodsSelector.value = true
-      showGoodsSelector.value = true
+  } else {
-    } else {
+    uni.showToast({ title: '暂无复读方案', icon: 'none' })
-      uni.showToast({ title: '暂无复读方案', icon: 'none' })
-    }
-  } catch (error) {
-    console.error('获取复读商品列表失败:', error)
   }
 }
 
@@ -463,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/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

@@ -23,28 +23,31 @@
 		<!-- VIP订阅卡片 -->
 		<view class="vip-card-section">
 			<view class="vip-card">
-				用户VIP功能重写中。。。
+				<view class="vip-card-title">{{ $t('user.vip') }}</view>
-				<!-- <view v-if="vipInfo.id" class="vip-info">
+				<view class="vip-card-content">
-          <text class="label">{{ $t('user.vip') }}</text>
+					<view class="vip-item-list">
-          <text class="value">{{ vipInfo.endTime ? vipInfo.endTime.split(' ')[0] : '' }}</text>
+						<view v-if="vipInfo.length > 0" v-for="vip in vipInfo">{{ vipTypeDict[vip.type] }}（有效期到 {{ parseTime(vip.endTime, '{y}-{m}-{d}') }}）</view>
-        </view>
+						<view v-else>办理课程VIP，畅享更多权益</view>
-        <wd-button 
+					</view>
-          v-else 
+					<wd-button v-if="vipInfo.length > 0" plain type="primary" size="small" @click="goSubscribe">{{ $t('vip.renewal') }}</wd-button>
-          type="success"
+					<wd-button v-else plain type="primary" size="small" @click="goSubscribe">{{ $t('vip.openVip') }}</wd-button>
-          size="small"
+				</view>
-          @click="goSubscribe"
+				<view class="vip-card-content">
-        >
+					<view class="vip-item-list">
-          {{ $t('user.subscribe') }}
+						<view v-if="vipInfoEbook.length > 0" v-for="vip in vipInfoEbook">电子书VIP{{ vipTypeDict[vip.type] }}（有效期到 {{ parseTime(vip.endTime, '{y}-{m}-{d}') }}）</view>
-        </wd-button> -->
+						<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="assets-card-section wallet-section">
-			<view class="vip-card wallet_l">
+			<view class="assets-card wallet_l">
 				<view class="assets">
 					<view @click="goVirtualList">
-						<view class="assets_row">天医币</view>
+						<view class="assets_row">{{ t('global.coin') }}</view>
 						<view>{{userInfo.peanutCoin ?? 1}}</view>
 					</view>
 					<view>
@@ -77,13 +80,15 @@
 <script setup lang="ts">
 	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 { useI18n } from 'vue-i18n'
 	import { getNotchHeight } from '@/utils/system'
+	import { parseTime } from '@/utils/index'
+	import { t } from '@/utils/i18n'
 
-	const { t } = useI18n()
 	const userStore = useUserStore()
+	const sysStore = useSysStore()
 
 	// 默认头像
 	const defaultAvatar = '/static/home_icon.png'
@@ -92,11 +97,11 @@
 	const userInfo = computed(() => userStore.userInfo)
 
 	// VIP信息
-	const vipInfo = ref<IVipInfo>({
+	const vipInfo = computed(() => userStore.userVips)
-		id: 0,
+	const vipInfoEbook = computed(() => userStore.userEbookVip)
-		endTime: '',
+		
-		vipType: 0
+	// VIP类型字典
-	})
+	const vipTypeDict = sysStore.vipTypeDict
 
 	// 平台信息
 	const platform = ref('')
@@ -147,21 +152,10 @@
 	 * 获取数据
 	 */
 	const getData = async () => {
-		try {
+		// 获取用户信息
-			// 获取用户信息
+		const userInfoRes = await getUserInfo()
-			const userRes = await getUserInfo()
+		if (userInfoRes.result) {
-			console.log(userRes);
+			userStore.setUserInfo(userInfoRes.result)
-			if (userRes.user) {
-				userStore.setUserInfo(userRes.user)
-			}
-
-			// 获取VIP信息
-			const vipRes = await getVipInfo()
-			if (vipRes.vipInfo) {
-				vipInfo.value = vipRes.vipInfo
-			}
-		} catch (error) {
-			console.error('获取数据失败:', error)
 		}
 	}
 
@@ -188,7 +182,7 @@
 	 */
 	const goSubscribe = () => {
 		uni.navigateTo({
-			url: '/pages/user/wallet/index'
+			url: '/pages/vip/book'
 		})
 	}
 
@@ -302,12 +296,47 @@
 		}
 	}
 
+	// 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;
 	}
 
-	.vip-card {
+	.assets-card {
 		background: #fff;
 		border-radius: 15rpx;
 		padding: 40rpx;
@@ -316,7 +345,7 @@
 		justify-content: space-between;
 		box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
 
-		.vip-info {
+		.assets-info {
 			text-align: center;
 
 			.label {

pages/user/recharge/index.vue

@@ -1,15 +1,15 @@
 <template>
 	<view class="recharge-page">
 		<!-- 自定义导航栏 -->
-		<nav-bar :title="$t('user.recharge')"></nav-bar>
+		<nav-bar :title="$t('order.recharge')"></nav-bar>
 		<view class="block">
-			<view class="text">充值金额</view>
+			<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}}天医币</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>
@@ -21,30 +21,30 @@
 			<view v-html="remark.remark"></view>
 		</view>
 		<view class="cha_fangsh">
-			<view class="cf_title PM_font">支付方式</view>
+			<view class="cf_title PM_font">{{$t('user.paymentMethod')}}</view>
 			<view class="cf_radio">
-				<radio-group v-for="item in iosPaylist" @change="choseType(item.id)">
+				<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" style="float: right"></radio>
+							<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" @change="radioCheck">
+			<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>我已阅读并同意<span class="highlight" @click="showAgreement">《增值服务协议》</span></view>
+			<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">立即充值</button>
+			<button class="recharge-button" @click="handleRecharge">{{$t('order.recharge')}}</button>
 		</view>
 		<wd-popup v-model="agreemenState" position="bottom" :closeable="true">
 			<view class="agreement">
@@ -61,10 +61,11 @@
 
 <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 googlePay = uni.requireNativePlugin("sn-googlepay5");
+	const { t } = useI18n()
 	const message = useMessage()
 	const payType = ref('1')
 	const iosPaylist = ref([
@@ -108,9 +109,11 @@
 	const isConnected = ref(false)
 
 
-
+  /**
+	 * 获取使用环境
+	 */
 	const getDevName = () => {
-		// 获取使用环境
+		
 		if (uni.getSystemInfoSync().platform === "android") {
 			qudao.value = 'Google'
 			isAndroid.value = true;
@@ -132,8 +135,8 @@
 	 * 勾选协议
 	 */
 	const radioCheck = () => {
-		console.log('点击了', state.value);
 		state.value = !state.value
+		console.log('点击了', state.value);
 	}
 
 	/**
@@ -151,7 +154,6 @@
 			console.log(rechargeList.value.bookBuyConfigList, '充值列表');
 			// 默认选择第一个金额
 			aloneItem.value = rechargeList.value.bookBuyConfigList[0]
-			getGooglePay()
 		} catch (error) {
 			console.error('获取订单列表失败:', error)
 		}
@@ -194,7 +196,16 @@
 	}
 
 	const handleRecharge = () => {
+		if(!state.value){
+			uni.showToast({
+			  title: t('order.readAgreeServices'),
+			  icon: 'none'
+			})
+			return
+		}
+		uni.showLoading({ title: '加载中...' })
 		console.log('立即充值');
+		getGooglePay()
 	}
 
 	/**
@@ -202,8 +213,6 @@
 	 */
 	const getGooglePay = () => {
 		googlePay.init({
-			// autoReconnect: true, // 是否自动重连(插件实现)
-			// enableAutoServiceReconnection: true, //是否自动重连（8.0+支持）
 		}, (e:any) => {
 			console.log('init', e);
 			if (e.code == 0) {
@@ -262,9 +271,6 @@
 		getDevName();
 		getActivityDescriptionData()
 		getAgreementData()
-		
-
-
 	})
 </script>
 
@@ -300,7 +306,7 @@
 
 			.recharge_money {
 				font-size: 30rpx;
-				margin-bottom: 30rpx;
+				margin-bottom: 10rpx;
 
 			}
 
@@ -376,9 +382,12 @@
 
 			.cf_xuanx {
 				font-size: 24rpx;
-				padding: 20rpx 0;
+				padding: 10rpx 0;
 				margin-bottom: 20rpx;
 				border-bottom: 1px solid #ededed;
+				display: flex;
+				justify-content: space-between;
+				align-items:center;
 
 				image {
 					width: 40rpx;

pages/user/virtual/index.vue

@@ -1,65 +1,46 @@
 <template>
-	<z-paging ref="paging" v-model="bookList" auto-show-back-to-top class="my-book-page" @query="loadBookList">
+	<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('book.myBook')"></nav-bar>
+			<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">
-		<!-- <uni-icons fontFamily="CustomFont" :size="26">{{'\uebc6'}}</uni-icons> -->
+				<view>{{$t('order.recharge')}}</view>
-		
+				<view><wd-icon name="arrow-right" size="16px" color="#fff"/></view>
-		<view class="recharge-record">
-			<view><uni-icons type="right" size="30"></uni-icons></view>
-			<view class="go-gecharge">
-				立即充值
-				<uni-icons type="contact" size="30"></uni-icons>
 			</view>
-			<view class="title">充值消费记录</view>
+			<view class="title">{{$t('order.rechargeConsumptionList')}}</view>
-			<view class="recharge-record-block" v-for="(item) in 5">
+			<view class="recharge-record-block" v-for="(item, index) in bookList" :key="index">
-				<view class="recharge-record-block-row">购买商品<text class="text">90</text></view>
+				<view class="recharge-record-block-row">{{item.orderType}}<text class="text">{{item.changeAmount}}</text></view>
-				<view class="time">2025-10-20</view>
+				<view class="time">{{item.createTime}}</view>
 			</view>
 		</view>
-		<!-- <view v-if="(bookList && bookList.length > 0)" class="book-list">
-      <BookCard 
-        v-for="item in bookList" 
-        :key="item.id"
-        :book="item"
-      />
-    </view> -->
-
-		<!-- 空状态 -->
-		<!-- <view v-else-if="!loading && !firstLoad" class="empty-state">
-      <image src="@/static/null_img.png" mode="aspectFit" />
-      <text class="empty-text">{{ $t('book.nullText') }}</text>
-      <wd-button type="primary" @click="goToBuy">
-        {{ $t('book.choose') }}
-      </wd-button>
-    </view> -->
 	</z-paging>
 </template>
 
 <script setup lang="ts">
 	import { ref } from 'vue'
 	import { useI18n } from 'vue-i18n'
-	import { bookApi } from '@/api/modules/book'
+	import { useUserStore } from '@/stores/user'
-	import type { IBook } from '@/types/book'
+	import { getTransactionDetailsList } from '@/api/modules/user'
-	import BookCard from '@/components/book/BookCard.vue'
 
 	const { t } = useI18n()
 	const paging = ref<any>()
+	const userStore = useUserStore()
 
 	// 数据状态
-	const bookList = ref<IBook[]>([])
+	const bookList = ref([])
 	const loading = ref(false)
 	const firstLoad = ref(true)
 
-	// 加载书单列表
+	// 充值记录列表
-	async function loadBookList(pageNo : number, pageSize : number) {
+	async function rechargeList(pageNo : number, pageSize : number) {
+		const userId = userStore.userInfo.id
 		loading.value = true
 		try {
-			const res = await bookApi.getMyBooks(pageNo, pageSize)
+			const res = await getTransactionDetailsList(pageNo, pageSize, userId)
-			paging.value.complete(res.page.records)
+			console.log(res, 'res');
+			paging.value.complete(res.transactionDetailsList.records)
 		} catch (error) {
 			paging.value.complete(false)
 			console.error('Failed to load book list:', error)
@@ -68,6 +49,15 @@
 			loading.value = false
 		}
 	}
+	
+	/**
+	 * 跳转充值页面
+	 */
+	const goRecharge = () => {
+		uni.navigateTo({
+			url: '/pages/user/recharge/index'
+		})
+	}
 </script>
 
 <style lang="scss" scoped>
@@ -86,15 +76,16 @@
 			.go-gecharge{
 				//height: 100rpx;
 				background: linear-gradient(to right, #007bff, #17a2b8);
-				font-size: 40rpx;
+				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: 40rpx;
+				font-size: 30rpx;
 				padding-left:20rpx;
 				margin-bottom: 30rpx;
 				color: #007bff;
@@ -120,6 +111,25 @@
 				}
 			}
 		}
-
 	}
+	.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,7 +8,6 @@
     --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono",
       "Courier New", monospace;
     --color-red-500: oklch(63.7% 0.237 25.331);
-    --color-white: #fff;
     --spacing: 0.25rem;
     --font-weight-bold: 700;
     --ease-in-out: cubic-bezier(0.4, 0, 0.2, 1);
@@ -206,14 +205,8 @@
       max-width: 96rem;
     }
   }
-  .\!ml-2 {
+  .mr-1 {
-    margin-left: calc(var(--spacing) * 2) !important;
+    margin-right: calc(var(--spacing) * 1);
-  }
-  .\!ml-12 {
-    margin-left: calc(var(--spacing) * 12) !important;
-  }
-  .\!ml-\[10px\] {
-    margin-left: 10px !important;
   }
   .ml-1 {
     margin-left: calc(var(--spacing) * 1);
@@ -227,9 +220,6 @@
   .ml-2\.5\! {
     margin-left: calc(var(--spacing) * 2.5) !important;
   }
-  .ml-12 {
-    margin-left: calc(var(--spacing) * 12);
-  }
   .block {
     display: block;
   }
@@ -279,9 +269,6 @@
     border-style: var(--tw-border-style);
     border-width: 1px;
   }
-  .bg-\[\#e55f18\] {
-    background-color: #e55f18;
-  }
   .bg-\[blue\] {
     background-color: blue;
   }
@@ -291,14 +278,11 @@
   .bg-\[transparent\] {
     background-color: transparent;
   }
-  .bg-red-500 {
+  .pt-1 {
-    background-color: var(--color-red-500);
+    padding-top: calc(var(--spacing) * 1);
   }
-  .p-0 {
+  .pt-10 {
-    padding: calc(var(--spacing) * 0);
+    padding-top: calc(var(--spacing) * 10);
-  }
-  .p-0\! {
-    padding: calc(var(--spacing) * 0) !important;
   }
   .pt-\[40px\] {
     padding-top: 40px;
@@ -325,18 +309,12 @@
   .text-\[\#7dc1f0\] {
     color: #7dc1f0;
   }
-  .text-\[\#f94f04\] {
-    color: #f94f04;
-  }
   .text-\[\#fff\] {
     color: #fff;
   }
   .text-\[red\] {
     color: red;
   }
-  .text-white {
-    color: var(--color-white);
-  }
   .lowercase {
     text-transform: lowercase;
   }

types/order.d.ts

@@ -4,15 +4,23 @@
 export interface IGoods {
   productId: number
   productName: string
-  productImages: string
+  productImages?: string
   price: number
-  vipPrice: number | null
+  vipPrice?: number | null
-  activityPrice: number | null
+  activityPrice?: number | null
-  isVipPrice: number               // 是否有VIP优惠 0-否 1-是
+  isVipPrice?: number               // 是否有VIP优惠 0-否 1-是
-  productAmount: number            // 购买数量
+  productAmount?: number            // 购买数量
   delFlag?: number                 // 删除标记 -1-已下架
 }
 
+/**
+ * 获取优惠价格参数
+ **/
+export interface IGoodsDiscountParams {
+  productId: number
+  quantity: number
+}
+
 /**
  * 订单接口
  */
@@ -31,12 +39,12 @@ export interface IOrder {
 export interface IOrderGoods {
   productId: number
   productName: string
-  productImages: string
+  productImages?: string
   price: number
-  vipPrice: number | null
+  vipPrice?: number | null
-  activityPrice: number | null
+  activityPrice?: number | null
-  isVipPrice: number          // 是否有VIP优惠 0-否 1-是
+  isVipPrice?: number          // 是否有VIP优惠 0-否 1-是
-  productAmount: number       // 购买数量
+  productAmount?: number       // 购买数量
   goodsType: string           // 商品类型 "05" for course
 }
 

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,6 +18,8 @@ export const onPageBack = () => {
 
 /**
  * 拨打电话
+ * @param {string} phoneNumber - 要拨打的电话号码
+ * @param {string} title - 拨打电话提示的标题，默认值为空字符串
  */
 export const makePhoneCall = (phoneNumber: string, title: string = '') => {
   uni.showModal({
@@ -42,6 +45,8 @@ export const makePhoneCall = (phoneNumber: string, title: string = '') => {
 
 /**
  * 复制到剪贴板
+ * @param {string} content - 要复制的内容
+ * @param {string} title - 复制成功提示的标题，默认值为空字符串
  */
 export const copyToClipboard = (content: string, title: string = '') => {
   uni.setClipboardData({
@@ -56,4 +61,72 @@ export const copyToClipboard = (content: string, title: string = '') => {
       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
 }