Merge branch 'share-member' into jenkins

src/business-components/user-detail/index.tsx

@@ -144,7 +144,7 @@ export default defineComponent({
           {this.userInfo.relationType === 'GIFT' && (
             <Cell
               class={styles.buyTips}
-              value={'注：购买本课程即可购买相关曲目或专辑终生使用权限～'}
+              value={'注：购买本课程即可赠送相关曲目或专辑终生使用权限～'}
             ></Cell>
           )}
         </CellGroup>

src/teacher/video-class/class-content.module.less

@@ -50,4 +50,13 @@
       }
     }
   }
+
+  .createVideoTips {
+    font-size: 13px;
+    color: #ff6f00;
+    background: #ffe9d5;
+    border-radius: 10px;
+    padding: 9px 11px;
+    margin: 0 14px;
+  }
 }

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

@@ -39,7 +39,7 @@ export default defineComponent({
         videoContent: '',
         videoUrl: '',
         coverUrl: '',
-        relationType: 'GIFT',
+        relationType: 'RECOMMEND',
         relationList: [],
         posterUrl: '' // 视频封面图
       })
@@ -71,6 +71,9 @@ export default defineComponent({
         onSubmit={this.onSubmit}
         scrollToError
       >
+        <div class={styles.createVideoTips}>
+          您可为每个视频关联曲目或专辑作为本课程教学内容推荐
+        </div>
         {createState.lessonList.map((item: any, index: number) => (
           <>
             <div class={styles.titleSection}>
@@ -216,17 +219,27 @@ export default defineComponent({
             subjectId={createState.lessonGroup.lessonSubject}
             onSelect={(item: any) => {
               this.musicStatus = false
-              this.selectItem.relationList = [
-                {
-                  musicAlbumId: item.id,
-                  musicAlbumName:
-                    item.selectType === 'ALBUM'
-                      ? item.albumName
-                      : item.musicSheetName,
-                  relationMusicAlbum: item.selectType,
-                  useRelationType: 'GIFT'
-                }
-              ]
+              if (this.selectItem.relationList.length > 0) {
+                this.selectItem.relationList[0].musicAlbumId = item.id
+                this.selectItem.relationList[0].musicAlbumName =
+                  item.selectType === 'ALBUM'
+                    ? item.albumName
+                    : item.musicSheetName
+                this.selectItem.relationList[0].relationMusicAlbum =
+                  item.selectType
+              } else {
+                this.selectItem.relationList = [
+                  {
+                    musicAlbumId: item.id,
+                    musicAlbumName:
+                      item.selectType === 'ALBUM'
+                        ? item.albumName
+                        : item.musicSheetName,
+                    relationMusicAlbum: item.selectType,
+                    useRelationType: 'RECOMMEND'
+                  }
+                ]
+              }
             }}
           />
         </ColPopup>

src/teacher/video-class/create.tsx

@@ -66,7 +66,8 @@ export default defineComponent({
               relationMusicAlbum: info.relationType,
               musicAlbumName: info.name,
               musicAlbumId: info.musicAlbumId,
-              relationId: info.id
+              relationId: info.id,
+              useRelationType: relationType
             }
           })
           createState.lessonList.push({

src/teacher/video-class/createState.tsx

@@ -13,7 +13,7 @@ https://ks3-cn-beijing.ksyuncs.com/video-course/1657853076136linear.png
 */
 export const createState = reactive({
   groupId: 0,
-  active: 1,
+  active: 2,
   tabIndex: 1,
   loadingStatus: false,
   rate: 0, // 手续费