Browse Source

样式修改

黄琪勇 3 months ago
parent
commit
28f860aac0

+ 4 - 4
src/student/activePage/double12Active/index.module.less

@@ -45,7 +45,7 @@
       z-index: 0;
       width: 100%;
       height: 60px;
-      border-radius: 20px 20px 0 0;
+      border-radius: 19px 19px 0 0;
     }
     .activeCon {
       margin-top: 24px;
@@ -56,7 +56,7 @@
         height: 27px;
         background: #ffdd71;
         border-radius: 14px;
-        font-family: PingFangSC, PingFang SC;
+        font-family: Helvetica Neue, Helvetica, PingFangSC;
         font-weight: 600;
         font-size: 15px;
         color: #000000;
@@ -214,7 +214,7 @@
       z-index: 0;
       width: 100%;
       height: 60px;
-      border-radius: 20px 20px 0 0;
+      border-radius: 19px 19px 0 0;
     }
     .titCon {
       position: relative;
@@ -245,7 +245,7 @@
         font-size: 15px;
         color: #ffffff;
         font-weight: 600;
-        font-family: PingFangSC, PingFang SC;
+        font-family: Helvetica Neue, Helvetica, PingFangSC;
         & > span:nth-child(1) {
           font-size: 22px;
           font-weight: 500;

+ 2 - 2
src/student/activePage/double12Active/index.tsx

@@ -271,9 +271,9 @@ export default defineComponent({
             <div class={styles.activeBox}>活动时间</div>
             <div class={styles.activeTimes}>
               {`${dayjs(activitData.activityStart).format(
-                'YYYY年MM月DD日HH:MM'
+                'YYYY年MM月DD日HH:mm'
               )}-${dayjs(activitData.activityEnd).format(
-                'YYYY年MM月DD日HH:MM'
+                'YYYY年MM月DD日HH:mm'
               )}`}
             </div>
           </div>

+ 25 - 16
src/views/member-center/index.module.less

@@ -222,11 +222,32 @@
     text-align: center;
     padding: 12px 0;
     cursor: pointer;
-    opacity: 0.3;
+    position: relative;
+    & > div{
+      opacity: 0.3;
+    }
+    .activitTip{
+      background: linear-gradient( 315deg, #FF1E3D 0%, #FF0704 51%, #FF7A4F 100%);
+      border-radius: 11px 11px 11px 0px;
+      font-weight: 600;
+      font-size: 12px;
+      color: #FFFFFF;
+      line-height: 18px;
+      padding: 1px 6px;
+      white-space: nowrap;
+      position: absolute;
+      left: 50%;
+      top: 0;
+      transform: translateY(-50%);
+      opacity: 1;
+      font-family: Helvetica Neue, Helvetica, PingFangSC;
+    }
   }
 
   .member_tab_active {
-    opacity: 1;
+    & > div{
+      opacity: 1;
+    }
   }
 
   .icon_member {
@@ -239,19 +260,6 @@
   .icon_text {
     position: relative;
     margin-top: 3px;
-    .activitTip{
-      background: linear-gradient( 315deg, #FF1E3D 0%, #FF0704 51%, #FF7A4F 100%);
-      border-radius: 11px 11px 11px 0px;
-      font-weight: 600;
-      font-size: 12px;
-      color: #FFFFFF;
-      line-height: 18px;
-      padding: 1px 6px;
-      white-space: nowrap;
-      position: absolute;
-      left: 18px;
-      top: -25px;
-    }
   }
 
   .bottom_line {
@@ -498,6 +506,7 @@
     padding: 1px 6px 2px;
     left: -1px;
     top: -9px;
+    font-family: Helvetica Neue, Helvetica, PingFangSC;
   }
 
   .s_title {
@@ -514,7 +523,7 @@
   .price {
     font-family: DINAlternate-Bold, DINAlternate;
     font-weight: bold;
-    font-size: 28px;
+    font-size: 26px;
     color: #333333;
     padding: 3px 0 6px;
 

+ 16 - 16
src/views/member-center/index.tsx

@@ -607,17 +607,17 @@ export default defineComponent({
                       <i class={[styles.icon_member]}></i>
                       <span class={styles.icon_text}>
                         <i class={styles.bottom_line}></i>
-                        {/* 活动显示 */}
-                        {!!activitData.vipCardId &&
-                          activitData.vipType === 'VIP' &&
-                          activitData.extConfig?.title1 && (
-                            <div class={styles.activitTip}>
-                              {activitData.extConfig?.title1}
-                            </div>
-                          )}
                       </span>
                     </div>
                     <div class={styles.vip_member_tip}></div>
+                    {/* 活动显示 */}
+                    {!!activitData.vipCardId &&
+                      activitData.vipType === 'VIP' &&
+                      activitData.extConfig?.title1 && (
+                        <div class={styles.activitTip}>
+                          {activitData.extConfig?.title1}
+                        </div>
+                      )}
                   </div>
                   <div
                     class={[
@@ -630,17 +630,17 @@ export default defineComponent({
                       <i class={[styles.icon_member]}></i>
                       <span class={styles.icon_text}>
                         <i class={styles.bottom_line}></i>
-                        {/* 活动显示 */}
-                        {!!activitData.vipCardId &&
-                          activitData.vipType === 'SVIP' &&
-                          activitData.extConfig?.title1 && (
-                            <div class={styles.activitTip}>
-                              {activitData.extConfig?.title1}
-                            </div>
-                          )}
                       </span>
                     </div>
                     <div class={styles.svip_member_tip}></div>
+                    {/* 活动显示 */}
+                    {!!activitData.vipCardId &&
+                      activitData.vipType === 'SVIP' &&
+                      activitData.extConfig?.title1 && (
+                        <div class={styles.activitTip}>
+                          {activitData.extConfig?.title1}
+                        </div>
+                      )}
                   </div>
                 </div>
               </>