Merge branch 'iteration-20240222' into jenkins

src/views/coursewarePlay/component/video-play.tsx

@@ -168,6 +168,7 @@ export default defineComponent({
         videoItem.value.poster(props.item.coverImg); // 封面
         videoItem.value.src(props.item.content); // url 播放地址
         videoItem.value.playbackRate(data.defaultSpeed);
+        data.speedControl = false;
         // 初步加载时
         videoItem.value.on('loadedmetadata', () => {
           videoItem.value.playbackRate(data.defaultSpeed);

src/views/hook/useFee.ts

@@ -23,7 +23,8 @@ export const gotoMemberCenter = () => {
 
 /**验证是否是会员 */
 export const hasVip = () => {
-  return !dayjs().isBefore(dayjs(state.user.data.student.membershipEndTime))
+  return !dayjs().isBefore(dayjs(state.user.data.student.membershipEndTime)) ||
+    !state.user.data.isExistPendingMember
     ? false
     : true;
 };
@@ -45,7 +46,10 @@ export const handleCheckVip = () => {
     // }
 
     //学员没有会员
-    if (!dayjs().isBefore(dayjs(state.user.data.student.membershipEndTime))) {
+    if (
+      !dayjs().isBefore(dayjs(state.user.data.student.membershipEndTime)) ||
+      !state.user.data.isExistPendingMember
+    ) {
       showDialog({
         title: '温馨提示',
         message: '您暂未开通云教练，请开通后使用'