Browse Source

Merge branch 'iteration-tem-http' into jenkins

lex 1 year ago
parent
commit
b7c3d1e513
1 changed files with 13 additions and 3 deletions
  1. 13 3
      src/views/courseList/index.tsx

+ 13 - 3
src/views/courseList/index.tsx

@@ -38,6 +38,7 @@ import OHeader from '@/components/o-header';
 import { useEventListener, usePageVisibility } from '@vant/use';
 import OLoading from '@/components/o-loading';
 import OSticky from '@/components/o-sticky';
+import dayjs from 'dayjs';
 export default defineComponent({
   name: 'courseList',
   setup() {
@@ -135,6 +136,15 @@ export default defineComponent({
       // window.location.href = location.origin + '/#/member';
     };
 
+    const isHasVip = computed(() => {
+      console.log('isHasVip');
+      return !dayjs().isBefore(
+        dayjs(state.user.data.student.membershipEndTime)
+      ) && !state.user.data.isExistPendingMember
+        ? false
+        : true;
+    });
+
     onMounted(() => {
       getDetail();
       getList();
@@ -391,7 +401,7 @@ export default defineComponent({
                                         styles.baseBtn,
                                         styles.look,
                                         state.platformType === 'STUDENT' &&
-                                        !hasVip()
+                                        !isHasVip.value
                                           ? styles.disabled
                                           : ''
                                       ]}>
@@ -403,7 +413,7 @@ export default defineComponent({
                                         styles.baseBtn,
                                         styles.down,
                                         state.platformType === 'STUDENT' &&
-                                        !hasVip()
+                                        !isHasVip.value
                                           ? styles.disabled
                                           : '',
                                         item.downloadStatus == 1
@@ -433,7 +443,7 @@ export default defineComponent({
         {data.loading && <OLoading />}
         {!data.loading && !data.list.length && <OEmpty tips="暂无内容" />}
 
-        {state.platformType === 'STUDENT' && !hasVip() && (
+        {state.platformType === 'STUDENT' && !isHasVip.value && (
           <OSticky position="bottom">
             <div class={styles.btnGroup}>
               <Button round block type="primary" onClick={gotoMemberCenter}>