黄琪勇 1 vuosi sitten
vanhempi
commit
836f026e48

+ 4 - 2
src/tenant/exercise-record/exercis-detail.module.less

@@ -116,13 +116,15 @@
     font-size: 12px;
     font-weight: 500;
     color: #fe2451;
-    padding: 2px 7px;
+    padding: 3px 7px;
     background: rgba(255, 255, 255, 0.3);
     border-radius: 20px;
     border: 1px solid #ffffff;
     display: inline-flex;
     align-items: center;
-
+    .name{
+      line-height: 1;
+    }
     .iconSubject {
       width: 13px;
       height: 13px;

+ 1 - 1
src/tenant/exercise-record/exercis-detail.tsx

@@ -277,7 +277,7 @@ export default defineComponent({
                   <div class={styles.subjectName}>
                     <span class={styles.subjectTag}>
                       <img src={iconSubject} class={styles.iconSubject} />
-                      {userInfo.value.subjectName}
+                      <div class={styles.name}>{userInfo.value.subjectName}</div>
                     </span>
                   </div>
                 )

BIN
src/tenant/images/bg-image-1.png


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

@@ -118,7 +118,7 @@
     .title {
       max-width: 220px;
       font-size: 16px;
-      font-weight: bold;
+      font-weight: 600;
       color: #1a1a1a;
       margin-right: 6px;
     }

BIN
src/tenant/music/courseList/image/icon-list.png


+ 10 - 6
src/tenant/music/courseList/index.module.less

@@ -149,14 +149,18 @@
   }
 }
 
-.basePlay {
-  width: 20px;
-  height: 20px;
-}
 .circleProgress {
   width: 24px;
   height: 24px;
   position: relative;
+  .basePlay {
+    width: 20px;
+    height: 20px;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+  }
   :global {
     .van-circle {
       position: absolute;
@@ -333,8 +337,8 @@
 
   :global {
     .van-button {
-      font-size: 16px;
-      font-weight: 600;
+      font-size: 18px;
+      font-weight: 500;
       color: #ffffff;
       line-height: 25px;
     }

+ 4 - 4
src/tenant/music/courseList/index.tsx

@@ -456,12 +456,12 @@ export default defineComponent({
                           value: () => (
                             <>
                               {item.knowledgePointList ? (
-                                <>
+                                <div class={styles.circleProgress}>
                                   {item.hasCache ||
                                   item.downloadStatus !== 1 ? (
                                     <img class={styles.basePlay} src={play} />
                                   ) : (
-                                    <div class={styles.circleProgress}>
+                                    <>
                                       <div class={styles.tips}></div>
                                       <Circle
                                         v-model:current-rate={item.progress}
@@ -471,9 +471,9 @@ export default defineComponent({
                                         layer-color={'#B3B3B3'}
                                         color={'#FE2451'}
                                       />
-                                    </div>
+                                    </>
                                   )}
-                                </>
+                                </div>
                               ) : (
                                 ''
                               )}

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

@@ -29,6 +29,7 @@
       background-color: transparent;
       box-shadow: none;
       padding-right: 15px;
+      height: 36px;
     }
 
     .van-dropdown-menu__title {
@@ -102,7 +103,6 @@
   :global {
     .van-search {
       padding-top: 4px;
-      height: calc(var(--van-dropdown-menu-height) + 14px);
     }
   }
 }

+ 1 - 1
src/tenant/music/lessonCourseware/index.tsx

@@ -202,7 +202,7 @@ export default defineComponent({
               ) : (
                 !loading.value && (
                   <ColResult
-                    tips="暂无教"
+                    tips="暂无教"
                     classImgSize="CERT"
                     btnStatus={false}
                   />

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

@@ -429,8 +429,8 @@
 
   :global {
     .van-button {
-      font-size: 16px;
-      font-weight: 600;
+      font-size: 18px;
+      font-weight: 500;
       color: #FFFFFF;
       line-height: 25px;
     }

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

@@ -95,7 +95,7 @@
 }
 
 .tennatCellGroup {
-  margin: 12px;
+  margin: 7px 12px 12px;
   border-radius: 16px;
 
   :global {

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

@@ -29,6 +29,7 @@
       background-color: transparent;
       box-shadow: none;
       padding-right: 15px;
+      height: 36px;
     }
 
     .van-dropdown-menu__title {
@@ -62,7 +63,6 @@
   :global {
     .van-search {
       padding-top: 4px;
-      height: calc(var(--van-dropdown-menu-height) + 14px);
     }
   }
 }
@@ -186,7 +186,7 @@
   padding: 0 12px;
   border-radius: 18px;
   background-color: #fff;
-  margin: 6px 6px 0px 6px;
+  margin: 6px 12px 0px 12px;
   min-height: 40vh;
   :global {
     .van-list__loading {

+ 1 - 0
src/tenant/music/train-list/index.tsx

@@ -289,6 +289,7 @@ export default defineComponent({
                 }} */}
               </ColHeader>
               <Search
+                placeholder={'请输入曲谱关键词'}
                 class={styles.search}
                 onSearch={onSearch}
                 type="tenant"

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

@@ -303,8 +303,8 @@
       padding-bottom: 16px;
     }
     .van-tabs__nav {
-      padding-left: 5px;
-      padding-right: 5px;
+      padding-left: 6px;
+      padding-right: 6px;
     }
     .van-tab {
       font-size: 16px !important;
@@ -330,7 +330,7 @@
     }
 
     .van-tab--shrink {
-      padding: 0 15px 0 15px;
+      padding: 0 14px 0 14px;
     }
 
     .van-button--plain.van-button--primary {

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

@@ -605,7 +605,11 @@ export default defineComponent({
                     ) : (
                       !state.loading && (
                         <ColResult
-                          tips="暂无教程"
+                          tips={
+                            state.activeTab === 'COURSEWARE'
+                              ? '暂无教材'
+                              : '暂无曲目'
+                          }
                           classImgSize="SMALL"
                           btnStatus={false}
                         />

+ 1 - 1
src/tenant/trade/index.tsx

@@ -360,7 +360,7 @@ export default defineComponent({
           ) : (
             <ColResult
               btnStatus={false}
-              classImgSize="SMALL"
+              classImgSize="CERT"
               tips={state.type === 'buy' ? '暂无购买记录' : '暂无退款记录'}
             />
           )}

+ 1 - 1
src/views/article-center/help-center.tsx

@@ -121,7 +121,7 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          <ColResult btnStatus={false} classImgSize="SMALL" tips="暂无内容" />
+          <ColResult btnStatus={false} classImgSize="CERT" tips="暂无内容" />
         )}
       </div>
     )