Merge branch 'feature-tianyong'

src/student/down-load/index.module.less

@@ -11,7 +11,7 @@
   width: 104px;
   height: 127px;
   margin: 0 auto;
-
+  box-sizing: content-box;
   img {
     width: inherit;
     height: inherit;

src/student/member-center/member-record.tsx

@@ -206,7 +206,7 @@ export default defineComponent({
                       api: 'openAccompanyWebView',
                       content: {
                         url:
-                          location.origin + musicScorePath + '/#/' +
+                          location.origin + musicScorePath + '#/' +
                           'evaluat-report?id=' +
                           item.id +
                           '&behaviorId=' +

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

@@ -64,7 +64,7 @@ export default defineComponent({
         api: 'openAccompanyWebView',
         content: {
           url:
-            location.origin + musicScorePath + '/#/' +
+            location.origin + musicScorePath + '#/' +
             'evaluat-report?id=' +
             props.item.id +
             '&behaviorId=' +

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

@@ -32,13 +32,15 @@ export default defineComponent({
         status: 1,
         // STUDENT:学生 TEACHER：老师 ANALYSIS:智能陪练
         catalogType:
+          query.platformType === 'ANALYSIS' ? "ANALYSIS" : 
           query.platformType ||
           (state.projectType === 'tenant' && state.platformType === 'STUDENT')
             ? 'TENANT_STUDENT'
             : state.platformType,
         page: 1,
         rows: 20
-      }
+      },
+      hideTitle: query?.hideTitle == '1' ? true : false, // 嵌入云教练需要隐藏标题栏
     }
   },
   mounted() {
@@ -95,13 +97,17 @@ export default defineComponent({
   render() {
     return (
       <div>
-        <Sticky offsetTop={0} position="top" class={'mb12'}>
-          <ColHeader isFixed={false} title={this.pageTitle} border={false} />
-          <ColSearch
-            type={state.projectType === 'tenant' ? 'tenant' : 'person'}
-            onSearch={this.onSearch}
-          />
-        </Sticky>
+        {
+          <Sticky offsetTop={0} position="top" class={'mb12'}>
+            {
+              !this.hideTitle && <ColHeader isFixed={false} title={this.pageTitle} border={false} />
+            }
+            <ColSearch
+              type={state.projectType === 'tenant' ? 'tenant' : 'person'}
+              onSearch={this.onSearch}
+            />
+          </Sticky>          
+        }
         {this.dataShow ? (
           <List
             v-model:loading={this.loading}

src/views/creation/index-share.tsx

@@ -159,7 +159,7 @@ export default defineComponent({
         // if (state.list.length > 0 && result.current === 1) {
         //   return
         // }
-        state.list = state.list.concat(result.rows || [])
+        this.state.list = result.rows || []
         state.listState.finished = result.current >= result.pages
         state.params.page = result.current + 1
         state.listState.dataShow = state.list.length > 0
@@ -308,7 +308,11 @@ export default defineComponent({
         shareCall(str)
         setTimeout(() => {
           if(Date.now() - t < 3500){
-            window.location.href = location.origin + '/#/transfer'
+            if (window.location.pathname.includes('teacher')) {
+              window.location.href = location.origin + '/student' + '/#/transfer'
+            } else {
+              window.location.href = location.origin + '/student' + '/#/download'
+            }
           }
         }, 3000)
       }
@@ -423,7 +427,7 @@ export default defineComponent({
           window.location.href = location.origin + '/student' + '/#/transfer'
         } else {
           router.push({
-            path:"/transfer"
+            path:"/download"
           })
         }
       }
@@ -621,12 +625,12 @@ export default defineComponent({
               </div>
             </div>
             <Sticky zIndex={1000} offsetTop={state.heightV - 1 + "px"}>
-              <div class={[styles.playSection, plyrState.mediaTimeShow && styles.mediaTimeShow,!plyrState.loaded && styles.notLoaded,isLandscapeScreen.value&&styles.isLandscapeScreen]} id="playMediaSection" onClick={handlerClickPlay}>
+              <div class={[styles.playSection, plyrState.mediaTimeShow && styles.mediaTimeShow,!plyrState.loaded && styles.notLoaded,isLandscapeScreen.value&&styles.isLandscapeScreen, state.playType === 'Audio' && styles.isLandscapeScreen2]} id="playMediaSection" onClick={handlerClickPlay}>
                 {
                   isLandscapeScreen.value &&
                     <div class={styles.backBox}>
                       <img class={styles.backImg} src={backImg} onClick={handlerBack}/>
-                      <div class={styles.musicDetail}>
+                      <div class={[styles.musicDetail, state.playType === 'Audio' && styles.adMusicDetail]}>
                         <div class={styles.musicSheetName}>
                             <NoticeBar
                                 text={state.musicDetail?.musicSheetName}

src/views/creation/index.module.less

@@ -298,7 +298,6 @@
     position: absolute;
     bottom: 0;
     padding-bottom: 12px;
-    background: linear-gradient( 180deg, rgba(0,0,0,0) 0%, rgba(0,0,0,0.7) 100%);
     .staff{
       width: 100%;
       height: 100%;
@@ -499,6 +498,11 @@
       }
     }
   }
+  :global {
+    .van-empty__description {
+      color: #fff;
+    }
+  }
 }
 
 .upward{
@@ -985,7 +989,7 @@
               color: #FFFFFF;
               line-height: 20px;
           }
-      }
+        }
       }
       .username{
         margin-top: 2px;
@@ -995,6 +999,16 @@
         line-height: 18px
       }
     }
+    .adMusicDetail {
+      :global{
+        .van-notice-bar{
+            color: #131415 !important;
+        }
+      }
+      .username {
+        color: #333333;
+      }
+    }
   }
   .staffBox{
     height: calc(var(--staffBoxHeight) + 44px);
@@ -1008,4 +1022,26 @@
       }
     }
   }
+  &.isLandscapeScreen2 {
+    :global {
+      .plyr{
+        .plyr__controls{
+          .plyr__controls__item.plyr__control{
+            .icon--pressed{
+                width: 100%;
+                height: 100%;
+                background: url("./images/pause2.png") no-repeat;
+                background-size: 100% 100%;
+            }
+            .icon--not-pressed{
+              width: 100%;
+              height: 100%;
+              background: url("./images/play2.png") no-repeat;
+              background-size: 100% 100%;
+            }
+          }
+        }
+      }
+    }  
+  }
 }

src/views/creation/index.tsx

@@ -580,12 +580,12 @@ export default defineComponent({
           演奏：{state.musicDetail?.username}
         </div>        
         <Sticky zIndex={1000} offsetTop={state.heightV - 1 + "px"}>
-          <div class={[styles.playSection, plyrState.mediaTimeShow && styles.mediaTimeShow, isLandscapeScreen.value&&styles.isLandscapeScreen]} id="playMediaSection" onClick={handlerClickPlay}>
+          <div class={[styles.playSection, plyrState.mediaTimeShow && styles.mediaTimeShow, isLandscapeScreen.value&&styles.isLandscapeScreen, state.playType === 'Audio' && styles.isLandscapeScreen2]} id="playMediaSection" onClick={handlerClickPlay}>
             {
               isLandscapeScreen.value &&
                 <div class={styles.backBox}>
                   <img class={[styles.backImg, state.playType === 'Video' && styles.back1Img]} src={state.playType === 'Video' ? back1Img : backImg} onClick={handlerBack}/>
-                  <div class={styles.musicDetail}>
+                  <div class={[styles.musicDetail, state.playType === 'Audio' && styles.adMusicDetail]}>
                     <div class={styles.musicSheetName}>
                         <NoticeBar
                             text={state.musicDetail?.musicSheetName}
@@ -737,7 +737,7 @@ export default defineComponent({
               ))}
             </List>
           ) : (
-            <MEmpty class={styles.mEmpty} tips="暂无点赞记录~" btnStatus={false} />
+            <MEmpty class={styles.mEmpty} tips="暂无内容~" btnStatus={false} />
           )}
         </div>
         {