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

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

@@ -66,7 +66,7 @@
       .activeTimes {
         margin-top: 12px;
         font-weight: 500;
-        font-size: 15px;
+        font-size: 14px;
         color: #333333;
         line-height: 21px;
       }

src/student/activePage/double12Active/index.tsx

@@ -308,12 +308,12 @@ export default defineComponent({
             </div>{' '}
             <div class={[styles.vipNumber, styles.vipBuy3]}>
               <div>畅学卡一年期</div>
-              <div>价值129元</div>
+              <div>价值200元</div>
             </div>
             <div class={styles.svipDetails}>
               <span>¥</span>
               <span>{activitData.registrationPrice}</span>
-              <span>(SVIP会员买1年赠1年，还送1年畅学)</span>
+              <span>(SVIP会员买1年赠1年，还送1年畅学卡)</span>
             </div>
           </div>
         </div>

src/student/discount-card/index.module.less

@@ -49,13 +49,13 @@
       height: 48px;
       border-radius: 50%;
       overflow: hidden;
-      border: 2px solid #f2f6f7;
+      border: 2px solid #ffffff;
     }
 
     .showMemeber {
       position: absolute;
-      bottom: 1px;
-      right: -4px;
+      bottom: -1px;
+      right: -7px;
       width: 18px;
       height: 18px;
     }
@@ -68,7 +68,7 @@
 
       &.isVip {
         .userImg {
-          border: 2px solid #f0af88;
+          border: 2px solid #FFE0B9;
         }
 
         .showMemeber {
@@ -308,4 +308,4 @@
     color: #FFFFFF;
     line-height: 22px;
   }
-}
+}

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

@@ -35,13 +35,13 @@
       height: 48px;
       border-radius: 50%;
       overflow: hidden;
-      border: 2px solid #F2F6F7;
+      border: 2px solid #ffffff;
     }
 
     .showMemeber {
       position: absolute;
-      bottom: 1px;
-      right: -3px;
+      bottom: -1px;
+      right: -4px;
       width: 18px;
       height: 18px;
 
@@ -55,7 +55,7 @@
 
       &.isVip {
         .userImg {
-          border: 2px solid #F0AF88;
+          border: 2px solid #FFE0B9;
         }
 
         .showMemeber {
@@ -523,7 +523,7 @@
   .price {
     font-family: DINAlternate-Bold, DINAlternate;
     font-weight: bold;
-    font-size: 26px;
+    font-size: 28px;
     color: #333333;
     padding: 3px 0 6px;