Merge branch 'master' of http://git.dayaedu.com/lex/orchestra-app

src/school/ranking-list/index.tsx

@@ -37,7 +37,7 @@ export default defineComponent({
           <Tabs
             v-model:active={activeName.value}
             class={styles.rankTabs}
-            background={'rgba(0,0,0,.35)'}
+            background={'rgba(224, 69, 21,.71)'}
             title-active-color={'#fff'}
             title-inactive-color={'#fff'}
             color={'#fff'}

src/school/ranking-list/modals/rank-item.tsx

@@ -39,11 +39,11 @@ export default defineComponent({
             <div class={styles.wrapRight}>
               {props.type == 'day' ? (
                 <p>
-                  <span>{props.item.practiceDays ? props.item.practiceDays : 0}</span>天
+                  <span>{props.item.practiceDays ? props.item.practiceDays : 0}</span> 天
                 </p>
               ) : (
                 <p>
-                  <span>{props.item.practiceTimes ? props.item.practiceTimes : 0}</span>分钟
+                  <span>{props.item.practiceTimes ? props.item.practiceTimes : 0}</span> 分钟
                 </p>
               )}
             </div>

src/student/ranking-list/index.tsx

@@ -52,7 +52,7 @@ export default defineComponent({
           <Tabs
             v-model:active={activeName.value}
             class={styles.rankTabs}
-            background={'rgba(0,0,0,.35)'}
+            background={'rgba(224, 69, 21,.71)'}
             title-active-color={'#fff'}
             title-inactive-color={'#fff'}
             color={'#fff'}

src/student/ranking-list/modals/my-ranking-item.tsx

@@ -13,8 +13,8 @@ export default defineComponent({
             <div class={styles.wrapLeft}>
               <div class={styles.headerWrap}>
                 <Image
-                  width="48px"
-                  height="48px"
+                  width="100%"
+                  height="100%"
                   src={props.item.avatar ? props.item.avatar : defaultIcon}
                   alt=""
                   fit="cover"

src/student/ranking-list/modals/rank-item.module.less

@@ -82,6 +82,7 @@
   padding: 14px 18px 34px;
   background-color: #fff;
   justify-content: space-between;
+  box-shadow: 0px 2px 5px 0px rgba(0, 0, 0, 0.5);
   .wrapLeft {
     display: flex;
     flex-direction: row;
@@ -108,12 +109,12 @@
     }
     .myTag {
       display: inline-block;
-      background: #ff8057;
-      border-radius: 12px;
+      background: #ffe7da;
+      border-radius: 4px;
       font-size: 12px;
       text-align: center;
       font-weight: 500;
-      color: #fff;
+      color: #f67146;
       line-height: 17px;
       padding: 0 8px;
     }

src/student/ranking-list/modals/rank-item.tsx

@@ -22,8 +22,8 @@ export default defineComponent({
               </div>
               <div class={styles.headerWrap}>
                 <Image
-                  width="48px"
-                  height="48px"
+                  width="100%"
+                  height="100%"
                   src={props.item.avatar ? props.item.avatar : defaultIcon}
                   alt=""
                   fit="cover"
@@ -39,11 +39,11 @@ export default defineComponent({
             <div class={styles.wrapRight}>
               {props.type == 'day' ? (
                 <p>
-                  <span>{props.item.practiceDays ? props.item.practiceDays : 0}</span>天
+                  <span>{props.item.practiceDays ? props.item.practiceDays : 0}</span> 天
                 </p>
               ) : (
                 <p>
-                  <span>{props.item.practiceTimes ? props.item.practiceTimes : 0}</span>分钟
+                  <span>{props.item.practiceTimes ? props.item.practiceTimes : 0}</span> 分钟
                 </p>
               )}
             </div>

src/styles/index.less

@@ -197,3 +197,8 @@ body {
   margin: 0 13px;
   padding: 15px 12px;
 }
+
+@font-face {
+  font-family: 'DINA';
+  src: url('./font/DIN_Alternate_Bold.ttf');
+}

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

@@ -43,7 +43,7 @@
         }
         .tag {
           display: inline-block;
-          padding: 2px 11px;
+          padding: 0px 11px;
           // min-width: 50px;
           background: #ff8057;
           border-radius: 12px;
@@ -67,12 +67,14 @@
         margin-right: 30px;
       }
       .infoDayMain {
-        font-size: 24px;
-        font-weight: bold;
+        font-size: 25px;
         color: #333333;
         line-height: 28px;
         margin-bottom: 7px;
+        font-family: 'DINA';
+        font-weight: bold;
         span {
+          margin-left: 2px;
           font-size: 12px;
           font-weight: 400;
           color: #333333;
@@ -93,6 +95,10 @@
     align-items: center;
     // justify-content: space-around;
     background-color: transparent;
+    font-size: 14px;
+    font-weight: 500;
+    color: #333333;
+    line-height: 20px;
   }
 }
 
@@ -117,7 +123,7 @@
   }
 }
 .DialogConent {
-  padding: 0 25px 20px;
+  padding: 0 25px 30px;
   p {
     font-size: 16px;
     line-height: 22px;
@@ -126,8 +132,12 @@
 }
 :global {
   .exercisDetailDialog {
+    border-radius: 10px;
     .van-dialog__header {
       padding-top: 0px !important;
     }
   }
+  .van-dialog {
+    top: 47%;
+  }
 }

src/views/exercise-record/exercis-detail.tsx

@@ -186,14 +186,16 @@ export default defineComponent({
               <div class={styles.topInfoRight}>
                 <div class={styles.infoDay}>
                   <p class={styles.infoDayMain}>
-                    {infoDetail.value.practiceDays ? infoDetail.value.practiceDays : 0}{' '}
+                    {infoDetail.value.practiceDays ? infoDetail.value.practiceDays : 0}
+                    {''}
                     <span>天</span>
                   </p>
                   <p class={styles.infoDaysub}>练习天数</p>
                 </div>
                 <div class={styles.infoTime}>
                   <p class={styles.infoDayMain}>
-                    {infoDetail.value.practiceTimes ? infoDetail.value.practiceTimes : 0}{' '}
+                    {infoDetail.value.practiceTimes ? infoDetail.value.practiceTimes : 0}
+                    {''}
                     <span>分钟</span>
                   </p>
                   <p class={styles.infoDaysub}>练习时长</p>

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

@@ -20,6 +20,7 @@
         margin-bottom: 6px;
       }
       .itemTopSub {
+        font-size: 12px;
         font-weight: 400;
         color: #777777;
         line-height: 17px;
@@ -57,11 +58,14 @@
       width: 25%;
       .dotMain {
         font-size: 26px;
-        font-weight: bold;
         color: #333333;
         line-height: 30px;
         margin-bottom: 4px;
+        font-family: 'DINA';
+        font-weight: bold;
+
         span {
+          margin-left: 1px;
           font-size: 12px;
           font-weight: 400;
           color: #333333;

src/views/exercise-record/modals/detail-item.tsx

@@ -93,26 +93,29 @@ export default defineComponent({
             <div class={styles.itemBottom}>
               <div class={styles.itemBottomDot}>
                 <p class={styles.dotMain} style={{ color: '#F67146' }}>
-                  {props.item.score || 0} <span>分</span>{' '}
+                  {props.item.score || 0}
+                  <span>分</span>
                 </p>
                 <p class={styles.dotSub}> 综合得分</p>
               </div>
               <div class={styles.itemBottomDot}>
                 <p class={styles.dotMain}>
                   {props.item.intonation || 0}
-                  <span>分</span>{' '}
+                  <span>分</span>
                 </p>
                 <p class={styles.dotSub}>音准 </p>
               </div>
               <div class={styles.itemBottomDot}>
                 <p class={styles.dotMain}>
-                  {props.item.cadence || 0} <span>分</span>{' '}
+                  {props.item.cadence || 0}
+                  <span>分</span>{' '}
                 </p>
                 <p class={styles.dotSub}>节奏 </p>
               </div>
               <div class={styles.itemBottomDot}>
                 <p class={styles.dotMain}>
-                  {props.item.integrity || 0} <span>分</span>{' '}
+                  {props.item.integrity || 0}
+                  <span>分</span>{' '}
                 </p>
                 <p class={styles.dotSub}>完成度 </p>
               </div>