Merge branch 'iteration-20240715'

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

@@ -35,7 +35,7 @@
       height: 48px;
       border-radius: 50%;
       overflow: hidden;
-      border: 1px solid #F2F6F7;
+      border: 1px solid #F2F6F7 !important;
     }
 
     .showMemeber {

src/views/order-detail/order-vip/index.module.less

@@ -40,9 +40,13 @@
 .timerTitle {
   display: flex;
   align-items: center;
-  font-size: 14px;
-  font-weight: 500;
-  color: #333333;
+  // font-size: 14px;
+  // font-weight: 500;
+  // color: #333333;
+
+  color: var(--van-cell-text-color) !important;
+  font-size: var(--van-cell-font-size) !important;
+  line-height: var(--van-cell-line-height) !important;
   line-height: 20px;
   padding-right: 12px;
 }
@@ -59,11 +63,11 @@
   align-items: center;
   justify-content: space-between;
 
-  span {
-    font-size: 16px;
-    font-weight: 600;
-    color: #131415;
-  }
+  // span {
+  //   font-size: 16px;
+  //   font-weight: 600;
+  //   color: #131415;
+  // }
 }
 
 .cellGroup {
@@ -120,4 +124,4 @@
       opacity: 0.6;
     }
   }
-}
+}

src/views/order-detail/order-vip/index.tsx

@@ -155,7 +155,7 @@ export default defineComponent({
                   <div class={styles.timerCell}>
                     <div class={styles.timerTitle}>
                       {/* <Icon name={iconTimer} size={18} /> */}
-                      <span style={{ paddingLeft: '5px' }}>生效时间</span>
+                      <span>生效时间</span>
                     </div>
                     <div class={styles.timer}>
                       {this.startTime} 至 {item.endTime}