Merge branch 'hqyDev' of http://git.dayaedu.com/lex/h5-colexiu

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;

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>
                 )

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;
     }

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;
@@ -318,7 +322,7 @@
 }
 .finch {
   width: 150px;
-  margin: 80px auto 0;
+  margin: 140px auto 0;
 }
 
 .finchLoad {
@@ -333,8 +337,8 @@
 
   :global {
     .van-button {
-      font-size: 16px;
-      font-weight: 600;
+      font-size: 18px;
+      font-weight: 500;
       color: #ffffff;
       line-height: 25px;
     }

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>
                               ) : (
                                 ''
                               )}

src/tenant/music/coursewarePlay/index.tsx

@@ -268,7 +268,7 @@ export default defineComponent({
           }
         })
         //检测是否录屏
-        handleLimitScreenRecord()
+        // handleLimitScreenRecord()
         setTimeout(() => {
           data.animationState = 'end'
         }, 500)
@@ -435,27 +435,27 @@ export default defineComponent({
       // getCourseSchedule();
       window.addEventListener('message', iframeHandle)
       // 禁止录屏 ios
-      listenerMessage('setVideoPlayer', result => {
-        if (result?.content?.status == 'pause') {
-          handleLimitScreenRecord()
-        }
-      })
-      // 禁止录屏 安卓
-      postMessage({
-        api: 'limitScreenRecord',
-        content: {
-          type: 1
-        }
-      })
+      // listenerMessage('setVideoPlayer', result => {
+      //   if (result?.content?.status == 'pause') {
+      //     handleLimitScreenRecord()
+      //   }
+      // })
+      // // 禁止录屏 安卓
+      // postMessage({
+      //   api: 'limitScreenRecord',
+      //   content: {
+      //     type: 1
+      //   }
+      // })
     })
     onBeforeUnmount(() => {
       // 取消 禁止录屏
-      postMessage({
-        api: 'limitScreenRecord',
-        content: {
-          type: 0
-        }
-      })
+      // postMessage({
+      //   api: 'limitScreenRecord',
+      //   content: {
+      //     type: 0
+      //   }
+      // })
     })
     const playRef = ref()
     // 返回

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);
     }
   }
 }

src/tenant/music/lessonCourseware/index.tsx

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

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

@@ -364,7 +364,7 @@
 
   .finch {
     width: 150px;
-    margin: 80px auto 0;
+    margin: 150px auto 0;
   }
 
   .finchLoad {
@@ -429,8 +429,8 @@
 
   :global {
     .van-button {
-      font-size: 16px;
-      font-weight: 600;
+      font-size: 18px;
+      font-weight: 500;
       color: #FFFFFF;
       line-height: 25px;
     }

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

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

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

@@ -17,7 +17,7 @@ body {
       box-shadow: 10px 10px 10px var(--box-shadow-color);
     }
 
-    >div {
+    > div {
       background-color: var(--base-bg);
     }
 
@@ -36,7 +36,6 @@ body {
         padding-right: 0;
       }
 
-
       .van-dropdown-menu__bar {
         background-color: transparent;
         box-shadow: none;
@@ -44,11 +43,12 @@ body {
       }
 
       .van-dropdown-menu__title {
-        padding-left: 0
+        padding-left: 0;
       }
 
       .van-dropdown-menu__title:after {
-        border-color: transparent transparent rgba(0, 0, 0, 0.4) rgba(0, 0, 0, 0.4);
+        border-color: transparent transparent rgba(0, 0, 0, 0.4)
+          rgba(0, 0, 0, 0.4);
       }
 
       .van-dropdown-item__content {
@@ -56,12 +56,12 @@ body {
       }
 
       .van-dropdown-menu__title--active::after {
-        border-color: transparent transparent #FE2451 #FE2451;
+        border-color: transparent transparent #fe2451 #fe2451;
       }
     }
 
     .titleActive {
-      color: #FE2451;
+      color: #fe2451;
     }
   }
 
@@ -73,7 +73,6 @@ body {
     }
   }
 
-
   .keywordTitle {
     display: flex;
     align-items: center;
@@ -131,7 +130,7 @@ body {
         justify-content: center;
         background-color: #fff;
         font-size: 12px;
-        color: #93959F;
+        color: #93959f;
       }
     }
   }
@@ -141,7 +140,6 @@ body {
     font-size: 14px;
 
     :global {
-
       .van-list__loading,
       .van-list__finished-text,
       .van-list__error-text {
@@ -155,7 +153,6 @@ body {
   }
 }
 
-
 .sticky {
   :global {
     .van-sticky {
@@ -176,10 +173,9 @@ body {
       }
 
       .van-field__clear {
-        color: #C1BDC1 !important;
+        color: #c1bdc1 !important;
       }
     }
-
   }
 }
 
@@ -216,7 +212,11 @@ body {
     .van-tabs__line {
       width: 24px;
       height: 4px;
-      background: linear-gradient(90deg, #FF3C81 0%, rgba(255, 118, 166, 0.5) 100%) !important;
+      background: linear-gradient(
+        90deg,
+        #ff3c81 0%,
+        rgba(255, 118, 166, 0.5) 100%
+      ) !important;
       border-radius: 36px 36px 0px 0px;
       bottom: 22px;
     }
@@ -235,14 +235,13 @@ body {
 
 .alubmGroupSearch {
   :global {
-    .van-list>div {
+    .van-list > div {
       margin-top: 8px;
     }
   }
 }
 
 .hotMusic {
-
   padding-bottom: 20px;
 
   .swipeItem .swipeChild {
@@ -258,7 +257,6 @@ body {
     margin-left: 14px;
   }
 
-
   .swipeItem {
     border-radius: 10px;
     overflow: hidden;
@@ -285,7 +283,7 @@ body {
 
   .swipe {
     font-size: 14px;
-    color: #6A6C77;
+    color: #6a6c77;
     line-height: 20px;
     max-width: 80%;
     white-space: nowrap;
@@ -299,7 +297,7 @@ body {
       font-family: PingFangSC-Medium, PingFang SC;
       font-weight: 600;
 
-      color: #8A8C95;
+      color: #8a8c95;
       // margin-right: 20px;
       width: 21px;
     }
@@ -309,11 +307,11 @@ body {
       width: 16px;
       line-height: 16px;
       text-align: center;
-      background: #FE2451;
+      background: #fe2451;
       border-radius: 4px;
       font-size: 12px;
       font-weight: 500;
-      color: #FFFFFF;
+      color: #ffffff;
       vertical-align: middle;
       margin-left: 4px;
       transform: scale(0.9);
@@ -323,13 +321,12 @@ body {
       color: #131415;
 
       .num {
-        color: #FE2451;
+        color: #fe2451;
       }
     }
   }
 }
 
-
 // 搜索结果样式
 .searchResult {
   position: fixed;
@@ -340,9 +337,9 @@ body {
   overflow: hidden;
   bottom: 0;
   padding-top: var(--header-height);
-  background: url('../../images/bg-image-search.png') no-repeat top center #f8f8f8;
+  background: url('../../images/bg-image-search.png') no-repeat top center
+    #f8f8f8;
   background-size: 100% 214px;
-
 }
 
 .searchGroups {
@@ -367,7 +364,7 @@ body {
     }
 
     span span {
-      color: #FE2451;
+      color: #fe2451;
     }
   }
 
@@ -376,6 +373,11 @@ body {
     height: 16px;
     margin-right: 10px;
   }
+  :global {
+    .col-result-container {
+      margin-top: 40px;
+    }
+  }
 }
 
 .searchAlbum {
@@ -384,8 +386,8 @@ body {
   :global {
     .van-list {
       padding: 0 13px;
-      background: #FFFFFF;
+      background: #ffffff;
       border-radius: 16px;
     }
   }
-}
+}

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;
+  margin: 6px 12px 0px 12px;
   min-height: 40vh;
   :global {
     .van-list__loading {

src/tenant/music/train-list/index.tsx

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

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

@@ -290,7 +290,7 @@
   z-index: 12;
   background-color: #fff;
   border-radius: 16px;
-  min-height: 40vh; //calc(100vh - 210px - var(--header-height));
+  min-height: 50vh; //calc(100vh - 210px - var(--header-height));
 
   --van-cell-background-color: transparent;
   --van-cell-font-size: 16px;
@@ -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 {

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}
                         />

src/tenant/trade/index.tsx

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

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>
     )