Просмотр исходного кода

Merge branch 'iteration-20260411' into jenkins-test

lex-wxl 12 часов назад
Родитель
Сommit
9ad0475e60

+ 1 - 1
src/components/VipPurchaseModal/index.module.less

@@ -16,7 +16,6 @@
     font-size: 20px;
     color: #e6392b;
     text-align: center;
-    margin-bottom: 28px;
     line-height: 30px;
     font-weight: 600;
     background: linear-gradient(135deg, #fff5f5 0%, #ffe8e8 100%);
@@ -25,6 +24,7 @@
   }
 
   .packageList {
+    margin-top: 28px;
     display: flex;
     flex-wrap: wrap;
     gap: 24px;

+ 5 - 8
src/components/VipPurchaseModal/index.tsx

@@ -273,19 +273,16 @@ export default defineComponent({
       return !membershipEndTime || new Date(membershipEndTime) < new Date();
     });
 
-    // 子标题文案
-    const subtitleText = computed(() => {
-      return isVipExpired.value
-        ? '您的会员已过期,请续费后继续使用'
-        : '您的会员即将过期,续费后可继续使用';
-    });
-
     return () => (
       <NSpin show={pageLoading.value} class={styles.spinWrap}>
         <div class={styles.vipPurchaseModal}>
           {!showQrCode.value ? (
             <div>
-              <div class={styles.subtitle}>{subtitleText.value}</div>
+              {isVipExpired.value && (
+                <div class={styles.subtitle}>
+                  您的会员已过期,请续费后继续使用
+                </div>
+              )}
 
               <div class={styles.packageList}>
                 {vipPackages.value.map((pkg: VipPackage) => (