更新

dist/index.html

@@ -34,7 +34,7 @@
   <meta name="msapplication-tap-highlight" content="no">
   <title>酷乐秀</title>
   <script src="./flexible.js" charset="UTF-8"></script>
-  <script type="module" crossorigin src="./assets/index.8fccd1df.js"></script>
+  <script type="module" crossorigin src="./assets/index.1d0766e3.js"></script>
   <link rel="modulepreload" href="./assets/vendor.50def595.js">
   <link rel="modulepreload" href="./assets/index.722fca5f.js">
   <link rel="stylesheet" href="./assets/vendor.177057eb.css">
@@ -49,7 +49,7 @@
   <!-- <script type="module" src="/src/teacher/main.ts"></script> -->
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b2710982.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.38ec0d55.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.c37dee24.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

dist/teacher.html

@@ -34,7 +34,7 @@
   <meta name="msapplication-tap-highlight" content="no">
   <title>酷乐秀</title>
   <script src="./flexible.js" charset="UTF-8"></script>
-  <script type="module" crossorigin src="./assets/teacher.d00a8d1a.js"></script>
+  <script type="module" crossorigin src="./assets/teacher.00c3ed3f.js"></script>
   <link rel="modulepreload" href="./assets/vendor.50def595.js">
   <link rel="modulepreload" href="./assets/index.722fca5f.js">
   <link rel="stylesheet" href="./assets/index.b8b002f0.css">
@@ -48,7 +48,7 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.b2710982.js"></script>
-  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.56b46efb.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule id="vite-legacy-entry" data-src="./assets/teacher-legacy.535fb809.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>
 
 </html>

src/student/practice-class/index.tsx

@@ -27,6 +27,7 @@ export default defineComponent({
         expTime: 'ALL',
         subjectPrice: 'ALL'
       },
+      dataLoading: false,
       params: {
         search: '',
         sort: '',
@@ -70,6 +71,10 @@ export default defineComponent({
     },
     async getList() {
       try {
+        if (this.dataLoading) {
+          return
+        }
+        this.dataLoading = true
         const res = await request.post(
           '/api-student/courseSchedule/teacherList',
           {
@@ -78,6 +83,7 @@ export default defineComponent({
             }
           }
         )
+        this.dataLoading = false
         const result = res.data || {}
         // 处理重复请求数据
         if (this.list.length > 0 && result.pageNo === 1) {

src/teacher/live-class/create-components/arrange.tsx

@@ -85,22 +85,24 @@ export default defineComponent({
         !isExist && list.push({ ...item })
       })
       // 去掉不在
+      let tempList: any[] = []
       list.forEach((item: any) => {
         const isExist = result.some(
           (course: any) => course.startTime === item.startTime
         )
-        const index = result.findIndex(
-          (course: any) => course.startTime === item.startTime
-        )
-        !isExist && list.splice(index, 1)
+        // const index = result.findIndex(
+        //   (course: any) => course.startTime === item.startTime
+        // )
+        // !isExist && list.splice(index, 1)
+        isExist && tempList.push(item)
       })
       // 对数组进行排序
-      list.sort((first: any, second: any) => {
+      tempList.sort((first: any, second: any) => {
         if (first.startTime > second.startTime) return 1
         if (first.startTime < second.startTime) return -1
         return 0
       })
-      createState.selectCourseList = [...list]
+      createState.selectCourseList = [...tempList]
     },
     onCloseTag(item: any) {
       Dialog.confirm({

src/teacher/live-class/create-components/detail.tsx

@@ -3,7 +3,7 @@ import SectionDetail from '@/business-components/section-detail'
 import UserDetail from '@/business-components/user-detail'
 import request from '@/helpers/request'
 import { state } from '@/state'
-import { Button, Sticky, Toast } from 'vant'
+import { Button, Dialog, Sticky, Toast } from 'vant'
 import { defineComponent } from 'vue'
 import { createState } from './createState'
 import styles from './detail.module.less'
@@ -71,7 +71,23 @@ export default defineComponent({
         setTimeout(() => {
           postMessage({ api: 'back' })
         }, 1000)
-      } catch {}
+      } catch (e: any) {
+        // 报错时需要重置日历表的数据
+        const message = e.message
+        Dialog.alert({
+          title: '提示',
+          confirmButtonColor: 'var(--van-primary)',
+          message
+        }).then(() => {
+          createState.active = 3
+          createState.selectCourseList = []
+          createState.live.salesStartDate = ''
+          createState.live.salesEndDate = ''
+          createState.live.mixStudentNum = null
+          createState.live.backgroundPic = ''
+          createState.live.backgroundPicTemplate = ''
+        })
+      }
     }
   },
   render() {

src/teacher/live-class/live-detail.tsx

@@ -6,7 +6,7 @@ import ColResult from '@/components/col-result'
 import request from '@/helpers/request'
 import { state } from '@/state'
 import dayjs from 'dayjs'
-import { Button, Sticky, Tab, Tabs } from 'vant'
+import { Button, Sticky, Tab, Tabs, Toast } from 'vant'
 import { defineComponent } from 'vue'
 import styles from './live-detail.module.less'
 interface IProps {
@@ -64,6 +64,17 @@ export default defineComponent({
     studentList() {
       const live = this.live as any
       return live.studentList || []
+    },
+    courseOffStatus() {
+      const live = this.live as any
+      let status = false
+      if (
+        (live.status === 'APPLY' && live.studentList.length === 0) ||
+        live.status === 'NOT_SALE'
+      ) {
+        status = true
+      }
+      return status
     }
   },
   async mounted() {
@@ -85,15 +96,18 @@ export default defineComponent({
   methods: {
     async cancelCourseGroup() {
       try {
-        const res = await request.post(
+        const res = await request.get(
           '/api-teacher/courseGroup/cancelCourseGroup',
           {
-            data: {
+            params: {
               groupId: this.groupId
             }
           }
         )
-        console.log(res)
+        Toast('下架成功')
+        setTimeout(() => {
+          postMessage({ api: 'back', content: {} })
+        }, 500)
       } catch {}
     }
   },
@@ -130,9 +144,7 @@ export default defineComponent({
           </Tabs>
         </SectionDetail>
 
-        {/* {((this.live.status === 'APPLY' &&
-          this.live.studentList.length === 0) ||
-          this.live.status === 'NOT_SALE') && (
+        {this.courseOffStatus && (
           <Sticky offsetBottom={0} position="bottom">
             <div class={['btnGroup']} style={{ paddingTop: '12px' }}>
               <Button
@@ -145,7 +157,7 @@ export default defineComponent({
               </Button>
             </div>
           </Sticky>
-        )} */}
+        )}
       </div>
     )
   }

src/teacher/open-live/index.module.less

@@ -31,8 +31,8 @@
 .open-teacher-info {
   margin: 60px 14px 0;
   width: auto;
-  background-color: transparent;
-  padding: 0;
+  background-color: transparent !important;
+  padding: 0 !important;
   .userLogo {
     width: 56px;
     height: 56px;

src/teacher/practice-class/practice-setting.tsx

@@ -40,7 +40,7 @@ export default defineComponent({
         startSetting: '08:00',
         endSetting: '18:00'
       },
-      timerObject: {},
+      timerObject: {} as any,
       form: {
         courseMinutes: null as any,
         freeMinutes: 0,
@@ -135,6 +135,7 @@ export default defineComponent({
             subjectName: item.subjectName
           })
         })
+        const to = this.timerObject
         this.form = {
           courseMinutes: sr.courseMinutes,
           freeMinutes: sr.freeMinutes,
@@ -142,7 +143,16 @@ export default defineComponent({
           subjectId: tempIds,
           subjectPrice: tempPrices,
           skipHolidayFlag: sr.skipHolidayFlag,
-          setting: '已设置'
+          setting:
+            to.monday.length > 0 ||
+            to.tuesday.length > 0 ||
+            to.wednesday.length > 0 ||
+            to.thursday.length > 0 ||
+            to.friday.length > 0 ||
+            to.saturday.length > 0 ||
+            to.sunday.length > 0
+              ? '已设置'
+              : ''
         }
       }
     } catch {}
@@ -350,14 +360,13 @@ export default defineComponent({
         )}
 
         <ColFieldGroup>
-          <ColField title="可陪练时间段" required>
+          <ColField title="可陪练时间段">
             <Field
               modelValue={this.form.setting}
               name="singleMins"
               readonly
               isLink
               onClick={this.onTimer}
-              rules={[{ required: true, message: '请选择可陪练时间段' }]}
               placeholder="未设置"
             />
           </ColField>

src/teacher/teacher-cert/cert-two.tsx

@@ -35,6 +35,7 @@ export default defineComponent({
     choiceSubject() {
       // 选择的科目
       let tempArr: any[] = []
+      console.log(this.choiceSubjectIds, this.subjectList)
       this.subjectList.forEach((parent: any) => {
         parent.subjects &&
           parent.subjects.forEach((sub: any) => {

src/teacher/teacher-cert/index.tsx

@@ -33,9 +33,6 @@ export default defineComponent({
         return
       }
 
-      // teacherState.authStatus = false
-      // teacherState.active = 1
-
       if (teacherState.subjectList.length <= 0) {
         const res = await request.get('/api-teacher/subject/subjectSelect')
         teacherState.subjectList = res.data || []
@@ -44,7 +41,15 @@ export default defineComponent({
       const teacherInfo = await request.get(
         '/api-teacher/teacherAuthEntryRecord/getLastRecordByUserId'
       )
-      console.log(teacherInfo)
+      teacherState.teacherInfo = teacherInfo.data || {}
+      const info = teacherState.teacherInfo
+      teacherState.teacherCert.introduction = info.introduction
+      teacherState.teacherCert.subjectId = info.subjectId
+      teacherState.teacherCert.graduateSchool = info.graduateSchool
+      teacherState.teacherCert.subject = info.subject
+      teacherState.teacherCert.gradCertificate = info.gradCertificate
+      teacherState.teacherCert.degreeCertificate = info.degreeCertificate
+      teacherState.teacherCert.teacherCertificate = info.teacherCertificate
     } catch {
       //
     }

src/teacher/teacher-cert/teacherState.ts

@@ -4,6 +4,7 @@ export const teacherState = reactive({
   authStatus: false as boolean, // 是否立即认证
   subjectList: [], // 声部列表
   active: 1,
+  teacherInfo: {} as any,
   teacherCert: {
     realName: null,
     idCardNo: null,