Merge remote-tracking branch 'origin/hqyDev' into iteration-20241126

src/student/activePage/double12Active/index.module.less

@@ -56,6 +56,7 @@
         height: 27px;
         background: #ffdd71;
         border-radius: 14px;
+        font-family: PingFangSC, PingFang SC;
         font-weight: 600;
         font-size: 15px;
         color: #000000;
@@ -243,6 +244,8 @@
         align-items: flex-end;
         font-size: 15px;
         color: #ffffff;
+        font-weight: 600;
+        font-family: PingFangSC, PingFang SC;
         & > span:nth-child(1) {
           font-size: 22px;
           font-weight: 500;
@@ -281,6 +284,7 @@
       color: #ffffff;
       letter-spacing: 1px;
       text-align: center;
+      font-weight: 600;
       &.disable {
         pointer-events: none;
         opacity: 0.4;

src/views/member-center/index.tsx

@@ -608,14 +608,13 @@ export default defineComponent({
                       <span class={styles.icon_text}>
                         <i class={styles.bottom_line}></i>
                         {/* 活动显示 */}
-                        {activitData.vipCardId &&
+                        {!!activitData.vipCardId &&
                           activitData.vipType === 'VIP' &&
                           activitData.extConfig?.title1 && (
                             <div class={styles.activitTip}>
                               {activitData.extConfig?.title1}
                             </div>
                           )}
-                        <div class={styles}></div>
                       </span>
                     </div>
                     <div class={styles.vip_member_tip}></div>
@@ -632,7 +631,7 @@ export default defineComponent({
                       <span class={styles.icon_text}>
                         <i class={styles.bottom_line}></i>
                         {/* 活动显示 */}
-                        {activitData.vipCardId &&
+                        {!!activitData.vipCardId &&
                           activitData.vipType === 'SVIP' &&
                           activitData.extConfig?.title1 && (
                             <div class={styles.activitTip}>