Sfoglia il codice sorgente

处理加载问题

lex 2 anni fa
parent
commit
9e2fb0211c
34 ha cambiato i file con 199 aggiunte e 154 eliminazioni
  1. 1 1
      src/school/approval-manage/agency/index.tsx
  2. 2 2
      src/school/approval-manage/components/end-approval.tsx
  3. 1 0
      src/school/approval-manage/components/student-leave.tsx
  4. 2 2
      src/school/approval-manage/components/wait-approval.tsx
  5. 27 8
      src/school/approval-manage/course-adjust.tsx
  6. 5 2
      src/school/approval-manage/subsidy/index.tsx
  7. 1 1
      src/school/attendance/student-att-day.tsx
  8. 3 1
      src/school/companion-teacher/companion-detail.tsx
  9. 23 22
      src/school/companion-teacher/companion-teacher-register.tsx
  10. 1 0
      src/school/companion-teacher/unbind.tsx
  11. 3 1
      src/school/manage-teacher/manage-detail.tsx
  12. 3 7
      src/school/manage-teacher/menu-function.tsx
  13. 3 0
      src/school/mass-message/create-message.tsx
  14. 1 1
      src/school/orchestra-story/index.tsx
  15. 3 0
      src/school/orchestra-story/story-operation/index.tsx
  16. 1 0
      src/school/orchestra/create-orchestra/select-teacher.tsx
  17. 3 3
      src/school/practice-rewards/index.tsx
  18. 1 1
      src/school/ranking-list/components/day-bang.tsx
  19. 1 1
      src/school/ranking-list/components/timer-bang.tsx
  20. 1 0
      src/school/school-detail/eidt-school.tsx
  21. 12 4
      src/school/train-planning/component/course-preview/index.tsx
  22. 1 0
      src/school/train-planning/component/practice-detail/index.tsx
  23. 1 0
      src/school/train-planning/component/train-content/index.tsx
  24. 71 78
      src/school/train-planning/modal/practice-class/index.tsx
  25. 12 8
      src/student/member-center/index.tsx
  26. 1 2
      src/student/my-orchestra/apply-withdrawal.tsx
  27. 4 4
      src/styles/index.less
  28. 2 2
      src/teacher/attendance/index.tsx
  29. 1 0
      src/views/adapay/pay-define/index.tsx
  30. 1 1
      src/views/exercise-record/exercis-detail.tsx
  31. 3 2
      src/views/mine-orchestra/index.tsx
  32. 1 0
      src/views/unit-test/examination-mode/index.tsx
  33. 2 0
      src/views/unit-test/index.tsx
  34. 1 0
      src/views/unit-test/unit-create/uni-last.tsx

+ 1 - 1
src/school/approval-manage/agency/index.tsx

@@ -76,7 +76,7 @@ export default defineComponent({
       }
       try {
         const res: any = await request.post(`${state.platformApi}/schoolWeekSalaryRecord/manage`, {
-          hideLoading: refreshing.value
+          // hideLoading: refreshing.value
         })
         if (Array.isArray(res?.data?.salaryRecordList)) {
           data.salaryRecordList = res.data.salaryRecordList.map((n: any) => {

+ 2 - 2
src/school/approval-manage/components/end-approval.tsx

@@ -32,8 +32,8 @@ export default defineComponent({
         }
 
         const res = await request.post('/api-school/userApproveRecord/page', {
-          data: { ...forms, hasHandle: true },
-          hideLoading: refreshing.value
+          data: { ...forms, hasHandle: true }
+          // hideLoading: refreshing.value
         })
 
         if (Array.isArray(res?.data?.rows)) {

+ 1 - 0
src/school/approval-manage/components/student-leave.tsx

@@ -56,6 +56,7 @@ export default defineComponent({
       }
       try {
         const res = await request.post(`/api-school/userApproveRecord/approval`, {
+          hideLoading: false,
           data: {
             id: route.query.id,
             approvalComments: leaveReason.value,

+ 2 - 2
src/school/approval-manage/components/wait-approval.tsx

@@ -32,8 +32,8 @@ export default defineComponent({
       }
       try {
         const res = await request.post('/api-school/userApproveRecord/page', {
-          data: { ...forms, hasHandle: false },
-          hideLoading: refreshing.value
+          data: { ...forms, hasHandle: false }
+          // hideLoading: refreshing.value
         })
 
         if (Array.isArray(res?.data?.rows)) {

+ 27 - 8
src/school/approval-manage/course-adjust.tsx

@@ -14,6 +14,7 @@ import Calendar from '../train-planning/modal/calendar'
 import Timer from '../train-planning/modal/timer'
 import TeacherList from '../orchestra/modal/teacher-list'
 import OSticky from '@/components/o-sticky'
+import ODialog from '@/components/o-dialog'
 
 export default defineComponent({
   name: 'course-adjust',
@@ -36,7 +37,9 @@ export default defineComponent({
       trainTimer: 0,
       selectItem: {} as any,
       arrangeType: 'STANDARD', // 标准排课还是加课
-      isBack: route.query.isBack
+      isBack: route.query.isBack,
+      dialogStatus: false,
+      dialogMessage: ''
     })
     const forms = reactive({
       classDate: '',
@@ -136,19 +139,25 @@ export default defineComponent({
           return
         }
 
-        await request.post(`/api-school/courseSchedule/adjust`, {
+        const res = await request.post(`/api-school/courseSchedule/adjust`, {
+          hideLoading: false,
           data: {
             ...forms,
             cacheId: state.cacheId
           }
         })
 
-        setTimeout(() => {
-          showSuccessToast('调整成功')
-        }, 100)
-        setTimeout(() => {
-          reset()
-        }, 1100)
+        if (res.code === 999) {
+          state.dialogStatus = true
+          state.dialogMessage = res.message
+        } else {
+          setTimeout(() => {
+            showSuccessToast('调整成功')
+          }, 100)
+          setTimeout(() => {
+            reset()
+          }, 1100)
+        }
       } catch (e: any) {
         showToast(e.message)
       }
@@ -297,6 +306,16 @@ export default defineComponent({
               }}
             />
           </OPopup>
+
+          <ODialog
+            title="提示"
+            v-model:show={state.dialogStatus}
+            message={state.dialogMessage}
+            confirmButtonText="确定"
+            onConfirm={() => {
+              router.back()
+            }}
+          />
         </div>
       </>
     )

+ 5 - 2
src/school/approval-manage/subsidy/index.tsx

@@ -36,7 +36,7 @@ export default defineComponent({
         const res: any = await request.post(
           `${state.platformApi}/schoolWeekSalaryRecord/manageConfirm/${route.query.salaryId}`,
           {
-            hideLoading: refreshing.value
+            // hideLoading: refreshing.value
           }
         )
         if (res?.data) {
@@ -74,7 +74,10 @@ export default defineComponent({
       }).then(() => {
         request
           .post(
-            `${state.platformApi}/schoolWeekSalaryRecord/manageConfirmed/${route.query.salaryId}`
+            `${state.platformApi}/schoolWeekSalaryRecord/manageConfirmed/${route.query.salaryId}`,
+            {
+              hideLoading: false
+            }
           )
           .then((res: any) => {
             if (res?.code == 200) {

+ 1 - 1
src/school/attendance/student-att-day.tsx

@@ -141,7 +141,7 @@ export default defineComponent({
         ) : (
           <OEmpty />
         )}
-        <Popup v-model:show={state.showPopoverTime} position="bottom" style="{ height: '30%' }">
+        <Popup v-model:show={state.showPopoverTime} position="bottom" round>
           <DatePicker
             onCancel={() => {
               state.showPopoverTime = false

+ 3 - 1
src/school/companion-teacher/companion-detail.tsx

@@ -75,7 +75,9 @@ export default defineComponent({
       try {
         const { data } = await request.post(
           '/api-school/classGroup/teacherHandoverList/' + route.query.id,
-          {}
+          {
+            hideLoading: false
+          }
         )
         const classList = data || []
 

+ 23 - 22
src/school/companion-teacher/companion-teacher-register.tsx

@@ -100,6 +100,7 @@ export default defineComponent({
       try {
         const forms = state.forms
         await request.post('/api-school/open/schoolTeacherStudent/registerTeacher', {
+          hideLoading: false,
           data: {
             ...forms,
             code: state.code,
@@ -199,28 +200,28 @@ export default defineComponent({
       }
 
       // 判断是否是微信,只能微信中打开
-      if (!browser().weixin) {
-        state.showPopup = true
-        return
-      } else {
-        //授权
-        const code = getUrlCode()
-        if (!code) {
-          const newUrl =
-            window.location.origin +
-            window.location.pathname +
-            '#' +
-            route.path +
-            '?' +
-            qs.stringify({
-              ...route.query
-            })
-          getAppIdAndCode(newUrl)
-          return
-        } else {
-          state.code = code
-        }
-      }
+      // if (!browser().weixin) {
+      //   state.showPopup = true
+      //   return
+      // } else {
+      //   //授权
+      //   const code = getUrlCode()
+      //   if (!code) {
+      //     const newUrl =
+      //       window.location.origin +
+      //       window.location.pathname +
+      //       '#' +
+      //       route.path +
+      //       '?' +
+      //       qs.stringify({
+      //         ...route.query
+      //       })
+      //     getAppIdAndCode(newUrl)
+      //     return
+      //   } else {
+      //     state.code = code
+      //   }
+      // }
 
       // t: route.query.t, // 过期时间
       try {

+ 1 - 0
src/school/companion-teacher/unbind.tsx

@@ -113,6 +113,7 @@ export default defineComponent({
           }
         })
         const res = await request.post('/api-school/classGroup/handoverTeacher', {
+          hideLoading: false,
           data: {
             teacherId: route.query.id,
             courseUpdateList: [...courseInfo]

+ 3 - 1
src/school/manage-teacher/manage-detail.tsx

@@ -40,7 +40,9 @@ export default defineComponent({
         // }
 
         const query = route.query
-        await request.post('/api-school/schoolStaff/freeze/' + query.id)
+        await request.post('/api-school/schoolStaff/freeze/' + query.id, {
+          hideLoading: false
+        })
         setTimeout(() => {
           if (detail.value.status === 'ACTIVATION') {
             detail.value.status = 'LOCKED'

+ 3 - 7
src/school/manage-teacher/menu-function.tsx

@@ -70,18 +70,14 @@ export default defineComponent({
             }
           })
         await request.post('/api-school/schoolStaff/updateButton', {
+          hideLoading: false,
           data: {
             teacherId: props.teacherId,
             menuButtons: [...tempMnus]
           }
         })
-        setTimeout(() => {
-          showToast('修改成功')
-          setTimeout(() => {
-            emit('close')
-            emit('success')
-          }, 1000)
-        }, 100)
+        emit('close')
+        emit('success')
       } catch {
         //
       }

+ 3 - 0
src/school/mass-message/create-message.tsx

@@ -196,10 +196,12 @@ export default defineComponent({
         if (forms.id) {
           params.id = forms.id
           await request.post('/api-school/imMessageBatchSending/update', {
+            hideLoading: false,
             data: params
           })
         } else {
           await request.post('/api-school/imMessageBatchSending/save', {
+            hideLoading: false,
             data: params
           })
         }
@@ -280,6 +282,7 @@ export default defineComponent({
         forms.closeLoading = true
         await request.post('/api-school/imMessageBatchSending/remove', {
           requestType: 'form',
+          hideLoading: false,
           data: {
             id: forms.id
           }

+ 1 - 1
src/school/orchestra-story/index.tsx

@@ -155,7 +155,7 @@ export default defineComponent({
           {{
             right: () => (
               <span
-                style={{ color: '#777777' }}
+                style={{ color: 'var(--van-primary)' }}
                 onClick={() => {
                   router.push('/story-operation')
                 }}

+ 3 - 0
src/school/orchestra-story/story-operation/index.tsx

@@ -178,6 +178,7 @@ export default defineComponent({
 
         if (forms.id) {
           await request.post('/api-school/orchestraStory/update', {
+            hideLoading: false,
             data: {
               ...params,
               id: forms.id
@@ -190,6 +191,7 @@ export default defineComponent({
           router.back()
         } else {
           await request.post('/api-school/orchestraStory/save', {
+            hideLoading: false,
             data: params
           })
 
@@ -386,6 +388,7 @@ export default defineComponent({
           <DatePicker
             maxDate={new Date()}
             v-model={forms.currentDate}
+            onCancel={() => (forms.createTimeStatus = false)}
             onConfirm={(val: any) => {
               const selectedValues = val.selectedValues.join('-')
               forms.createTime = dayjs(selectedValues).toDate()

+ 1 - 0
src/school/orchestra/create-orchestra/select-teacher.tsx

@@ -45,6 +45,7 @@ export default defineComponent({
           console.log(tempSelects, 'tempselects')
           // return
           await request.post('/api-school/orchestra/addOrchestra', {
+            hideLoading: false,
             data: {
               schoolId: baseState.user.data.school.id,
               name: state.orchestraName,

+ 3 - 3
src/school/practice-rewards/index.tsx

@@ -14,7 +14,7 @@ export default defineComponent({
   setup() {
     const seeType = localStorage.getItem('practice-rewards-see-type')
     const state = reactive({
-      seeType: seeType || 'see',
+      seeType: seeType || 'hide',
       list: [] as any,
       listState: {
         dataShow: true, // 判断是否有数据
@@ -114,7 +114,7 @@ export default defineComponent({
               />
               <div class={styles.priceTitle}>待结算金额 (元)</div>
               <div class={styles.priceCount}>
-                {state.seeType === 'see' ? moneyFormat(state.statistics.waitSalary) : '******'}
+                {state.seeType === 'see' ? moneyFormat(state.statistics.waitSalary) : '****'}
               </div>
               <Progress
                 color="#fff"
@@ -128,7 +128,7 @@ export default defineComponent({
                 <span>
                   {state.seeType === 'see'
                     ? moneyFormat(state.statistics.totalTrainingSalary)
-                    : '******'}
+                    : '****'}
                 </span>
               </div>
             </div>

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

@@ -243,7 +243,7 @@ export default defineComponent({
           <OEmpty />
         )}
 
-        <Popup v-model:show={state.showPopoverTime} position="bottom" style="{ height: '30%' }">
+        <Popup v-model:show={state.showPopoverTime} position="bottom" round>
           <DatePicker
             onCancel={() => {
               state.showPopoverTime = false

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

@@ -243,7 +243,7 @@ export default defineComponent({
           <OEmpty />
         )}
 
-        <Popup v-model:show={state.showPopoverTime} position="bottom" style="{ height: '30%' }">
+        <Popup v-model:show={state.showPopoverTime} position="bottom" round>
           <DatePicker
             onCancel={() => {
               state.showPopoverTime = false

+ 1 - 0
src/school/school-detail/eidt-school.tsx

@@ -75,6 +75,7 @@ export default defineComponent({
       }
       try {
         const { data } = await request.post('/api-school/school/update', {
+          hideLoading: false,
           data: {
             ...forms
           }

+ 12 - 4
src/school/train-planning/component/course-preview/index.tsx

@@ -51,15 +51,20 @@ export default defineComponent({
     // 获取所有
     const getClasses = async (loading = true) => {
       try {
-        const { data } = await request.post('/api-school/orchestra/trainingPlanListCache', {
+        const res = await request.post('/api-school/orchestra/trainingPlanListCache', {
           requestType: 'form',
-          hideLoading: !loading,
+          // hideLoading: !loading,
           data: {
             cacheId: route.query.cacheId
           }
         })
+        if (res.code === 999) {
+          state.dialogStatus = true
+          state.dialogMessage = res.message
+          return
+        }
         // 初始化数据
-        formatClasses(data)
+        formatClasses(res.data)
 
         if (forms.planList.orchestra.length > 0) {
           const selectOrchestra = forms.selectOrchestraId
@@ -172,7 +177,10 @@ export default defineComponent({
     const onSubmit = async () => {
       try {
         state.isClick = true
-        const res = await request.post('/api-school/orchestra/trainingPlan/' + route.query.cacheId)
+        const res = await request.post(
+          '/api-school/orchestra/trainingPlan/' + route.query.cacheId,
+          { hideLoading: false }
+        )
 
         // 判断数据是否已经过期
         if (res.code === 999) {

+ 1 - 0
src/school/train-planning/component/practice-detail/index.tsx

@@ -147,6 +147,7 @@ export default defineComponent({
         console.log(params)
 
         const { data } = await request.post('/api-school/orchestra/trainingPlanList', {
+          hideLoading: false,
           data: {
             ...params
           }

+ 1 - 0
src/school/train-planning/component/train-content/index.tsx

@@ -89,6 +89,7 @@ export default defineComponent({
         }
 
         const res = await request.post('/api-school/orchestra/trainingPlanList', {
+          hideLoading: false,
           data: {
             ...params
           }

+ 71 - 78
src/school/train-planning/modal/practice-class/index.tsx

@@ -85,6 +85,8 @@ export default defineComponent({
         if (s.length > 0) {
           forms.orchestraId = s[0].value
           forms.orchestraName = s[0].text
+
+          await getList()
         }
       } catch {
         //
@@ -111,10 +113,16 @@ export default defineComponent({
         forms.listState.loading = false
         const result = data || {}
         // 处理重复请求数据
+
         if (forms.list.length > 0 && result.current === 1) {
           return
         }
-        forms.list = forms.list.concat(result.rows || [])
+        const tempList = forms.list.concat(result.rows || [])
+        tempList.forEach((item: any) => {
+          if (item.preStudentNum > 0) {
+            forms.list.push(item)
+          }
+        })
         forms.listState.finished = result.current >= result.pages
         forms.params.page = result.current + 1
         forms.listState.dataShow = forms.list.length > 0
@@ -152,14 +160,9 @@ export default defineComponent({
       // 判断是否有乐团编号
       if (!props.orchestraId) {
         await getOrchestras()
+      } else {
+        await getList()
       }
-      // 判断是否有乐团编号
-      setTimeout(
-        async () => {
-          await getList()
-        },
-        props.orchestraId ? 0 : 100
-      )
     })
 
     return () => (
@@ -187,78 +190,68 @@ export default defineComponent({
             immediateCheck={false}
           >
             <CheckboxGroup class={[styles.gridContainer, styles.gridClass]} v-model={forms.check}>
-              {forms.list.map(
-                (item: any) =>
-                  item.preStudentNum > 0 && (
-                    <CellGroup
-                      class={styles.classCellGroup}
-                      onClick={() => {
-                        if (item.teacherId) {
-                          onSelect(item.id)
-                        }
-                      }}
-                      border={false}
-                    >
-                      <Cell
-                        center
-                        titleStyle={{ flex: '0 auto' }}
-                        valueClass={styles.classCheckbox}
-                      >
-                        {{
-                          icon: () => <Image src={iconTeacher} class={styles.img} />,
-                          title: () => (
-                            <div class={styles.content}>
-                              <div class={styles.teacherName}>
-                                {item.teacherName ? (
-                                  <div class={[styles.name, styles.maxWidth, 'van-ellipsis']}>
-                                    {item.teacherName}
-                                  </div>
-                                ) : (
-                                  <div
-                                    class={[styles.name, 'van-ellipsis']}
-                                    style={{ color: 'red' }}
-                                  >
-                                    暂未设置伴学指导
-                                  </div>
-                                )}
-                                <Tag type="primary">{item.name}</Tag>
+              {forms.list.map((item: any) => (
+                <CellGroup
+                  class={styles.classCellGroup}
+                  onClick={() => {
+                    if (item.teacherId) {
+                      onSelect(item.id)
+                    }
+                  }}
+                  border={false}
+                >
+                  <Cell center titleStyle={{ flex: '0 auto' }} valueClass={styles.classCheckbox}>
+                    {{
+                      icon: () => <Image src={iconTeacher} class={styles.img} />,
+                      title: () => (
+                        <div class={styles.content}>
+                          <div class={styles.teacherName}>
+                            {item.teacherName ? (
+                              <div class={[styles.name, styles.maxWidth, 'van-ellipsis']}>
+                                {item.teacherName}
                               </div>
-                              <div class={[styles.orchestraName, 'van-ellipsis']}>
-                                {item.orchestraName}
+                            ) : (
+                              <div class={[styles.name, 'van-ellipsis']} style={{ color: 'red' }}>
+                                暂未设置伴学指导
                               </div>
-                            </div>
-                          ),
-                          value: () => (
-                            <Checkbox
-                              name={item.id}
-                              ref={(el: any) => (forms.checkboxRefs[item.id] = el)}
-                              disabled={item.teacherId ? false : true}
-                              onClick={(e: any) => {
-                                e.stopPropagation()
-                              }}
-                            ></Checkbox>
-                          )
-                        }}
-                      </Cell>
-                      <Grid border={false} columnNum={3}>
-                        <GridItem>
-                          <p class={styles.title}>{item.preStudentNum}</p>
-                          <p class={styles.name}>学生人数</p>
-                        </GridItem>
-                        <GridItem>
-                          <p class={[styles.title]}>
-                            {item.courseScheduleNum - item.completeCourseScheduleNum}
-                          </p>
-                          <p class={styles.name}>剩余课时</p>
-                        </GridItem>
-                        <GridItem>
-                          <p class={styles.title}>{item.courseScheduleNum}</p>
-                          <p class={styles.name}>总课时</p>
-                        </GridItem>
-                      </Grid>
-                    </CellGroup>
-                  )
-              )}
+                            )}
+                            <Tag type="primary">{item.name}</Tag>
+                          </div>
+                          <div class={[styles.orchestraName, 'van-ellipsis']}>
+                            {item.orchestraName}
+                          </div>
+                        </div>
+                      ),
+                      value: () => (
+                        <Checkbox
+                          name={item.id}
+                          ref={(el: any) => (forms.checkboxRefs[item.id] = el)}
+                          disabled={item.teacherId ? false : true}
+                          onClick={(e: any) => {
+                            e.stopPropagation()
+                          }}
+                        ></Checkbox>
+                      )
+                    }}
+                  </Cell>
+                  <Grid border={false} columnNum={3}>
+                    <GridItem>
+                      <p class={styles.title}>{item.preStudentNum}</p>
+                      <p class={styles.name}>学生人数</p>
+                    </GridItem>
+                    <GridItem>
+                      <p class={[styles.title]}>
+                        {item.courseScheduleNum - item.completeCourseScheduleNum}
+                      </p>
+                      <p class={styles.name}>剩余课时</p>
+                    </GridItem>
+                    <GridItem>
+                      <p class={styles.title}>{item.courseScheduleNum}</p>
+                      <p class={styles.name}>总课时</p>
+                    </GridItem>
+                  </Grid>
+                </CellGroup>
+              ))}
             </CheckboxGroup>
           </List>
         ) : (

+ 12 - 8
src/student/member-center/index.tsx

@@ -324,14 +324,18 @@ export default defineComponent({
                 </div>
               )}
             </div>
-            <Button
-              color="linear-gradient(220deg, #DFA164 0%, #FAC87E 100%)"
-              round
-              class={styles.btn}
-              onClick={this.onSubmit}
-            >
-              {this.userInfo.isVip ? '立即续费' : '立即开通'}
-            </Button>
+            {this.userInfo.id ? (
+              <Button
+                color="linear-gradient(220deg, #DFA164 0%, #FAC87E 100%)"
+                round
+                class={styles.btn}
+                onClick={this.onSubmit}
+              >
+                {this.userInfo.isVip ? '立即续费' : '立即开通'}
+              </Button>
+            ) : (
+              ''
+            )}
           </div>
         ) : (
           ''

+ 1 - 2
src/student/my-orchestra/apply-withdrawal.tsx

@@ -109,8 +109,7 @@ export default defineComponent({
           </div>
         </div>
         <div class={styles.content}>
-          <span>在乐团训练的日子里,</span>
-          有付出有汗水,有从0到1的喜悦也有攻克难关的坚持。你的付出为你带来成长,你的成长让老师感到欣喜。
+          在乐团训练的日子里,有付出有汗水,有从0到1的喜悦也有攻克难关的坚持。你的付出为你带来成长,你的成长让老师感到欣喜。
         </div>
 
         <div class={styles.resion}>

+ 4 - 4
src/styles/index.less

@@ -197,7 +197,7 @@ body {
     // background: rgba(0, 0, 0, 0.4);
     background: #fff;
     // transition: all 0 ease;
-    z-index: 1999 !important;
+    z-index: 2999 !important;
   }
   .van-fade-enter-from,
   .van-fade-enter-active {
@@ -217,7 +217,7 @@ body {
     // background-color: rgba(0, 0, 0, 0.9);
     background-color: transparent;
     // box-shadow: 0px 8px 20px 2px #f0f0f0;
-    z-index: 1999 !important;
+    z-index: 2999 !important;
   }
   .toastAnimate {
     width: 70px;
@@ -230,7 +230,7 @@ body {
     background: rgba(0, 0, 0, 0.4);
     // background: #fff;
     // transition: all 0 ease;
-    z-index: 1999 !important;
+    z-index: 2999 !important;
   }
   .van-fade-enter-from,
   .van-fade-enter-active {
@@ -250,7 +250,7 @@ body {
     // background-color: rgba(0, 0, 0, 0.9);
     // background-color: transparent;
     // box-shadow: 0px 8px 20px 2px #f0f0f0;
-    z-index: 1999 !important;
+    z-index: 2999 !important;
   }
   .toastAnimate {
     width: 70px;

+ 2 - 2
src/teacher/attendance/index.tsx

@@ -59,7 +59,7 @@ export default defineComponent({
     const refreshing = ref(false)
     const loading = ref(false)
     const finished = ref(false)
-    const showContact = ref(false)
+    const showContact = ref(true)
     const list = ref([])
 
     const getList = async () => {
@@ -225,7 +225,7 @@ export default defineComponent({
           <OEmpty tips="暂无考勤" />
         )}
 
-        <Popup v-model:show={state.showPopoverTime} position="bottom" style="{ height: '30%' }">
+        <Popup v-model:show={state.showPopoverTime} position="bottom" round>
           <DatePicker
             onCancel={() => {
               state.showPopoverTime = false

+ 1 - 0
src/views/adapay/pay-define/index.tsx

@@ -40,6 +40,7 @@ export default defineComponent({
         }
         console.log(payMap, 'payMap')
         const { data } = await request.post('/api-student/open/userOrder/executePayment', {
+          hideLoading: false,
           data: {
             ...payMap
           }

+ 1 - 1
src/views/exercise-record/exercis-detail.tsx

@@ -271,7 +271,7 @@ export default defineComponent({
           )}
         </div>
 
-        <Popup v-model:show={state.showPopoverTime} position="bottom" style="{ height: '30%' }">
+        <Popup v-model:show={state.showPopoverTime} position="bottom" round>
           <DatePicker
             onCancel={() => {
               state.showPopoverTime = false

+ 3 - 2
src/views/mine-orchestra/index.tsx

@@ -33,7 +33,7 @@ export default defineComponent({
       data.loading = true
       request
         .post(`${state.platformApi}/orchestra/studentOrchestra`, {
-          hideLoading: data.reshLoading
+          // hideLoading: data.reshLoading
         })
         .then((res: any) => {
           if (Array.isArray(res?.data)) {
@@ -57,7 +57,7 @@ export default defineComponent({
       data.loading = true
       request
         .post(`${state.platformApi}/orchestra/teacherOrchestra`, {
-          hideLoading: data.reshLoading
+          // hideLoading: data.reshLoading
         })
         .then((res: any) => {
           if (Array.isArray(res?.data)) {
@@ -105,6 +105,7 @@ export default defineComponent({
                       {(modelData.orchestra?.status === 'REGISTER' ||
                         modelData.orchestra?.status === 'LEARNING') && (
                         <span
+                          style={{ color: 'var(--van-primary)' }}
                           onClick={() => {
                             router.push({
                               path: '/apply-withdrawal',

+ 1 - 0
src/views/unit-test/examination-mode/index.tsx

@@ -215,6 +215,7 @@ export default defineComponent({
         const { data } = await request.post(
           '/api-student/studentUnitExamination/completionExamination',
           {
+            hideLoading: false,
             data: {
               answers: userAnswerList,
               studentUnitExaminationId: state.id

+ 2 - 0
src/views/unit-test/index.tsx

@@ -105,6 +105,7 @@ export default defineComponent({
             '/api-student/studentUnitExamination/getExaminationDetail',
             {
               requestType: 'form',
+              hideLoading: false,
               data: {
                 studentUnitExaminationId: item.id
               }
@@ -133,6 +134,7 @@ export default defineComponent({
       try {
         await request.post('/api-student/studentUnitExamination/startExamination', {
           requestType: 'form',
+          hideLoading: false,
           data: {
             studentUnitExaminationId: form.selectUnitExam.id
           }

+ 1 - 0
src/views/unit-test/unit-create/uni-last.tsx

@@ -148,6 +148,7 @@ export default defineComponent({
         await request.post(
           state.platformApi + `/classGroupUnitExamination/publishUnitExamination`,
           {
+            hideLoading: false,
             data: {
               classGroupId: forms.value.classGroupId,
               lessonCoursewareExaminationMapperId: forms.value.testId,