mo 2 лет назад
Родитель
Сommit
1aaf0f6e5f
2 измененных файлов с 71 добавлено и 67 удалено
  1. 11 9
      src/helpers/request.ts
  2. 60 58
      src/school/exercise-record/index.tsx

+ 11 - 9
src/helpers/request.ts

@@ -57,15 +57,17 @@ request.interceptors.request.use(
     ) {
       authHeaders.Authorization = Authorization
     }
-    const schoolId = (state.user.data.schoolInfos || [])
-      .map((item) => {
-        return item.id
-      })
-      .join(',')
-    console.log(schoolId)
-    if (schoolId) {
-      options.data ? (options.data.schoolId = schoolId) : null
-      options.params ? (options.params.schoolId = schoolId) : null
+    if (state?.user?.data?.schoolInfos) {
+      const schoolId = (state.user.data.schoolInfos || [])
+        .map((item) => {
+          return item.id
+        })
+        .join(',')
+      if (schoolId) {
+        console.log('schoolId', schoolId)
+        options.data ? (options.data.schoolId = schoolId) : null
+        options.params ? (options.params.schoolId = schoolId) : null
+      }
     }
 
     return {

+ 60 - 58
src/school/exercise-record/index.tsx

@@ -196,69 +196,71 @@ export default defineComponent({
     return () => (
       <>
         <OSticky position="top" background="#F8F8F8">
-          <OHeader onHeaderBack={onBack}></OHeader>
-          <OSearch
-            placeholder="请输入学生姓名"
-            onSearch={(val: any) => {
-              forms.keyword = val
-              refreshing.value = true
-              getList()
-            }}
-          ></OSearch>
-          <div class={styles.chioseWrap}>
-            <div style={{ padding: '12px 13px', background: '#F8F8F8' }}>
-              <div
-                class={styles.searchBand}
-                onClick={() => {
-                  state.showPopoverTime = true
-                }}
-              >
-                {forms.practiceMonthName}
-                <Icon name={state.showPopoverTime ? 'arrow-up' : 'arrow-down'} />
+          <div>
+            <OHeader onHeaderBack={onBack}></OHeader>
+            <OSearch
+              placeholder="请输入学生姓名"
+              onSearch={(val: any) => {
+                forms.keyword = val
+                refreshing.value = true
+                getList()
+              }}
+            ></OSearch>
+            <div class={styles.chioseWrap}>
+              <div style={{ padding: '12px 13px', background: '#F8F8F8' }}>
+                <div
+                  class={styles.searchBand}
+                  onClick={() => {
+                    state.showPopoverTime = true
+                  }}
+                >
+                  {forms.practiceMonthName}
+                  <Icon name={state.showPopoverTime ? 'arrow-up' : 'arrow-down'} />
+                </div>
               </div>
-            </div>
 
-            <div style={{ padding: '12px 13px', background: '#F8F8F8' }}>
-              <div
-                class={styles.searchBand}
-                onClick={() => {
-                  state.showPopoverOrchestra = true
-                }}
-              >
-                {forms.orchestraName}
-                <Icon name={state.showPopoverOrchestra ? 'arrow-up' : 'arrow-down'} />
+              <div style={{ padding: '12px 13px', background: '#F8F8F8' }}>
+                <div
+                  class={styles.searchBand}
+                  onClick={() => {
+                    state.showPopoverOrchestra = true
+                  }}
+                >
+                  {forms.orchestraName}
+                  <Icon name={state.showPopoverOrchestra ? 'arrow-up' : 'arrow-down'} />
+                </div>
               </div>
-            </div>
-            <div style={{ padding: '12px 13px', background: '#F8F8F8' }}>
-              <div
-                class={styles.searchBand}
-                onClick={() => {
-                  state.showPopoverSubject = true
-                }}
-              >
-                {forms.subjectName}
-                <Icon name={state.showPopoverSubject ? 'arrow-up' : 'arrow-down'} />
+              <div style={{ padding: '12px 13px', background: '#F8F8F8' }}>
+                <div
+                  class={styles.searchBand}
+                  onClick={() => {
+                    state.showPopoverSubject = true
+                  }}
+                >
+                  {forms.subjectName}
+                  <Icon name={state.showPopoverSubject ? 'arrow-up' : 'arrow-down'} />
+                </div>
               </div>
-            </div>
 
-            <div style={{ padding: '12px 13px', background: '#F8F8F8' }}>
-              <Popover
-                v-model:show={state.showPopoverSort}
-                actions={state.actionSorts}
-                showArrow={false}
-                placement="bottom-end"
-                offset={[0, 12]}
-                onSelect={checkSort}
-              >
-                {{
-                  reference: () => (
-                    <div class={styles.searchBand}>
-                      按天数
-                      <Icon name={state.showPopoverSort ? 'arrow-up' : 'arrow-down'} />
-                    </div>
-                  )
-                }}
-              </Popover>
+              <div style={{ padding: '12px 13px', background: '#F8F8F8' }}>
+                <Popover
+                  v-model:show={state.showPopoverSort}
+                  actions={state.actionSorts}
+                  showArrow={false}
+                  placement="bottom-end"
+                  offset={[0, 12]}
+                  onSelect={checkSort}
+                >
+                  {{
+                    reference: () => (
+                      <div class={styles.searchBand}>
+                        按天数
+                        <Icon name={state.showPopoverSort ? 'arrow-up' : 'arrow-down'} />
+                      </div>
+                    )
+                  }}
+                </Popover>
+              </div>
             </div>
           </div>
         </OSticky>