提交

1

src/views/tenantAllData/index.module.less

@@ -1,7 +1,7 @@
 .tenantAllData {
   padding: 0 12px;
   .topWrap {
-    margin-top: 16px;
+    padding-top: 16px;
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -60,7 +60,7 @@
     }
     .cardNum {
       font-size: 24px;
-      font-family: 'DINA';
+      font-family: DINAlternate-Bold, DINAlternate;
       font-weight: bold;
       color: #fe6f25;
       line-height: 28px;
@@ -132,7 +132,7 @@
     }
     .personNum {
       font-size: 20px;
-      font-family: 'DINA';
+      font-family: DINAlternate-Bold, DINAlternate;
       font-weight: bold;
       color: #ff5a56;
       line-height: 24px;
@@ -195,3 +195,14 @@
     line-height: 20px;
   }
 }
+.emptyC {
+  padding-bottom: 0;
+  min-height: calc(100vh - var(--header-height));
+}
+.refreshC {
+  min-height: calc(100vh - var(--header-height));
+}
+.top {
+  background: #f6f8f9;
+  padding: 0 12px;
+}

src/views/tenantAllData/index.tsx

@@ -35,7 +35,7 @@ export default defineComponent({
   name: 'tenant-apply-data',
   setup() {
     const route = useRoute();
-    const router = useRouter()
+    const router = useRouter();
     const tabName = ref('all');
     const forms = reactive({
       keyword: '',
@@ -151,9 +151,16 @@ export default defineComponent({
       await getStat();
       await getList();
     });
-    const gotoDetail = (item:any)=>{
-      router.push({path:'/tenamtDataDetail',query:{id:route.query.id,schoolId:item.schoolId,schoolName:item.schoolName}})
-    }
+    const gotoDetail = (item: any) => {
+      router.push({
+        path: '/tenamtDataDetail',
+        query: {
+          id: route.query.id,
+          schoolId: item.schoolId,
+          schoolName: item.schoolName
+        }
+      });
+    };
     const getStat = async () => {
       try {
         const { data } = await request.post(
@@ -173,78 +180,85 @@ export default defineComponent({
     return () => (
       <div class={styles.tenantAllData}>
         {/* <OHeader isBack={false} /> */}
-        <div class={styles.topWrap}>
-          <div class={styles.topHead}>
-            <img src={topDot} class={styles.topDot} alt="" />
-            汇总数据
-          </div>
-          <div
-            class={styles.timerWrap}
-            onClick={() => {
-              forms.yearStatus = true;
-            }}>
-            {forms.yearName}年{' '}
-            <img
-              src={sanIcon}
-              class={[styles.sanIcon, forms.yearStatus ? styles.routeSan : '']}
-              alt=""
-            />
-          </div>
-        </div>
-        <div class={styles.cardWrap}>
-          <div class={[styles.schoolCard, styles.cardItem]}>
-            <div class={styles.cardNum}>
-              {' '}
-              {numeral(forms.statObj.schoolNum).format('0,0')}
-            </div>
-            <div class={styles.cardInfo}>
-              <img src={homeIcon} class={styles.cardInfoImg} alt="" />
-              学校数量
-            </div>
-            <div class={styles.cardLine}></div>
-          </div>
-          <div class={[styles.studentCard, styles.cardItem]}>
-            <div class={styles.cardNum}>
-              {' '}
-              {numeral(forms.statObj.registerNum).format('0,0')}
+        <MSticky position="top">
+          <div class={styles.top}>
+            <div class={styles.topWrap}>
+              <div class={styles.topHead}>
+                <img src={topDot} class={styles.topDot} alt="" />
+                汇总数据
+              </div>
+              {/* <div
+                class={styles.timerWrap}
+                onClick={() => {
+                  forms.yearStatus = true;
+                }}>
+                {forms.yearName}年{' '}
+                <img
+                  src={sanIcon}
+                  class={[
+                    styles.sanIcon,
+                    forms.yearStatus ? styles.routeSan : ''
+                  ]}
+                  alt=""
+                />
+              </div> */}
             </div>
-            <div class={styles.cardInfo}>
-              <img src={personIcon} class={styles.cardInfoImg} alt="" />
-              报名人数
+            <div class={styles.cardWrap}>
+              <div class={[styles.schoolCard, styles.cardItem]}>
+                <div class={styles.cardNum}>
+                  {' '}
+                  {numeral(forms.statObj.schoolNum).format('0,0')}
+                </div>
+                <div class={styles.cardInfo}>
+                  <img src={homeIcon} class={styles.cardInfoImg} alt="" />
+                  学校数量
+                </div>
+                <div class={styles.cardLine}></div>
+              </div>
+              <div class={[styles.studentCard, styles.cardItem]}>
+                <div class={styles.cardNum}>
+                  {' '}
+                  {numeral(forms.statObj.registerNum).format('0,0')}
+                </div>
+                <div class={styles.cardInfo}>
+                  <img src={personIcon} class={styles.cardInfoImg} alt="" />
+                  报名总人数
+                </div>
+                <div class={styles.cardLine}></div>
+              </div>
             </div>
-            <div class={styles.cardLine}></div>
-          </div>
-        </div>
-        <div class={styles.searchWrap}>
-          <div class={styles.searechInfo}>
-            <OSearch
-              class={styles.allDataWrap}
-              shape="round"
-              background="#F6F8F9"
-              inputBackground="white"
-              onSearch={val => {
-                forms.keyword = val;
-                forms.page = 1;
-                refreshing.value = true;
-                getList();
-              }}></OSearch>
-          </div>
+            <div class={styles.searchWrap}>
+              <div class={styles.searechInfo}>
+                <OSearch
+                  class={styles.allDataWrap}
+                  shape="round"
+                  background="#F6F8F9"
+                  inputBackground="white"
+                  placeholder='请输入学校名称'
+                  onSearch={val => {
+                    forms.keyword = val;
+                    forms.page = 1;
+                    refreshing.value = true;
+                    getList();
+                  }}></OSearch>
+              </div>
 
-          <div
-            class={styles.timerWrap}
-            onClick={() => (forms.perponStatus = true)}>
-            {forms.sortName}{' '}
-            <img
-              src={sanIcon}
-              class={[
-                styles.sanIcon,
-                forms.perponStatus ? styles.routeSan : ''
-              ]}
-              alt=""
-            />
+              <div
+                class={styles.timerWrap}
+                onClick={() => (forms.perponStatus = true)}>
+                {forms.sortName}{' '}
+                <img
+                  src={sanIcon}
+                  class={[
+                    styles.sanIcon,
+                    forms.perponStatus ? styles.routeSan : ''
+                  ]}
+                  alt=""
+                />
+              </div>
+            </div>
           </div>
-        </div>
-
+        </MSticky>
         <div class={styles.schoolList}>
           {showContact.value ? (
             <OFullRefresh
@@ -257,7 +271,9 @@ export default defineComponent({
                 finished-text=" "
                 onLoad={getList}>
                 {list.value.map((item: any) => (
-                  <div class={styles.schoolItem} onClick={()=>gotoDetail(item)}>
+                  <div
+                    class={styles.schoolItem}
+                    onClick={() => gotoDetail(item)}>
                     <div class={styles.schoolNameWrap}>
                       <p class={styles.title}>学校名称</p>
                       <p class={styles.schoolName}>{item.schoolName}</p>

src/views/tenantAllData/tenamtDataDetail.tsx

@@ -55,10 +55,10 @@ export default defineComponent({
       } as any,
       perponStatus: false,
       sortId: 'desc',
-      sortName: '人数降序',
+      sortName: '时间降序',
       sortList: [
-        { value: 'desc', text: '人数降序' },
-        { value: 'asc', text: '人数升序' }
+        { value: 'desc', text: '时间降序' },
+        { value: 'asc', text: '时间升序' }
       ] as any,
       page: 1,
       rows: 20,
@@ -176,6 +176,8 @@ export default defineComponent({
     return () => (
       <div class={styles.tenantAllData}>
         {/* <OHeader /> */}
+        <MSticky position="top">
+          <div class={styles.top}>
         <div class={styles.topWrap}>
           <div class={styles.topHeadSchool} onClick={()=>forms.classStatus= true}>
 
@@ -186,7 +188,7 @@ export default defineComponent({
               alt=""
             />
           </div>
-          <div
+          {/* <div
             class={styles.timerWrap}
             onClick={() => {
               forms.yearStatus = true;
@@ -197,7 +199,7 @@ export default defineComponent({
               class={[styles.sanIcon, forms.yearStatus ? styles.routeSan : '']}
               alt=""
             />
-          </div>
+          </div> */}
         </div>
         <div class={styles.cardWrap}>
           {/* <div class={[styles.schoolCard, styles.cardItem]}>
@@ -230,6 +232,7 @@ export default defineComponent({
               shape="round"
               background="#F6F8F9"
               inputBackground="white"
+              placeholder='请输入学员名称'
               onSearch={val => {
                 forms.keyword = val;
                 forms.page = 1;
@@ -252,7 +255,8 @@ export default defineComponent({
             />
           </div>
         </div>
-
+        </div>
+         </MSticky>
         <div class={styles.schoolList}>
           {showContact.value ? (
             <OFullRefresh