解决冲突

api/config.ts

@@ -7,8 +7,8 @@ export const ENV = process.env.NODE_ENV || 'development';
  */
 const BASE_URL_MAP = {
   development: {
-		MAIN: 'http://192.168.110.100:9300/pb/', // 张川川
+		//MAIN: 'http://192.168.110.100:9300/pb/', // 张川川
-		// MAIN: 'https://global.nuttyreading.com/', // 线上
+		MAIN: 'https://global.nuttyreading.com/', // 线上
 		// PAYMENT: 'https://dev-pay.example.com', // 暂时用不到
 		// CDN: 'https://cdn-dev.example.com', // 暂时用不到
   },

api/modules/order.ts

@@ -145,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/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

@@ -259,9 +259,7 @@ const handleChapterClick = (chapter: IChapter) => {
   border-bottom-left-radius: 40rpx;
   
   .vip-badge {
-    position: absolute;
+    display: inline-block;
-    left: 0;
-    top: 0;
     font-size: 24rpx;
     background: linear-gradient(90deg, #6429db 0%, #0075ed 100%);
     color: #fff;

components/order/Confirm.vue

@@ -124,22 +124,28 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue'
 import { orderApi } from '@/api/modules/order'
+import { getUserInfo } from '@/api/modules/user'
+import { useUserStore } from '@/stores/user'
 import { t } from '@/utils/i18n'
 import type { IGoods, IGoodsDiscountParams } from '@/types/order'
 import PayWay from '@/components/order/PayWay.vue'
 
+const userStore = useUserStore()
+
 // 使用页面传参
 interface Props {
   goodsList: IGoods[],
   userInfo: object,
   allowPointPay: boolean,
   orderType: string,
+  backStep: number // 购买完成后返回几层页面
 }
 const props = withDefaults(defineProps<Props>(), {
   goodsList: () => [],
   userInfo: () => ({}),
-  allowPointPay: () => true,
+  allowPointPay: true,
-  orderType: () => 'order',
+  orderType: 'order',
+  backStep: 1
 })
 
 // 订单备注
@@ -185,7 +191,7 @@ const calculateAllPrices = async () => {
     // 计算商品总价
     calculateTotalPrice()
     
-    await Promise.all([
+    props.orderType === 'order' && await Promise.all([
       // 获取VIP优惠
       calculateVipDiscounted(),
       
@@ -319,7 +325,7 @@ const calculateFinalPrice = () => {
     0,
     totalAmount.value - couponAmount - pointsDiscounted.value - promotionDiscounted.value - vipDiscounted.value
   )
-  finalAmount.value = result.toFixed(2)
+  finalAmount.value = result
 }
 
 /**
@@ -327,7 +333,7 @@ const calculateFinalPrice = () => {
  */
 const validateOrder = (): boolean => {
   // 验证实付金额是否计算完成
-  if (typeof finalAmount.value != 'number') {
+  if (isNaN(parseFloat(finalAmount.value))) {
     uni.showToast({
       title: t('order.invalidPaymentAmount'),
       icon: 'none'
@@ -357,10 +363,19 @@ const handleSubmit = async () => {
   // 创建订单 此app用天医币支付，创建订单成功即支付成功
   await createOrder()
 
+  // 重新获取用户信息更新store和本地缓存
+  const res = await getUserInfo()
+  userStore.setUserInfo(res.result)
+
   uni.showToast({
     title: t('order.orderSuccess'),
     icon: 'success'
   })
+
+  // 返回上一页
+  uni.navigateBack({
+    delta: props.backStep
+  })
 }
 
 /**
@@ -372,18 +387,20 @@ const createOrder = async (): Promise<string | null> => {
     paymentMethod: 4, // 天医币
     orderMoney: totalAmount.value,
     realMoney: finalAmount.value,
-    pointsDeduction: pointsDiscounted.value,
+    jfDeduction: pointsDiscounted.value,
     // couponId: selectedCoupon.value?.id,
     // couponName: selectedCoupon.value?.couponEntity.couponName,
     vipDiscountAmount: vipDiscounted.value,
     districtMoney: promotionDiscounted.value,
     remark: remark.value,
-    productList: goodsListParams.value,
     orderType: props.orderType,
+    productList: props.orderType === 'order' ? goodsListParams.value : null,
+    vipBuyConfigId: props.orderType === 'vip' ? props.goodsList[0].productId : null,
+    abroadVipId: props.orderType === 'abroadVip' ? props.goodsList[0].productId : null,
     come: 10
   }
   
-  const res = await orderApi.placeCourseOrder(orderParams)
+  const res = await orderApi.placeOrder(orderParams)
   
   if (res.orderSn) {
     return res.orderSn

components/order/GoodsSelector.vue

@@ -2,6 +2,7 @@
   <wd-popup 
     v-model="visible" 
     position="bottom"
+    @close="handleClose"
   >
     <view class="goods-selector">
       <view v-if="selectedIndex !== -1" class="goods-info-mini">
@@ -93,9 +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) {

components/order/ProductInfo.vue

@@ -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

@@ -17,7 +17,8 @@
     "networkConnectionError": "Network connection error.",
     "loginExpired": "Login expired. Please log in again.",
     "requestException": "Request exception",
-    "coin": "Coin"
+    "coin": "Coin",
+    "days": "Days"
   },
   "tabar.course": "COURSE",
   "tabar.book": "EBOOK",
@@ -474,5 +475,12 @@
 		"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

@@ -17,7 +17,8 @@
     "networkConnectionError": "网络连接错误。",
     "loginExpired": "登录失效，请重新登录。",
     "requestException": "请求异常",
-    "coin": "天医币"
+    "coin": "天医币",
+    "days": "天"
   },
   "tabar.course": "课程",
   "tabar.book": "图书",
@@ -475,5 +476,12 @@
 		"valueAddedServices": "增值服务",
 		"readAgree": "我已阅读并同意",
 		"readAgreeServices": "请先阅读并同意增值服务"
+  },
+  "vip": {
+    "courseVip": "课程VIP",
+    "bookVip": "电子书VIP",
+    "openVip": "立即开通",
+    "renewal": "续费",
+    "daily": "日均"
   }
 }

pages.json

@@ -175,6 +175,24 @@
 				"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": {

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">
@@ -432,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/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

@@ -9,6 +9,7 @@
       "Courier New", monospace;
     --color-red-500: oklch(63.7% 0.237 25.331);
     --spacing: 0.25rem;
+    --font-weight-bold: 700;
     --ease-in-out: cubic-bezier(0.4, 0, 0.2, 1);
     --default-transition-duration: 150ms;
     --default-transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
@@ -204,9 +205,18 @@
       max-width: 96rem;
     }
   }
+  .mr-1 {
+    margin-right: calc(var(--spacing) * 1);
+  }
+  .ml-1 {
+    margin-left: calc(var(--spacing) * 1);
+  }
   .ml-1\! {
     margin-left: calc(var(--spacing) * 1) !important;
   }
+  .ml-2 {
+    margin-left: calc(var(--spacing) * 2);
+  }
   .ml-2\.5\! {
     margin-left: calc(var(--spacing) * 2.5) !important;
   }
@@ -243,6 +253,9 @@
   .flex-shrink {
     flex-shrink: 1;
   }
+  .border-collapse {
+    border-collapse: collapse;
+  }
   .transform {
     transform: var(--tw-rotate-x,) var(--tw-rotate-y,) var(--tw-rotate-z,) var(--tw-skew-x,) var(--tw-skew-y,);
   }
@@ -265,9 +278,18 @@
   .bg-\[transparent\] {
     background-color: transparent;
   }
+  .pt-1 {
+    padding-top: calc(var(--spacing) * 1);
+  }
+  .pt-10 {
+    padding-top: calc(var(--spacing) * 10);
+  }
   .pt-\[40px\] {
     padding-top: 40px;
   }
+  .pb-0 {
+    padding-bottom: calc(var(--spacing) * 0);
+  }
   .pb-0\! {
     padding-bottom: calc(var(--spacing) * 0) !important;
   }
@@ -277,6 +299,10 @@
   .text-right {
     text-align: right;
   }
+  .font-bold {
+    --tw-font-weight: var(--font-weight-bold);
+    font-weight: var(--font-weight-bold);
+  }
   .text-\[\#000\] {
     color: #000;
   }
@@ -299,6 +325,9 @@
     --tw-ordinal: ordinal;
     font-variant-numeric: var(--tw-ordinal,) var(--tw-slashed-zero,) var(--tw-numeric-figure,) var(--tw-numeric-spacing,) var(--tw-numeric-fraction,);
   }
+  .underline {
+    text-decoration-line: underline;
+  }
   .ring {
     --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
     box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
@@ -368,6 +397,10 @@
   inherits: false;
   initial-value: solid;
 }
+@property --tw-font-weight {
+  syntax: "*";
+  inherits: false;
+}
 @property --tw-ordinal {
   syntax: "*";
   inherits: false;
@@ -560,6 +593,7 @@
       --tw-skew-x: initial;
       --tw-skew-y: initial;
       --tw-border-style: solid;
+      --tw-font-weight: initial;
       --tw-ordinal: initial;
       --tw-slashed-zero: initial;
       --tw-numeric-figure: initial;

types/order.d.ts

@@ -4,12 +4,12 @@
 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-已下架
 }
 
@@ -39,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
+}

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({
@@ -60,6 +65,8 @@ export const copyToClipboard = (content: string, title: string = '') => {
 
 /**
  * 计算最低价格
+ * @param {object} priceData - 价格数据对象，键为价格类型，值为价格
+ * @returns {object} - 包含最低价格的键值对，{ key: 价格类型, value: 最低价格 }
  */
 export const calculateLowestPrice = (priceData: object): { key: string, value: number } => {
   const validEntries = Object.entries(priceData)
@@ -74,4 +81,52 @@ export const calculateLowestPrice = (priceData: object): { key: string, value: n
     );
     
     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
 }