Merge branch 'feature-tianyong'

src/views/creation/index.module.less

@@ -579,6 +579,7 @@
 
 .popupContainer {
   width: 80%;
+  max-width: 400px;
   .popupTit {
     margin-top: 20px;
     text-align: center;
@@ -1007,19 +1008,19 @@
   }
   .backBox{
     position: absolute;
-    left: 15px;
-    top: 15px;
+    left: 20px;
+    top: 20px;
     display: flex;
-    z-index: 10;
+    z-index: 999;
     .backImg{
-      width: 26px;
-      height: 26px;
+      width: 21px;
+      height: 21px;
     }
     .musicDetail{
       margin-left: 10px;
       .musicSheetName{
         width: 300px;
-        margin-top: 4px;
+        //margin-top: 4px;
         :global{
           .van-notice-bar{
               padding: 0;

src/views/creation/share-model/index.module.less

@@ -51,7 +51,7 @@
     width: 56px;
     height: 56px;
     object-fit: cover;
-    border-radius: 15px;
+    border-radius: 12px;
   }
 
   .uploadImg {

src/views/music/music-detail/index.tsx

@@ -341,7 +341,7 @@ export default defineComponent({
        */
       let apiUrl = '', providerType = ''
       if (browser().isTeacher) {
-        providerType = route.query.tenantAlbumId ? 'TENANT' : 'PLATFORM'
+        providerType = route.query.tenantAlbumId || route.query.providerType == 'TENANT' ? 'TENANT' : 'PLATFORM'
       }
       apiUrl = `/music/sheet/favorite/${musicDetail.value?.id}`
       try {
@@ -1171,8 +1171,12 @@ export default defineComponent({
                           'part-index': item?.xmlValue || 0,
                           musicRenderType,
                         }
+                        // 有专辑id
                         if (route.query.tenantAlbumId) {
                           extraParam.albumId = route.query.tenantAlbumId
+                        } else if (browser().isTeacher && route.query.providerType == 'TENANT') {
+                           // 机构老师端
+                          extraParam.albumId = 1
                         }
                         musicBuy(musicDetail.value, () => {}, extraParam)
                       }, 500)