瀏覽代碼

修改样式

lex 1 年之前
父節點
當前提交
d692933cbc

+ 34 - 0
src/styles/tenant.less

@@ -25,4 +25,38 @@ body {
 input,
 textarea {
   caret-color: #FE2451;
+}
+
+.van-overlay {
+  --van-overlay-background-color: rgba(0, 0, 0, 0.5);
+}
+
+.confirm-button-group {
+  .van-dialog__message {
+    font-size: 15px;
+    color: #666666;
+    padding: 20px 12px 25px !important;
+  }
+
+  .van-action-bar-button--last,
+  .van-action-bar-button--first {
+    border-radius: 999px;
+    font-size: 16px;
+    font-weight: 400 !important;
+    line-height: 40px;
+    line-height: 40px;
+  }
+
+  .van-action-bar-button--first {
+    background: #FFFFFF;
+    border: 1px solid #DBDBDB;
+    color: #333333;
+  }
+
+  .van-action-bar-button--last {
+    margin-left: 15px;
+    color: #fff !important;
+    background-color: var(--van-primary) !important;
+    color: #FFFFFF;
+  }
 }

+ 3 - 5
src/tenant/member-center/index.module.less

@@ -192,7 +192,7 @@
       background: linear-gradient(44deg, #FCE3E1 0%, #FEF3EC 29%, #FDDDD5 59%, #FEDBE3 100%);
       border-radius: 12px;
       // opacity: 0.27;
-      margin: 13px 12px 20px;
+      margin: 0px 12px 20px;
 
       text-align: justify;
       font-size: 14px;
@@ -275,13 +275,13 @@
       margin-top: 8px;
       border-radius: 8px;
       overflow: hidden;
-      background-color: #faefe3;
+      background: #FDF1EA;
       text-align: center;
     }
 
     .function_text {
       font-size: 12px;
-      color: #814014;
+      color: #811C14;
       line-height: 16px;
     }
   }
@@ -406,11 +406,9 @@
         height: 14px;
         background: url('./images/icon-arrow-line.png') no-repeat center;
         background-size: contain;
-        transition: all .2s;
 
         &.iconArrowLineHide {
           transform: rotate(180deg);
-          transition: all .2s;
         }
       }
     }

+ 4 - 3
src/tenant/music/album-detail/index.module.less

@@ -161,7 +161,7 @@
 .musicContent {
   position: absolute;
   top: 0;
-  height: 265px;
+  height: 305px;
   width: 100%;
   padding-top: 55px;
   z-index: 10;
@@ -255,7 +255,8 @@
   background-size: contain;
   // border-radius: 16px;
   // opacity: 0.32;
-  padding: 11px 10px 10px;
+  padding: 0 10px;
+  height: 36px;
   margin-top: 12px;
   font-size: 13px;
   font-weight: 500;
@@ -267,7 +268,7 @@
 
   .albumPrice {
     font-size: 13px;
-    font-weight: 400;
+    font-weight: 500;
     color: #FFE1AE;
     line-height: 18px;
     background: #262626;

+ 2 - 1
src/tenant/music/album-detail/index.tsx

@@ -165,7 +165,8 @@ export default defineComponent({
         Dialog.confirm({
           title: '提示',
           message: '您有一个未支付的订单,是否继续支付?',
-          confirmButtonColor: '#269a93',
+          theme: 'round-button',
+          className: 'confirm-button-group',
           cancelButtonText: '取消订单',
           confirmButtonText: '继续支付'
         })

+ 7 - 3
src/tenant/music/album/index.module.less

@@ -2,7 +2,7 @@
   position: relative;
   z-index: 1;
   background: url('@/tenant/images/bg-image.png') no-repeat top center;
-  background-size: 100% 265px;
+  background-size: 100% 346px;
 }
 
 .headerImg {
@@ -10,13 +10,17 @@
   left: 0;
   top: 0;
   width: 100%;
-  height: 265px;
+  height: 346px;
   object-fit: cover;
   filter: blur(10px);
 }
 
 .headerContent {
   :global {
+    .van-search {
+      padding-bottom: 0;
+    }
+
     .van-search__content {
       background: rgba(255, 255, 255, 0.5) !important;
 
@@ -87,7 +91,7 @@
 }
 
 .musicGrid {
-  margin: 16px 12px;
+  margin: 8px 12px;
 }
 
 .tagTabs {

+ 1 - 1
src/tenant/music/component/music-grid/index.module.less

@@ -16,7 +16,7 @@
   }
 
   .item {
-    margin-bottom: 14px;
+    margin-bottom: 20px;
 
     .title {
       font-size: 13px;

+ 1 - 1
src/tenant/music/component/song/index.tsx

@@ -104,7 +104,7 @@ export default defineComponent({
                   />
 
                   {n.exquisiteFlag === 1 && (
-                    <div class={styles.exquisiteTag}>精</div>
+                    <div class={styles.exquisiteTag}>精</div>
                   )}
 
                   <div class={styles.tags}>

+ 9 - 2
src/tenant/music/list/index.module.less

@@ -21,7 +21,7 @@
       }
 
       .van-field__clear {
-        color: rgba(0, 0, 0, 0.4) !important;
+        color: #C1BDC1 !important;
       }
     }
 
@@ -39,11 +39,18 @@
       border-color: transparent transparent rgba(0, 0, 0, 0.4) rgba(0, 0, 0, 0.4);
     }
 
+    .van-dropdown-menu__title--active::after {
+      border-color: transparent transparent #FE2451 #FE2451;
+    }
+
     .van-dropdown-item__content {
       border-radius: 0px 0px 20px 20px;
-
     }
 
+
+    .van-search {
+      padding-bottom: 0;
+    }
   }
 
   .titleActive {

+ 2 - 2
src/tenant/music/list/index.tsx

@@ -386,8 +386,8 @@ export default defineComponent({
                     left: () => (
                       <DropdownMenu>
                         <DropdownItem
-                          titleClass={styles.titleActive}
-                          title="筛选"
+                          // titleClass={styles.titleActive}
+                          title={subject.name}
                           ref={searchRef}
                         >
                           <SelectSubject

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

@@ -391,7 +391,7 @@
 
   .tag {
     flex-shrink: 0;
-    padding: 2px 4px 0;
+    padding: 0px 4px 0;
     border-radius: 4px;
 
     &+.tag {

+ 17 - 6
src/tenant/music/music-detail/new-index.module.less

@@ -178,7 +178,7 @@
 
   .tag {
     margin: 0 2px;
-    padding: 2px 6px;
+    padding: 1px 6px;
     color: #000;
     // background-color: rgba(113, 138, 147, 1);
     border-radius: 4px;
@@ -218,9 +218,11 @@
 
 .albumTips {
   background: url('../album-detail/charge_bg.png') no-repeat center;
-  background-size: contain;
+  background-size: cover;
   padding: 10px 10px;
   margin-top: 12px;
+  border-radius: 10px;
+  overflow: hidden;
   font-size: 13px;
   font-weight: 500;
   color: #5E3314;
@@ -414,7 +416,7 @@
 
   :global {
     .van-button {
-      font-size: 18px;
+      font-size: 16px;
       font-weight: 600;
       color: #FFFFFF;
       line-height: 25px;
@@ -494,6 +496,8 @@
 }
 
 .staffContainer {
+  background: linear-gradient(180deg, #FFEAEE 0%, #FFFFFF 100%) no-repeat;
+  background-size: 100% 59px;
   // text-align: center;
   padding: 15px 15px 24px;
 
@@ -502,6 +506,7 @@
     font-size: 16px;
     color: #1a1a1a;
     line-height: 22px;
+    text-align: center;
   }
 
   .staffImg {
@@ -511,8 +516,7 @@
 
   .name {
     padding-left: 17px;
-    font-size: 13px;
-    font-weight: 500;
+    font-size: 14px;
     color: #333333;
   }
 
@@ -520,6 +524,7 @@
     background: transparent !important;
     width: 15px;
     height: 15px;
+    font-size: 20px;
     border: transparent !important;
   }
 
@@ -528,7 +533,8 @@
     border-radius: 8px;
 
     .name {
-      color: var(--van-primary);
+
+      font-weight: 600;
     }
   }
 
@@ -628,4 +634,9 @@
     color: #ffffff;
     line-height: 20px;
   }
+}
+
+.staffChange {
+  --van-popup-close-icon-color: #4C4949;
+  --van-popup-close-icon-size: 18px;
 }

+ 3 - 5
src/tenant/music/music-detail/new-index.tsx

@@ -430,7 +430,8 @@ export default defineComponent({
         Dialog.confirm({
           title: '提示',
           message: '您有一个未支付的订单,是否继续支付?',
-          confirmButtonColor: '#269a93',
+          theme: 'round-button',
+          className: 'confirm-button-group',
           cancelButtonText: '取消订单',
           confirmButtonText: '继续支付'
         })
@@ -647,7 +648,6 @@ export default defineComponent({
               <span>{musicDetail.value?.favoriteCount}</span>
             </div>
           </div>
-
           {musicDetail.value?.id && !buyState.value.play && (
             <div class={styles.albumTips}>
               {buyState.value.charge && buyState.value.vip ? (
@@ -862,6 +862,7 @@ export default defineComponent({
           teleport="body"
           closeable
           style={{ width: '80%' }}
+          class={styles.staffChange}
           round
         >
           <div class={styles.staffContainer}>
@@ -885,7 +886,6 @@ export default defineComponent({
                           icon: (props: any) => (
                             <Icon
                               class={styles.boxStyle}
-                              size={16}
                               name={
                                 props.checked
                                   ? activeButtonIcon
@@ -915,7 +915,6 @@ export default defineComponent({
                           icon: (props: any) => (
                             <Icon
                               class={styles.boxStyle}
-                              size={16}
                               name={
                                 props.checked
                                   ? activeButtonIcon
@@ -945,7 +944,6 @@ export default defineComponent({
                           icon: (props: any) => (
                             <Icon
                               class={styles.boxStyle}
-                              size={16}
                               name={
                                 props.checked
                                   ? activeButtonIcon

+ 5 - 0
src/tenant/music/search/select-subject.module.less

@@ -18,6 +18,11 @@
       line-height: 22px;
       font-weight: bold;
     }
+
+    .van-button--default {
+      color: #333;
+
+    }
   }
 }
 

+ 1 - 1
src/tenant/music/search/select-subject.tsx

@@ -104,7 +104,7 @@ export default defineComponent({
           <div class={[styles.btnGroup, this.isReset ? 'btnMore' : '']}>
             {this.isReset && (
               <Button
-                type="primary"
+                // type="primary"
                 plain
                 round
                 onClick={() => {

+ 2 - 1
src/tenant/music/train-tool/index.tsx

@@ -238,7 +238,8 @@ export default defineComponent({
         Dialog.confirm({
           title: '提示',
           message: '您有一个未支付的订单,是否继续支付?',
-          confirmButtonColor: '#269a93',
+          theme: 'round-button',
+          className: 'confirm-button-group',
           cancelButtonText: '取消订单',
           confirmButtonText: '继续支付'
         })

+ 1 - 1
src/views/adapay/payment/index.module.less

@@ -121,7 +121,7 @@
     font-size: 11px;
     color: #ffffff;
     line-height: 16px;
-    padding: 0 5px;
+    padding: 1px 5px 0;
   }
 
   .payBtn {

+ 3 - 2
src/views/order-detail/index.module.less

@@ -76,14 +76,15 @@
     }
 
     .priceSection {
-      display: flex;
-      align-items: center;
+      // display: flex;
+      // align-items: center;
       font-size: 14px;
       font-weight: 500;
       color: #999999;
       line-height: 20px;
 
       .price {
+        display: inline-block;
         font-size: 28px;
         font-weight: bold;
         color: #ff3535;

+ 2 - 0
src/views/order-detail/order-music/index.module.less

@@ -24,6 +24,7 @@
 
       .info {
         margin-left: 14px;
+        padding-top: 2px;
         flex: 1;
 
         >h4 {
@@ -80,6 +81,7 @@
     :global {
       .van-tag {
         padding: 2px 6px 1px;
+        border-radius: 4px;
       }
     }
   }

+ 1 - 1
src/views/order-detail/payment/index.module.less

@@ -121,7 +121,7 @@
     font-size: 11px;
     color: #ffffff;
     line-height: 16px;
-    padding: 0 5px;
+    padding: 1px 5px 0;
   }
 
   .payBtn {