修改样式

src/tenant/activation-code/index.module.less

@@ -131,10 +131,14 @@
     }
 
     .liveBtn {
+      height: 25px;
+      font-size: 12px;
+      font-weight: 500;
+      color: #FFFFFF;
+      line-height: 1;
+      min-width: 64px;
       background: #FE2451;
       border-radius: 6px;
-      padding: 0 12px;
-      height: 25px;
     }
   }
 }

src/tenant/activation-code/index.tsx

@@ -142,8 +142,8 @@ export default defineComponent({
               </div>
               <Row class={styles.colRow}>
                 <Col span={5}>激活码</Col>
-                <Col span={4}>周期</Col>
-                <Col span={6}>激活状态</Col>
+                <Col span={5}>周期</Col>
+                <Col span={5}>激活状态</Col>
                 <Col span={9}>激活时间</Col>
               </Row>
 
@@ -151,10 +151,10 @@ export default defineComponent({
                 {state.list.map((item: any) => (
                   <Row>
                     <Col span={5}>{item.activationCode}</Col>
-                    <Col span={4}>{item.purchaseCycle}个月</Col>
+                    <Col span={5}>{item.purchaseCycle}个月</Col>
                     <Col
-                      span={6}
-                      class={item.activationStatus ? styles.c1 : styles.c3}
+                      span={5}
+                      class={item.activationStatus ? styles.c1 : styles.c2}
                     >
                       {item.activationStatus ? '已激活' : '待激活'}
                     </Col>

src/tenant/exercise-record/echats.ts

@@ -146,6 +146,7 @@ export const lineChartOption = {
   ],
   formatter: (item: any) => {
     if (Array.isArray(item)) {
+      // console.log(item, 'formatter')
       return [
         item[0].axisValueLabel,
         ...item.map(

src/tenant/exercise-record/exercis-detail.module.less

@@ -21,7 +21,7 @@
     top: 0;
     left: 0;
     width: 100%;
-    height: 214px;
+
     z-index: -1;
   }
 }
@@ -43,6 +43,7 @@
 
 
   .level {
+    margin-top: -4px;
     width: 44px;
     height: 17px;
   }
@@ -145,7 +146,7 @@
       span {
         margin-left: 1px;
         font-size: 12px;
-        font-weight: 400;
+        font-weight: 400 !important;
         color: #333333;
         line-height: 17px;
       }
@@ -164,7 +165,7 @@
   :global {
     .van-sticky {
       background: url('../images/bg-image-1.png') no-repeat top center;
-      background-size: 100% 214px;
+      background-size: cover;
       z-index: 99999999;
     }
   }

src/tenant/exercise-record/modals/detail-item.module.less

@@ -33,7 +33,7 @@
         }
 
         .iconPlay {
-          margin-top: -1px;
+          margin-top: -1px !important;
           font-size: 20px;
           width: 20px;
           height: 20px;

src/tenant/music/music-detail/index.module.less

@@ -266,8 +266,8 @@
 
   // border: 1px solid #2dc7aa;
   .icon {
-    width: 36px;
-    height: 36px;
+    width: 40px;
+    height: 40px;
     border-radius: 10px;
   }
 
@@ -287,6 +287,7 @@
     >p {
       color: var(--music-list-item-mate-color);
       line-height: 17px;
+      padding-top: 3px !important;
     }
   }
 
@@ -333,6 +334,7 @@
     }
 
     >p {
+      padding-top: 3px;
       color: var(--music-list-item-mate-color);
       line-height: 17px;
     }
@@ -414,6 +416,7 @@
     }
 
     >p {
+      padding-top: 3px;
       font-size: 12px;
       color: #999;
       line-height: 17px;

src/tenant/music/music-detail/new-index.module.less

@@ -597,8 +597,8 @@
 
   // border: 1px solid #2dc7aa;
   .icon {
-    width: 36px;
-    height: 36px;
+    width: 40px;
+    height: 40px;
     border-radius: 10px;
   }
 
@@ -618,6 +618,7 @@
     >p {
       color: var(--music-list-item-mate-color);
       line-height: 17px;
+      padding-top: 3px;
     }
   }
 

src/tenant/music/personal/index.module.less

@@ -36,7 +36,7 @@
   :global {
     .van-sticky {
       background: url('../../images/bg-image-1.png') no-repeat top center;
-      background-size: 100% 214px;
+      background-size: cover;
     }
 
     .van-search__content {
@@ -62,7 +62,7 @@
     top: 0;
     left: 0;
     width: 100%;
-    height: 214px;
+
     // object-fit: cover;
     z-index: -1;
   }
@@ -122,6 +122,8 @@
   }
 
   .tenantContent {
+    padding-top: 6px;
+
     h2 {
       font-size: 16px;
       font-weight: 500;
@@ -130,6 +132,7 @@
     }
 
     p {
+      padding-top: 6px;
       font-size: 13px;
       color: #777777;
       line-height: 24px;

src/tenant/music/train-tool/index.module.less

@@ -111,7 +111,7 @@
     .des {
 
       font-size: 12px;
-      color: #fff;
+      color: rgba(255, 255, 255, 0.5);
     }
   }
 }
@@ -148,6 +148,10 @@
       border-radius: 36px 36px 0px 0px;
     }
 
+    .van-tab--shrink {
+      padding: 0 12px 0 12px;
+    }
+
     .van-button--plain.van-button--primary {
       background-color: transparent;
     }
@@ -160,7 +164,7 @@
 
 .btnGroup {
   // background-color: #fff;
-  padding: 12px;
+  padding-bottom: calc(12px + env(safe-area-inset-bottom));
 
   :global {
     .van-button {
@@ -308,7 +312,7 @@
     font-weight: 600;
     color: #131415;
     line-height: 22px;
-    padding: 26px 24px;
+    padding: 26px 24px 26px 13px;
 
     .iconArrowLine {
       display: inline-block;

src/tenant/trade/index.module.less

@@ -17,10 +17,14 @@
       }
 
       .van-field__clear {
-        color: rgba(0, 0, 0, 0.4) !important;
+        color: #C1BDC1 !important;
       }
     }
 
+    .van-search {
+      padding-bottom: 0;
+    }
+
   }
 }
 
@@ -131,12 +135,12 @@
 
 
 .tradeList {
-  padding-top: 12px;
+  padding-top: 16px;
 
   :global {
     .van-cell-group {
       overflow: hidden;
-      border-radius: 10px;
+      border-radius: 10px !important;
       margin-bottom: 12px;
       padding-bottom: 18px;
     }

src/tenant/trade/index.tsx

@@ -281,11 +281,11 @@ export default defineComponent({
                                 )}
                               </div>
 
-                              {orderDetail.bizInfo?.bizMusicCount > 0 && (
+                              {/* {orderDetail.bizInfo?.bizMusicCount > 0 && (
                                 <span class={styles.songLength}>
                                   共{orderDetail.bizInfo?.bizMusicCount}首
                                 </span>
-                              )}
+                              )} */}
                             </div>
                           )
                         }}

src/views/order-detail/order-tennat-album/index.module.less

@@ -1,6 +1,6 @@
 .album {
   margin-bottom: 12px;
-  padding: 10px;
+  padding: 15px;
   background-color: var(--music-list-item-background-color);
   border-radius: 10px;
   display: flex;
@@ -82,4 +82,31 @@
       margin-top: 1px;
     }
   }
+}
+
+.albumWeek {
+  background-color: #fff;
+  margin-bottom: 12px;
+  padding: 15px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+
+  border-radius: 6px;
+
+  .albumTitle {
+    font-size: 16px;
+    font-weight: 600;
+    color: #131415;
+    line-height: 22px;
+  }
+
+  .albumNum {
+    font-size: 14px;
+    font-weight: 500;
+    color: #FE2451;
+    line-height: 20px;
+
+  }
 }

src/views/order-detail/order-tennat-album/index.tsx

@@ -15,18 +15,25 @@ export default defineComponent({
     const item = this.item
     console.log(item)
     return (
-      <div class={styles.album}>
-        <Image class={styles.img} src={item.coverImg} />
+      <>
+        <div class={styles.album}>
+          <Image class={styles.img} src={item.coverImg} />
 
-        <span class={styles.albumType}>{item.purchaseCycle}个月</span>
+          {/* <span class={styles.albumType}>{item.purchaseCycle}个月</span> */}
 
-        <div class={styles.content}>
-          <h4 class="van-ellipsis">{item.name}</h4>
-          <p class="van-multi-ellipsis--l2">{item.describe}</p>
+          <div class={styles.content}>
+            <h4 class="van-ellipsis">{item.name}</h4>
+            <p class="van-multi-ellipsis--l2">{item.describe}</p>
 
-          <span class={styles.musicNum}>共{item.musicNum}首</span>
+            {/* <span class={styles.musicNum}>共{item.musicNum}首</span> */}
+          </div>
         </div>
-      </div>
+
+        <div class={styles.albumWeek}>
+          <span class={styles.albumTitle}>购买周期</span>
+          <span class={styles.albumNum}>{item.purchaseCycle}个月</span>
+        </div>
+      </>
     )
   }
 })

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

@@ -3,6 +3,10 @@
   height: 98px;
 }
 
+.container {
+  padding-top: 2px;
+}
+
 .titleClass {
   padding-left: 15px;
 }
@@ -57,4 +61,17 @@
     font-weight: 600;
     color: #131415;
   }
+}
+
+.cellGroup {
+  border-radius: 10px;
+  overflow: hidden;
+}
+
+.cellGroupTimer {
+  :global {
+    .van-cell {
+      padding: 15px;
+    }
+  }
 }

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

@@ -19,11 +19,7 @@ export default defineComponent({
     const item = this.item
     return (
       <div class={styles.videoOrder}>
-        <CellGroup
-          class={'mb12'}
-          border={false}
-          style={{ borderRadius: '8px', overflow: 'hidden' }}
-        >
+        <CellGroup class={['mb12', styles.cellGroup]} border={false}>
           <Cell
             // center
             titleClass={styles.titleClass}
@@ -43,9 +39,8 @@ export default defineComponent({
         </CellGroup>
 
         <CellGroup
-          class={'mb12'}
+          class={['mb12', styles.cellGroup, styles.cellGroupTimer]}
           border={false}
-          style={{ borderRadius: '8px', overflow: 'hidden' }}
         >
           <Cell
             center

vite.config.ts

@@ -12,7 +12,7 @@ function resolve(dir: string) {
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
 // const proxyUrl = 'https://online.colexiu.com/';
-const proxyUrl = 'https://test.colexiu.com/'
+const proxyUrl = 'https://dev.colexiu.com/'
 // const proxyUrl = 'http://192.168.3.143:8000/'
 export default defineConfig({
   base: './',