修改问题

src/components/col-share/index.module.less

@@ -102,7 +102,7 @@
     position: absolute;
     height: 14px;
     left: 0;
-    bottom: 3px;
+    bottom: -3px;
   }
 
   .img {
@@ -287,4 +287,4 @@
       }
     }
   }
-}
+}

src/student/home/components/TheSong/index.tsx

@@ -52,7 +52,7 @@ export default defineComponent({
                 </span>
               </div>
               <div class={styles.user}>
-                {n.addName ? (
+                {!n.composer ? (
                   <div class={styles.name}>上传者：{n.addName}</div>
                 ) : (
                   <div class={styles.name}>作曲：{n.composer}</div>

src/student/live-class/live-detail.module.less

@@ -1,60 +1,67 @@
-.live-detail {
-  .introduction {
-    color: #7a7a7a;
-    line-height: 23px;
-    padding-bottom: 8px;
-  }
-
-  :global {
-    .van-tabs__wrap {
-      margin-bottom: 15px;
-    }
-    .van-button--disabled {
-      opacity: 0.9;
-    }
-  }
-
-  .tips {
-    background-color: white;
-    border-radius: 10px;
-    margin: 14px 12px;
-    padding: var(--van-cell-vertical-padding) var(--van-cell-horizontal-padding);
-    h3 {
-      display: flex;
-      font-size: 14px;
-      font-weight: 500;
-      color: #333333;
-      line-height: 1;
-    }
-    p {
-      text-align: justify;
-      padding-top: 9px;
-      font-size: 12px;
-      color: #7a7a7a;
-      line-height: 23px;
-    }
-    :global {
-      .van-icon {
-        margin-right: 6px;
-      }
-    }
-  }
-
-  .btnMore {
-    display: flex;
-    justify-content: space-around;
-    :global {
-      .van-button {
-        width: 60%;
-      }
-    }
-  }
-  .shareCourse {
-    margin: 0;
-    padding: 8px;
-    background: #fff;
-    :global(.itemTitle) {
-      max-width: 110px !important;
-    }
-  }
-}
+.live-detail {
+  .introduction {
+    color: #7a7a7a;
+    line-height: 23px;
+    padding-bottom: 8px;
+  }
+
+  :global {
+    .van-tabs__wrap {
+      margin-bottom: 15px;
+    }
+
+    .van-button--disabled {
+      opacity: 0.5;
+    }
+  }
+
+  .tips {
+    background-color: white;
+    border-radius: 10px;
+    margin: 14px 12px;
+    padding: var(--van-cell-vertical-padding) var(--van-cell-horizontal-padding);
+
+    h3 {
+      display: flex;
+      font-size: 14px;
+      font-weight: 500;
+      color: #333333;
+      line-height: 1;
+    }
+
+    p {
+      text-align: justify;
+      padding-top: 9px;
+      font-size: 12px;
+      color: #7a7a7a;
+      line-height: 23px;
+    }
+
+    :global {
+      .van-icon {
+        margin-right: 6px;
+      }
+    }
+  }
+
+  .btnMore {
+    display: flex;
+    justify-content: space-around;
+
+    :global {
+      .van-button {
+        width: 60%;
+      }
+    }
+  }
+
+  .shareCourse {
+    margin: 0;
+    padding: 8px;
+    background: #fff;
+
+    :global(.itemTitle) {
+      max-width: 110px !important;
+    }
+  }
+}

src/student/live-class/live-detail.tsx

@@ -33,6 +33,7 @@ export default defineComponent({
       recomUserId: query.recomUserId, // 推荐人id
       groupId: query.groupId,
       courseId: query.classId,
+      platform: query.p, // 属于哪个平台，//机构老师 tenant，平台老师 无
       live: {} as any,
       shareStatus: false,
       shareUrl: ''
@@ -68,6 +69,11 @@ export default defineComponent({
         isTeacher: live.teacherFlag ? true : false
       }
     },
+    platformStatus() {
+      const userInfo = state.user.data as any
+      // 是机构学生 并且 是机构老师分享
+      return userInfo.tenantId > 0 && this.platform == 'tenant'
+    },
     courseInfo() {
       const tempArr = [] as IProps[]
       const coursePlanList = this.live.planList || []
@@ -330,7 +336,13 @@ export default defineComponent({
           // </Sticky>
           <ColSticky position="bottom" background="white">
             <div class={['btnGroup', styles.btnMore]}>
-              <Button block round type="primary" onClick={this.onBuy}>
+              <Button
+                block
+                round
+                type="primary"
+                onClick={this.onBuy}
+                disabled={this.platformStatus}
+              >
                 {this.live.coursePrice <= 0 ? '免费领取' : `立即购买`}
               </Button>
             </div>

src/student/video-class/video-detail.module.less

@@ -1,46 +1,52 @@
-.video-detail {
-  height: 100vh;
-  overflow: scroll; //主要是这个
-  box-sizing: border-box;
-  .introduction {
-    color: #7a7a7a;
-    line-height: 23px;
-    padding-bottom: 8px;
-  }
-
-  .btnGroup {
-    padding: 0 14px;
-    padding-bottom: 15px;
-  }
-  .btnMore {
-    display: flex;
-    justify-content: space-around;
-    :global {
-      .van-button {
-        width: 55%;
-      }
-    }
-  }
-
-  .videoItem {
-    .van-cell__title {
-      font-size: 22px;
-      p {
-        max-width: 100px;
-      }
-    }
-  }
-  .shareCourse {
-    margin: 0;
-    padding: 8px;
-    background: #fff;
-    :global(.itemTitle) {
-      max-width: 110px !important;
-    }
-  }
-
-  .coverClass {
-    width: 164px !important;
-    height: 92px !important;
-  }
-}
+.video-detail {
+  height: 100vh;
+  overflow: scroll; //主要是这个
+  box-sizing: border-box;
+
+  .introduction {
+    color: #7a7a7a;
+    line-height: 23px;
+    padding-bottom: 8px;
+  }
+
+  .btnGroup {
+    padding: 0 14px;
+    padding-bottom: 15px;
+  }
+
+  .btnMore {
+    display: flex;
+    justify-content: space-around;
+
+    :global {
+      .van-button {
+        width: 55%;
+      }
+    }
+  }
+
+  .videoItem {
+    .van-cell__title {
+      font-size: 22px;
+
+      p {
+        max-width: 100px;
+      }
+    }
+  }
+
+  .shareCourse {
+    margin: 0;
+    padding: 8px;
+    background: #fff;
+
+    :global(.itemTitle) {
+      max-width: 110px !important;
+    }
+  }
+
+  .coverClass {
+    width: 164px !important;
+    height: 92px !important;
+  }
+}

src/student/video-class/video-detail.tsx

@@ -25,10 +25,19 @@ export default defineComponent({
       params: {
         groupId: query.groupId
       },
+      platform: query.p, // 属于哪个平台，//机构老师 tenant，平台老师 无
       shareStatus: false,
       shareUrl: ''
     }
   },
+  computed: {
+    platformStatus() {
+      const userInfo = state.user.data as any
+
+      // 是机构学生 并且 是机构老师分享
+      return userInfo.tenantId > 0 && this.platform == 'tenant'
+    }
+  },
   async mounted() {
     await this._init()
     if (/(localhost|192)/g.test(location.origin)) {
@@ -262,7 +271,13 @@ export default defineComponent({
           // </Sticky>
           <ColSticky position="bottom" background="white">
             <div class={['btnGroup', styles.btnMore]}>
-              <Button block round type="primary" onClick={this.onBuy}>
+              <Button
+                block
+                round
+                type="primary"
+                onClick={this.onBuy}
+                disabled={this.platformStatus}
+              >
                 {this.userInfo.lessonPrice <= 0 ? '免费领取' : `立即购买`}
               </Button>
             </div>

src/teacher/live-class/live-detail.tsx

@@ -132,6 +132,9 @@ export default defineComponent({
       }
 
       this.shareUrl = `${location.origin}/teacher/#/shareLive?recomUserId=${state.user.data?.userId}&groupId=${this.groupId}`
+      if (state.user.data?.tenantId > 0) {
+        this.shareUrl = this.shareUrl + '&p=tenant'
+      }
       // console.log(this.live)
     } catch {
       //

src/teacher/share-page/share-live/index.tsx

@@ -32,6 +32,7 @@ export default defineComponent({
     return {
       recomUserId: query.recomUserId, // 分享人编号
       groupId: query.groupId,
+      platform: query.p, // 来源
       live: {} as any,
       wxStatus: false
     }
@@ -147,7 +148,7 @@ export default defineComponent({
       const params = this.$route.query
       str += `?recomUserId=${
         params.userType && params.userType == 'STUDENT' ? '' : this.recomUserId
-      }&groupId=${params.groupId}`
+      }&groupId=${params.groupId}&p=${params.p}`
       shareCall(str, {})
     },
     onShare() {

src/teacher/share-page/share-video/index.tsx

@@ -124,7 +124,7 @@ export default defineComponent({
       const params = this.$route.query
       str += `?recomUserId=${
         params.userType && params.userType == 'STUDENT' ? '' : this.recomUserId
-      }&groupId=${params.groupId}`
+      }&groupId=${params.groupId}&p=${params.p}`
       console.log(str)
       shareCall(str, {})
     },

src/teacher/video-class/video-detail.tsx

@@ -73,8 +73,10 @@ export default defineComponent({
       this.detailList = result.detailList || []
 
       // shareVideo?recomUserId=56&groupId=124
-      this.shareUrl = `${location.origin}/teacher#/shareVideo?recomUserId=${state.user.data?.userId}&groupId=${this.params.videoLessonGroupId}`
-
+      this.shareUrl = `${location.origin}/teacher/#/shareVideo?recomUserId=${state.user.data?.userId}&groupId=${this.params.videoLessonGroupId}`
+      if (state.user.data?.tenantId > 0) {
+        this.shareUrl = this.shareUrl + '&p=tenant'
+      }
       !this.myself && this.getList()
     } catch (e) {
       console.log(e)

src/tenant/music/component/song/index.tsx

@@ -117,7 +117,7 @@ export default defineComponent({
 
                   <span class={[styles.name]}>
                     {/* {n.addName ? `上传者：${n.addName}` : `作曲：${n.composer}`} */}
-                    {n.addName ? `${n.addName}` : `${n.composer}`}
+                    {n.composer ? `${n.composer}` : `${n.addName}`}
                   </span>
                 </div>
               </div>

src/tenant/music/music-detail/new-index.tsx

@@ -597,7 +597,7 @@ export default defineComponent({
                 {musicDetail.value?.musicSheetName}
               </div>
               <div class={[styles.des, 'van-multi-ellipsis--l2']}>
-                {musicDetail.value?.addName
+                {!musicDetail.value?.composer
                   ? `上传者：${musicDetail.value?.addName || ''}`
                   : `作曲：${musicDetail.value?.composer || ''}`}
               </div>

src/tenant/music/personal/index.tsx

@@ -18,7 +18,9 @@ export default defineComponent({
   name: 'MusicPersonal',
   setup() {
     localStorage.setItem('behaviorId', getRandomKey())
-    const activeTab = ref('train-course')
+    const tabValue = sessionStorage.getItem('music-personal-tab-value')
+    sessionStorage.removeItem('music-personal-tab-value')
+    const activeTab = ref(tabValue || 'train-course')
     const personal = ref()
     const collection = ref()
     const practice = ref()
@@ -53,7 +55,10 @@ export default defineComponent({
             lineWidth={20}
             shrink
             v-model:active={activeTab.value}
-            onChange={val => (activeTab.value = val)}
+            onChange={val => {
+              activeTab.value = val
+              sessionStorage.setItem('music-personal-tab-value', val)
+            }}
           >
             <Tab title="训练教程" name="train-course"></Tab>
             <Tab title="我的单曲" name="personal"></Tab>

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

@@ -235,7 +235,7 @@
   :global {
     .van-tag--large {
       width: auto;
-      padding: 0 12px;
+      padding: 0 2px;
       margin-bottom: 8px;
       margin-right: 8px;
       font-size: 14px;

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

@@ -19,6 +19,8 @@ import { postMessage } from '@/helpers/native-message'
 export default defineComponent({
   name: 'train-tool',
   setup() {
+    const subjectType = sessionStorage.getItem('tool-subject-type')
+    sessionStorage.removeItem('tool-subject-type')
     const route = useRoute()
     const router = useRouter()
     const background = ref<string>('rgba(55, 205, 177, 0)')
@@ -27,7 +29,7 @@ export default defineComponent({
       details: {} as any,
       buy: route.query.buy as any,
       albumId: route.query.albumId || null,
-      activeTab: 'SUBJECT',
+      activeTab: route.query.subjectType || 'SUBJECT',
       loading: false,
       finished: false,
       isError: false,
@@ -116,6 +118,25 @@ export default defineComponent({
         } else if (state.musicCounts) {
           state.activeTab = 'MUSIC'
         }
+        // 带的参数
+        if (route.query.subjectType == 'SUBJECT' && state.subjectCounts) {
+          state.activeTab = 'SUBJECT'
+        } else if (
+          route.query.subjectType == 'ENSEMBLE' &&
+          state.ensembleCounts
+        ) {
+          state.activeTab = 'ENSEMBLE'
+        } else if (route.query.subjectType == 'MUSIC' && state.musicCounts) {
+          state.activeTab = 'MUSIC'
+        }
+        // subjectType 缓存
+        if (subjectType == 'SUBJECT' && state.subjectCounts) {
+          state.activeTab = 'SUBJECT'
+        } else if (subjectType == 'ENSEMBLE' && state.ensembleCounts) {
+          state.activeTab = 'ENSEMBLE'
+        } else if (subjectType == 'MUSIC' && state.musicCounts) {
+          state.activeTab = 'MUSIC'
+        }
       } catch {
         //
       }
@@ -378,6 +399,10 @@ export default defineComponent({
                       showNumber
                       list={state.list}
                       onDetail={(item: any) => {
+                        sessionStorage.setItem(
+                          'tool-subject-type',
+                          state.activeTab
+                        )
                         router.push({
                           path: '/music-detail',
                           query: {

src/views/music/component/song/index.tsx

@@ -99,7 +99,9 @@ export default defineComponent({
                     />
                   )}
                   <span class={[styles.name]}>
-                    {n.addName ? `上传者：${n.addName}` : `作曲：${n.composer}`}
+                    {!n.composer
+                      ? `上传者：${n.addName}`
+                      : `作曲：${n.composer}`}
                   </span>
                   <div class={styles.tags}>
                     {n?.subjectNames.split(',').map((name: any) => (

src/views/order-detail/order-album/index.module.less

@@ -24,6 +24,7 @@
     height: 98px;
     margin-right: 15px;
     position: relative;
+    flex-shrink: 0;
 
     >img,
     >div {
@@ -36,6 +37,8 @@
 
   .content {
     flex: 1;
+    word-break: break-all;
+    word-wrap: break-word;
 
     >h4 {
       font-size: 14px;

src/views/order-detail/order-tennat-album/index.module.less

@@ -23,6 +23,7 @@
     height: 94px;
     margin-right: 18px;
     position: relative;
+    flex-shrink: 0;
 
     >img,
     >div {
@@ -34,6 +35,8 @@
 
   .content {
     flex: 1;
+    word-break: break-all;
+    word-wrap: break-word;
 
     >h4 {
       font-size: 14px;