活动描述

src/shims-vue.d.ts

@@ -1,16 +1,20 @@
-import dayjs from "dayjs";
-
+import dayjs from 'dayjs'
 
 declare module 'vue-cropper'
 declare module '*.vue' {
-  import { DefineComponent } from 'vue';
-  const component: DefineComponent<{}, {}, any>;
-  export default component;
+  import { DefineComponent } from 'vue'
+  const component: DefineComponent<{}, {}, any>
+  export default component
 }
 
-
 declare module '@vue/runtime-core' {
   export interface ComponentCustomProperties {
     $dayjs: dayjs.Dayjs
   }
 }
+
+declare module 'vue' {
+  interface CSSProperties {
+    '--navBarHeight'?: string
+  }
+}

src/views/member-center/index.module.less

@@ -195,6 +195,22 @@
   border-radius: 16px 16px 0px 0px;
   padding-bottom: 10px;
 }
+.activitTip2{
+  margin: 16px;
+  background: linear-gradient( 90deg, #FFE9EE 0%, #FFECD9 100%);
+  border-radius: 8px;
+  padding: 8px 9px;
+  .activitTipText{
+    white-space: pre-line;
+    font-weight: 500;
+    font-size: 14px;
+    color: #6B4429;
+    line-height: 22px;
+    background: linear-gradient(90deg, #F31234 0%, #FF6E00 100%);
+    -webkit-background-clip: text; /* 让背景裁剪到文字上 */
+    -webkit-text-fill-color: transparent; /* 文字填充透明色，显示背景渐变 */
+  }
+}
 
 .member_tabs {
   display: flex;
@@ -546,7 +562,9 @@
     .iconPermanent {
       left: -2px;
     }
-
+    .activitTip1 {
+      left: -2px;
+    }
     .extraTip {
       background: #0ED8B0;
       color: #FFFFFF;

src/views/member-center/index.tsx

@@ -298,7 +298,8 @@ export default defineComponent({
         orderStatus.orderObject.orderDesc = `小酷Ai ${state.tabActive} ${member.title}`
         orderStatus.orderObject.actualPrice = calcSalePrice(member)
         orderStatus.orderObject.recomUserId = state.recomUserId
-        orderStatus.orderObject.activityId = activitData.activityId || state.activityId
+        orderStatus.orderObject.activityId =
+          activitData.activityId || state.activityId
         orderStatus.orderObject.orderNo = ''
 
         const orderData = {
@@ -322,8 +323,9 @@ export default defineComponent({
           discountEndTime: userInfo.value.discountEndTime, // 畅学卡结束时间
           discountStartTime: userInfo.value.discountStartTime // 畅学卡开始时间
         }
+        // 当能购买并且是当前活动商品时候加上 活动信息
         const canBuyNum = activitData.buyCount - activitData.buyNum
-        if (canBuyNum > 0) {
+        if (member.id === activitData.vipCardId && canBuyNum > 0) {
           orderData.activityBuyCount = canBuyNum
           orderData.activityList = activitData.activityList
         }
@@ -849,7 +851,15 @@ export default defineComponent({
                   <span>原VIP会员天数升级为SVIP</span>
                 </div>
               )}
-
+            {/* 活动描述 */}
+            {state.selectMember?.id === activitData.vipCardId &&
+              activitData.extConfig?.describe && (
+                <div class={styles.activitTip2}>
+                  <div class={styles.activitTipText}>
+                    {activitData.extConfig?.describe}
+                  </div>
+                </div>
+              )}
             <MemberInteres type={state.tabActive} />
           </div>
         </div>