Merge branch 'iteration-20240516-member' into jenkins-test

src/components/select-courseware-member/index.tsx

@@ -36,8 +36,7 @@ export default defineComponent({
           <div class={styles.list} id="list">
             {/* 该功能为乐器AI专属权益，领取即可<span>查看所有课件</span>
             ，是否立即领取 */}
-            <span style={{ color: '#FF5A56' }}>"乐器AI学练工具"</span>
-            服务，解锁更多专属权益，享受全新学习体验！
+            立即开通<span style={{ color: '#FF5A56' }}>"乐器AI学练工具"</span>
           </div>
           <div class={styles.btnGroup}>
             <img

src/components/the-vip/index.tsx

@@ -18,8 +18,7 @@ export default defineComponent({
         />
         {/* <img class={styles.title} src={icon_title} /> */}
         <div class={styles.content}>
-          <span style={{ color: '#FF5A56' }}>"乐器AI学练工具"</span>
-          服务，解锁更多专属权益，享受全新学习体验！
+          立即开通<span style={{ color: '#FF5A56' }}>"乐器AI学练工具"</span>
         </div>
         <div class={styles.btns}>
           <img

src/views/courseware-play/index.tsx

@@ -329,9 +329,10 @@ export default defineComponent({
           videoEle: null,
           audioEle: null,
           domEle: null,
-          autoPlay: showMember.value
-            ? false
-            : data.currentCourse.autoPlay || false, //加载完成是否自动播放
+          autoPlay:
+            showMember.value || m.paymentType === 'FREE'
+              ? data.currentCourse.autoPlay || false
+              : false, //加载完成是否自动播放
           isprepare: false, // 视频是否加载完成
           isRender: false // 是否渲染了
         };
@@ -449,17 +450,11 @@ export default defineComponent({
     };
     onMounted(async () => {
       await sysParamConfig();
-      // needVipLock
-      // const schoolInfos = state.user.data?.schoolInfos;
-      // const schoolLock =
-      //   schoolInfos && schoolInfos.length > 0
-      //     ? schoolInfos[0].needVipLock
-      //     : true;
-      // if (!state?.user?.data.vipMember && schoolLock) {
-      //   showMember.value = true;
-      // } else {
-      //   showMember.value = false;
-      // }
+      if (state?.user?.data.vipMember) {
+        showMember.value = true;
+      } else {
+        showMember.value = false;
+      }
 
       postMessage({
         api: 'courseLoading',
@@ -1118,12 +1113,7 @@ export default defineComponent({
             initRequest: true // 初始化接口
           });
           setLogin(userCash.data);
-          const schoolInfos = userCash.data?.schoolInfos;
-          const schoolLock =
-            schoolInfos && schoolInfos.length > 0
-              ? schoolInfos[0].needVipLock
-              : true;
-          if (!state?.user?.data.vipMember && schoolLock) {
+          if (state?.user?.data.vipMember) {
             showMember.value = true;
           } else {
             showMember.value = false;
@@ -1152,8 +1142,8 @@ export default defineComponent({
                     : { opacity: 0, zIndex: -1 }
                 }
                 class={styles.itemDiv}>
-                {activeVideoItem.value.paymentType === 'VIP' &&
-                  showMember.value && (
+                {activeVideoItem.value.paymentType !== 'FREE' &&
+                  !showMember.value && (
                     <div class={styles.memberLock}>
                       <img src={memberLockBg} class={styles.memberLockBg} />
                       <img
@@ -1220,7 +1210,7 @@ export default defineComponent({
                       }
                       activeData.nowTime = Date.now();
                     }}>
-                    {m.paymentType === 'VIP' && showMember.value && (
+                    {m.paymentType !== 'FREE' && !showMember.value && (
                       <div class={styles.memberLock}>
                         <img src={memberLockBg} class={styles.memberLockBg} />
                         <img
@@ -1230,7 +1220,6 @@ export default defineComponent({
                         />
                       </div>
                     )}
-
                     {m.type === 'IMG' && <img src={m.content} />}
                     {m.type === 'PPT' && (
                       <iframe
@@ -1313,7 +1302,6 @@ export default defineComponent({
                         }}
                       />
                     )}
-
                     {m.type === 'VIDEO' && (
                       <Transition name="van-fade">
                         {/* {!m.isprepare && (
@@ -1332,7 +1320,6 @@ export default defineComponent({
                         )}
                       </Transition>
                     )}
-
                     {/* 新增：RHYTHM：节奏练习,THEORY：乐理知识,MUSIC_WIKI:名曲鉴赏 INSTRUMENT:乐器 MUSICIAN:音乐家 资源类型 */}
                     {m.type === 'RHYTHM' && (
                       <TempoItem