lex 2 年之前
父節點
當前提交
99d5afd8a9

+ 17 - 3
src/school/orchestra/compontent/plan.tsx

@@ -13,6 +13,10 @@ export default defineComponent({
     termTimes: {
       type: Object,
       default: {}
+    },
+    height: {
+      type: [String, Number],
+      default: 0
     }
   },
   setup(props) {
@@ -117,7 +121,7 @@ export default defineComponent({
           return
         }
         const rows = result.rows || []
-        state.list = state.list.concat(rows)
+        state.list = state.list.concat([])
         state.listState.finished = result.current >= result.pages
         state.params.page = result.current + 1
         state.listState.dataShow = state.list.length > 0
@@ -142,8 +146,18 @@ export default defineComponent({
       getList()
     })
     return () => (
-      <div>
-        <div style={{ padding: '12px 13px 16px', background: '#F8F8F8' }}>
+      <div
+        class={!state.listState.dataShow && 'emptyRootContainer'}
+        style={{ minHeight: `calc(100vh - ${props.height}px)` }}
+      >
+        <div
+          style={{
+            padding: '12px 13px 16px',
+            background: '#F8F8F8',
+            width: '100%',
+            boxSizing: 'border-box'
+          }}
+        >
           <div class={styles.searchBand} onClick={() => (state.timeShow = true)}>
             {state.currentData[0]}年 <Icon name={state.showPopover ? 'arrow-up' : 'arrow-down'} />
           </div>

+ 1 - 1
src/school/orchestra/orchestra-detail.tsx

@@ -59,7 +59,7 @@ export default defineComponent({
         </OSticky>
 
         {tabValue.value === 'information' && <Information termTimes={termTimes.value} />}
-        {tabValue.value === 'plan' && <Plan termTimes={termTimes.value} />}
+        {tabValue.value === 'plan' && <Plan height={tabHeight.value} termTimes={termTimes.value} />}
         {tabValue.value === 'photo' && <Photo height={tabHeight.value} />}
       </div>
     )

+ 5 - 1
src/views/404/index.module.less

@@ -1,6 +1,10 @@
 .f404 {
   min-height: 100vh;
   text-align: center;
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  justify-content: center;
 
   p {
     font-size: 16px;
@@ -8,7 +12,7 @@
   }
   :global {
     .van-image {
-      margin-top: 100px;
+      // margin-top: 100px;
       width: 70%;
     }
     .van-button {

+ 1 - 1
src/views/unit-test/unit-list/index.tsx

@@ -136,7 +136,7 @@ export default defineComponent({
               finished={form.listState.finished}
               finishedText=" "
               class={[styles.liveList]}
-              // onLoad={getList}
+              onLoad={getList}
               immediateCheck={false}
             >
               {form.list.map((item: any) => (