From 79c6fb247c2d944dcfdb7ec6dd31a24ccd4afb95 Mon Sep 17 00:00:00 2001
From: chenghuan <chenghuanv587@qq.com>
Date: Fri, 28 Nov 2025 11:05:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/order/Confirm.vue |  8 +++++---
 components/order/PayWay.vue  |  2 +-
 pages/user/index.vue         | 25 +++++++++++++++----------
 style/tailwind.css           |  3 +++
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/components/order/Confirm.vue b/components/order/Confirm.vue
index 3bfabfb..344b448 100644
--- a/components/order/Confirm.vue
+++ b/components/order/Confirm.vue
@@ -373,9 +373,11 @@ const handleSubmit = async () => {
   })
 
   // 返回上一页
-  uni.navigateBack({
-    delta: props.backStep
-  })
+  setTimeout(() => {
+    uni.navigateBack({
+      delta: props.backStep
+    })
+  }, 500)
 }
 
 /**
diff --git a/components/order/PayWay.vue b/components/order/PayWay.vue
index cf650ca..8626086 100644
--- a/components/order/PayWay.vue
+++ b/components/order/PayWay.vue
@@ -52,7 +52,7 @@ const props = defineProps({
  */
 const goToRecharge = () => {
   uni.navigateTo({
-    url: '/pages/user/wallet/recharge/index?source=order'
+    url: '/pages/user/recharge/index'
   })
 }
 </script>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 6435da8..0ef938e 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -26,22 +26,18 @@
 				<view class="vip-card-title">{{ $t('user.vip') }}</view>
 				<view class="vip-card-content">
 					<view class="vip-item-list">
-						<view v-if="vipInfo.length > 0" v-for="vip in vipInfo">{{ vipTypeDict[vip.type] }}（有效期到
-							{{ parseTime(vip.endTime, '{y}-{m}-{d}') }}）</view>
+						<view v-if="vipInfo.length > 0" v-for="vip in vipInfo">{{ vipTypeDict[vip.type] }}（{{ parseTime(vip.endTime, '{y}-{m}-{d}') }} 截止）</view>
 						<view v-else>办理课程VIP，畅享更多权益</view>
 					</view>
-					<wd-button v-if="vipInfo.length > 0" plain type="primary" size="small"
-						@click="goSubscribe">{{ $t('vip.renewal') }}</wd-button>
-					<wd-button v-else plain type="primary" size="small" @click="goSubscribe">{{ $t('vip.openVip') }}</wd-button>
+					<wd-button v-if="vipInfo.length > 0" plain type="primary" size="small" @click="goCourseVipSub">{{ $t('vip.renewal') }}</wd-button>
+					<wd-button v-else plain type="primary" size="small" @click="goCourseVipSub">{{ $t('vip.openVip') }}</wd-button>
 				</view>
 				<view class="vip-card-content">
 					<view class="vip-item-list">
-						<view v-if="vipInfoEbook.length > 0" v-for="vip in vipInfoEbook">电子书VIP{{ vipTypeDict[vip.type] }}（有效期到
-							{{ parseTime(vip.endTime, '{y}-{m}-{d}') }}）</view>
+						<view v-if="vipInfoEbook.length > 0" v-for="vip in vipInfoEbook">电子书VIP{{ vipTypeDict[vip.type] }}（{{ parseTime(vip.endTime, '{y}-{m}-{d}') }} 截止）</view>
 						<view v-else>办理电子书VIP，畅享更多权益</view>
 					</view>
-					<wd-button v-if="!vipInfoEbook.length" plain type="primary" size="small"
-						@click="goSubscribe">{{ $t('vip.openVip') }}</wd-button>
+					<wd-button v-if="!vipInfoEbook.length" plain type="primary" size="small" @click="goSubscribe">{{ $t('vip.openVip') }}</wd-button>
 				</view>
 			</view>
 		</view>
@@ -183,7 +179,7 @@
 	}
 
 	/**
-	 * 跳转到订阅页面
+	 * 跳转到电子书vip订阅页面
 	 */
 	const goSubscribe = () => {
 		uni.navigateTo({
@@ -191,6 +187,15 @@
 		})
 	}
 
+	/**
+	 * 跳转到课程vip订阅页面
+	 */
+	const goCourseVipSub = () => {
+		uni.navigateTo({
+			url: '/pages/vip/course'
+		})
+	}
+
 	/**
 	 * 处理菜单点击
 	 */
diff --git a/style/tailwind.css b/style/tailwind.css
index 14e4429..5d949ea 100644
--- a/style/tailwind.css
+++ b/style/tailwind.css
@@ -284,6 +284,9 @@
   .pt-10 {
     padding-top: calc(var(--spacing) * 10);
   }
+  .pt-\[40px\] {
+    padding-top: 40px;
+  }
   .pb-0 {
     padding-bottom: calc(var(--spacing) * 0);
   }