浏览代码

更新关注

lex 2 年之前
父节点
当前提交
5c4ea1d3db
共有 2 个文件被更改,包括 20 次插入5 次删除
  1. 11 5
      src/views/student-info/my-follow/item.tsx
  2. 9 0
      yarn.lock

+ 11 - 5
src/views/student-info/my-follow/item.tsx

@@ -2,6 +2,7 @@ import { defineComponent } from 'vue'
 import styles from './index.module.less'
 import iconTeacher from '@/common/images/icon_teacher.png'
 import {
+  dayjs,
   ElButton,
   ElImage,
   ElMessage,
@@ -74,8 +75,13 @@ export default defineComponent({
           }
           break
         case 'VIP':
-          if (teacher) {
-            status = teacher.isVip > 0
+          if (teacher.membershipStartTime && teacher.membershipEndTime) {
+            const startTime = dayjs(teacher.membershipStartTime).valueOf()
+            const endTime = dayjs(teacher.membershipEndTime).valueOf()
+            const nowTime = dayjs().valueOf()
+            status = nowTime >= startTime && nowTime <= endTime
+          } else {
+            status = false
           }
           break
         default:
@@ -102,21 +108,21 @@ export default defineComponent({
               {item.userName}
             </p>
             <div class="flex items-center">
-              {/* <ElImage
+              <ElImage
                 src={
                   this.checkBadge('VIP')
                     ? getAssetsHomeFile('icon_vip.png')
                     : getAssetsHomeFile('icon_vip_default.png')
                 }
                 class="h-7 -ml-1"
-              /> */}
+              />
               <img
                 src={
                   this.checkBadge('STYLE')
                     ? getAssetsHomeFile('icon_cert.png')
                     : getAssetsHomeFile('icon_cert_default.png')
                 }
-                class="h-[26px] -ml-1"
+                class="h-[26px] px-1"
               />
               <img
                 src={

+ 9 - 0
yarn.lock

@@ -2893,6 +2893,10 @@
   "resolved" "https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz"
   "version" "0.9.3"
 
+"esbuild-darwin-64@0.13.15":
+  "integrity" "sha512-ihOQRGs2yyp7t5bArCwnvn2Atr6X4axqPpEdCFPVp7iUj4cVSdisgvEKdNR7yH3JDjW6aQDw40iQFoTqejqxvQ=="
+  "version" "0.13.15"
+
 "esbuild@^0.13.12":
   "integrity" "sha512-raCxt02HBKv8RJxE8vkTSCXGIyKHdEdGfUmiYb8wnabnaEmHzyW7DCHb5tEN0xU8ryqg5xw54mcwnYkC4x3AIw=="
   "version" "0.13.15"
@@ -3271,6 +3275,11 @@
   "resolved" "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz"
   "version" "1.0.0"
 
+"fsevents@~2.3.2":
+  "integrity" "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="
+  "resolved" "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz"
+  "version" "2.3.2"
+
 "function-bind@^1.1.1":
   "integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
   "resolved" "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz"