更新判断

src/views/login/components/qr-login/index.tsx

@@ -147,7 +147,7 @@ export default defineComponent({
             >
               <CircleCheck />
             </ElIcon>
-            <p class="text-lg text-[#666] mt-6">扫描成功</p>
+            <p class="text-lg text-[#666] mt-6">扫码成功</p>
             <p class="font-medium text-[#1A1A1A] text-[20px] pt-4">
               请在手机上根据提示确认登录
             </p>
@@ -161,7 +161,7 @@ export default defineComponent({
                 this.isScan = false
               }}
             >
-              返回扫描二维码
+              返回扫码二维码
             </ElLink>
           </>
         ) : (

src/views/user-info/components/item/index.tsx

@@ -13,7 +13,20 @@ export default defineComponent({
   render() {
     const item = this.item
     return (
-      <div class="border border-[#E0E0E0] box-border rounded-[10px] w-[218px] m-auto overflow-hidden relative transition-all">
+      <div
+        class="border border-[#E0E0E0] box-border rounded-[10px] w-[218px] m-auto overflow-hidden relative transition-all cursor-pointer"
+        onClick={() => {
+          console.log(item)
+          if (item.type === 'video') {
+            this.$router.push({
+              path: '/videoDetail',
+              query: {
+                id: item.id
+              }
+            })
+          }
+        }}
+      >
         {/* {item.subjectName && (
           <div class="absolute top-2 right-3 bg-black/40 text-white text-sm rounded-sm px-3 h-7 flex items-center justify-center z-10">
             {item.subjectName}

src/views/user-info/live-class/list.tsx

@@ -103,7 +103,12 @@ export default defineComponent({
               >
                 {this.list.map((item: any) => (
                   <div class={['w-1/3 pt-8', styles.items]}>
-                    <Item item={item} />
+                    <Item
+                      item={{
+                        ...item,
+                        type: 'live'
+                      }}
+                    />
                   </div>
                 ))}
               </ElSkeleton>

src/views/user-info/music-class/list.tsx

@@ -34,7 +34,7 @@ export default defineComponent({
     }
   },
   mounted() {
-    if (state.user.data?.musicianFlag) {
+    if (state.user.data?.entryFlag) {
       this.getList()
     }
   },

src/views/user-info/practice-setting/index.tsx

@@ -56,7 +56,7 @@ export default defineComponent({
   async mounted() {
     try {
       // 获取手续费和分钟数
-      let config = await request.get(
+      const config = await request.get(
         '/api-website/sysConfig/queryByParamNameList',
         {
           params: {
@@ -65,11 +65,11 @@ export default defineComponent({
           }
         }
       )
-      let configData = config.data || []
+      const configData = config.data || []
       configData.forEach((item: any) => {
         if (item.paramName === 'practice_times_setting') {
-          let mins = item.paramValue ? JSON.parse(item.paramValue) : []
-          let tempArr = [] as any
+          const mins = item.paramValue ? JSON.parse(item.paramValue) : []
+          const tempArr = [] as any
           mins.forEach((item: any) => {
             tempArr.push({
               ...item,
@@ -89,7 +89,7 @@ export default defineComponent({
         }
       })
 
-      let teacher = await request.post('/api-website/teacher/querySubject')
+      const teacher = await request.post('/api-website/teacher/querySubject')
       this.subjectList = teacher.data || []
 
       // 获取课程设置
@@ -116,8 +116,8 @@ export default defineComponent({
           sunday: sr.sunday ? JSON.parse(sr.sunday) : []
         }
 
-        let tempIds: any = []
-        let tempPrices: any = []
+        const tempIds: any = []
+        const tempPrices: any = []
         const subjectPrice = sr.subjectPrice || []
         subjectPrice.forEach((item: any) => {
           tempIds.push(item.subjectId)
@@ -148,7 +148,9 @@ export default defineComponent({
               : '未设置'
         }
       }
-    } catch {}
+    } catch {
+      //
+    }
   },
   methods: {
     onSelect(item: any) {
@@ -171,7 +173,9 @@ export default defineComponent({
         this.timeSetting.courseMinutes = Number(form.courseMinutes)
         this.timeSetting.freeMinutes = Number(form.freeMinutes)
         this.timerStatus = true
-      } catch {}
+      } catch {
+        //
+      }
     },
     onChoiceTimer(item: any, status: boolean) {
       // console.log(item, 'item')
@@ -183,7 +187,7 @@ export default defineComponent({
       const tempItem = item || []
       this.form.subjectId = tempItem
       this.form.subjectIdTemp = tempItem.join(',') || ''
-      let subjectPriceList = [...this.form.subjectPrice]
+      const subjectPriceList = [...this.form.subjectPrice]
       tempItem.forEach((item: any) => {
         const index = subjectPriceList.findIndex(
           (subject: any) => subject.subjectId === item
@@ -234,10 +238,12 @@ export default defineComponent({
             setTimeout(() => {
               postMessage({ api: 'back', content: {} })
             }, 500)
-          } catch {}
+          } catch {
+            //
+          }
         } else {
           this.$nextTick(() => {
-            let isError = document.getElementsByClassName('is-error')
+            const isError = document.getElementsByClassName('is-error')
             isError[0].scrollIntoView({
               block: 'center',
               behavior: 'smooth'
@@ -323,6 +329,17 @@ export default defineComponent({
                   class="w-full"
                   placeholder="请选择单课时时长"
                   v-model={this.form.courseMinutes}
+                  onChange={(item: any) => {
+                    // 如果分钟数不同,则清空
+                    this.timerObject = {}
+                    this.form.setting = '未设置'
+                    // 设置空余时间
+                    this.minutes.forEach((mins: any) => {
+                      if (mins.courseMinutes === item) {
+                        this.form.freeMinutes = mins.freeMinutes
+                      }
+                    })
+                  }}
                 >
                   {this.minutes.map((item: any) => (
                     <ElOption

src/views/user-info/video-class/list.tsx

@@ -136,6 +136,8 @@ export default defineComponent({
                   >
                     <Item
                       item={{
+                        type: 'video',
+                        id: item.id,
                         backgroundPic: item.lessonCoverUrl,
                         courseGroupName: item.lessonName,
                         studentCount: item.countStudent,