修改问题

src/router/routes-common.ts

@@ -243,7 +243,7 @@ export const rootRouter = [
     path: '/:pathMatch(.*)*',
     component: () => import('@/views/404'),
     meta: {
-      title: '404 Not Fund',
+      title: '404',
       platform: paymentType
     }
   }

src/school/approval-manage/batch-adjust.tsx

@@ -41,7 +41,8 @@ export default defineComponent({
           data: {
             page: 1,
             rows: 100,
-            schoolId: state.user.data.school.id
+            schoolId: state.user.data.school.id,
+            status: 'DONE'
           }
         })
         forms.orchestraList = data.rows || []
@@ -96,7 +97,7 @@ export default defineComponent({
         <OHeader />
 
         <CellGroup inset>
-          <Cell isLink onClick={() => (forms.orchestraStatus = true)}>
+          <Cell isLink onClick={() => (forms.orchestraStatus = true)} valueClass={['van-ellipsis']}>
             {{ title: () => '乐团名称', value: () => forms.orchestraName }}
           </Cell>
           <Cell

src/school/attendance/components/attend-student.tsx

@@ -119,7 +119,7 @@ export default defineComponent({
     const getOrchestraList = async () => {
       try {
         const res = await request.post('/api-teacher/orchestra/page', {
-          data: { page: 1, rows: 9999 }
+          data: { page: 1, rows: 9999, status: 'DONE' }
         })
         state.actions = res.data.rows.map((item) => {
           return {

src/school/attendance/components/attend-teacher.tsx

@@ -123,7 +123,7 @@ export default defineComponent({
     const getOrchestraList = async () => {
       try {
         const res = await request.post('/api-school/orchestra/page', {
-          data: { page: 1, rows: 9999 }
+          data: { page: 1, rows: 9999, status: 'DONE' }
         })
         state.actions = res.data.rows.map((item) => {
           return {

src/school/companion-teacher/companion-detail.tsx

@@ -72,15 +72,25 @@ export default defineComponent({
     }
 
     const onDetail = async () => {
-      if (state.classList.length > 0) {
-        router.push({
-          path: '/companion-unbind',
-          query: { id: route.query.id }
-        })
-        return
-      }
+      try {
+        const { data } = await request.post(
+          '/api-school/classGroup/teacherHandoverList/' + route.query.id,
+          {}
+        )
+        const classList = data || []
+
+        if (classList.length > 0) {
+          router.push({
+            path: '/companion-unbind',
+            query: { id: route.query.id }
+          })
+          return
+        }
 
-      state.showDialog = true
+        state.showDialog = true
+      } catch {
+        //
+      }
     }
 
     const onConfirm = async () => {

src/school/mass-message/component/class-list/index.tsx

@@ -68,7 +68,8 @@ export default defineComponent({
           data: {
             page: 1,
             rows: 100,
-            schoolId: baseState.user.data.school.id
+            schoolId: baseState.user.data.school.id,
+            status: 'DONE'
           }
         })
         const temps = data.rows || []

src/school/orchestra-story/index.tsx

@@ -57,7 +57,8 @@ export default defineComponent({
           data: {
             page: 1,
             rows: 100,
-            schoolId: baseState.user.data.school.id
+            schoolId: baseState.user.data.school.id,
+            status: 'DONE'
           }
         })
         const temps = data.rows || []

src/school/orchestra-story/story-operation/index.tsx

@@ -52,7 +52,8 @@ export default defineComponent({
         const { data } = await request.post('/api-school/orchestra/page', {
           data: {
             page: 1,
-            rows: 100
+            rows: 100,
+            status: 'DONE'
           }
         })
         const temps = data.rows || []

src/school/orchestra/compontent/information.tsx

@@ -65,7 +65,7 @@ export default defineComponent({
       params: {
         startTime: dayjs(dayjs().year() + startTime.value).format('YYYY-MM-DD HH:mm:ss'),
         endTime: dayjs(dayjs().year() + endTime.value)
-          .subtract(1, 'year')
+          .add(1, 'year')
           .format('YYYY-MM-DD HH:mm:ss'),
         page: 1,
         rows: 20

src/school/orchestra/compontent/plan.tsx

@@ -48,7 +48,7 @@ export default defineComponent({
       params: {
         startTime: dayjs(dayjs().year() + startTime.value).format('YYYY-MM-DD HH:mm:ss'),
         endTime: dayjs(dayjs().year() + endTime.value)
-          .subtract(1, 'year')
+          .add(1, 'year')
           .format('YYYY-MM-DD HH:mm:ss'),
         page: 1,
         rows: 20
@@ -121,7 +121,7 @@ export default defineComponent({
           return
         }
         const rows = result.rows || []
-        state.list = state.list.concat([])
+        state.list = state.list.concat(rows || [])
         state.listState.finished = result.current >= result.pages
         state.params.page = result.current + 1
         state.listState.dataShow = state.list.length > 0

src/school/orchestra/create-orchestra/index.tsx

@@ -48,7 +48,8 @@ export default defineComponent({
           data: {
             page: 1,
             rows: 100,
-            schoolId: baseState.user.data.school.id
+            schoolId: baseState.user.data.school.id,
+            status: 'DONE'
           }
         })
         const temps = data.rows || []

src/school/ranking-list/components/day-bang.tsx

@@ -126,7 +126,7 @@ export default defineComponent({
       //   .join(',')
       try {
         const res = await request.post('/api-school/orchestra/page', {
-          data: { page: 1, rows: 9999 }
+          data: { page: 1, rows: 9999, status: 'DONE' }
         })
         state.actions = res.data.rows.map((item) => {
           return {

src/school/ranking-list/components/timer-bang.tsx

@@ -126,7 +126,7 @@ export default defineComponent({
       //   .join(',')
       try {
         const res = await request.post('/api-school/orchestra/page', {
-          data: { page: 1, rows: 9999 }
+          data: { page: 1, rows: 9999, status: 'DONE' }
         })
         state.actions = res.data.rows.map((item) => {
           return {

src/styles/index.less

@@ -199,14 +199,17 @@ body {
   .van-toast__text {
     width: 100px;
     height: 100px;
-    color: #333;
+    color: #fff;
     display: flex;
     align-items: center;
     flex-direction: column;
     justify-content: center;
   }
   .van-toast--text {
-    background-color: #fff;
+    // background-color: rgba(255, 255, 255, 1);
+    // background-color: rgba(0, 0, 0, 0.9);
+    background-color: transparent;
+    // box-shadow: 0px 8px 20px 2px #f0f0f0;
   }
   .toastAnimate {
     width: 70px;

src/teacher/attendance/index.tsx

@@ -124,7 +124,7 @@ export default defineComponent({
     const getOrchestraList = async () => {
       try {
         const res = await request.post('/api-teacher/orchestra/page', {
-          data: { page: 1, rows: 9999 }
+          data: { page: 1, rows: 9999, status: 'DONE' }
         })
         state.actions = res.data.rows.map((item) => {
           return {

src/views/404/index.tsx

@@ -8,6 +8,7 @@ import { browser } from '@/helpers/utils'
 export default defineComponent({
   name: 'NotFound',
   render() {
+    postMessage({ api: 'setBarStatus', content: { status: 0 } })
     return (
       <div class={styles.f404}>
         <Image src={img404} />

src/views/exercise-record/index.tsx

@@ -156,7 +156,7 @@ export default defineComponent({
       //   .join(',')
       try {
         const res = await request.post(`${platformApi.value}/orchestra/page`, {
-          data: { page: 1, rows: 9999 }
+          data: { page: 1, rows: 9999, status: 'DONE' }
         })
         state.actions = res.data.rows.map((item) => {
           return {

src/views/unit-test/examination-mode/index.tsx

@@ -83,14 +83,16 @@ export default defineComponent({
     /**
      * @description 计算考试时间剩余时间
      */
-    const calcTime = () => {
+    const calcTime = async () => {
       const examDetail = state.examDetail || {}
       const startTime = examDetail.startTime
       const nowTime = examDetail.now
       const timeMinutes = examDetail.timeMinutes || 0 // 测验时间
       // 返回秒
       const minu = dayjs(startTime).add(timeMinutes, 'minute').diff(dayjs(nowTime))
+      // 时间到了考试结束
       if (minu <= 0) {
+        await onConfirmExam()
         state.visiableExam = true
       } else {
         state.time = Math.ceil(minu / 1000) * 1000
@@ -431,7 +433,6 @@ export default defineComponent({
           message="考试已结束"
           messageAlign="center"
           onConfirm={async () => {
-            await onConfirmExam()
             state.visiableResult = true
           }}
         />