修改审核样式

统计添加学年排序

src/views/tenantAllData/index.module.less

@@ -296,6 +296,13 @@
       font-weight: 500;
       color: #333333;
       line-height: 20px;
+
+      span {
+        font-weight: 400;
+        color: #777777;
+        line-height: 17px;
+        font-size: 12px;
+      }
     }
 
     .personNum {
@@ -656,4 +663,4 @@
       margin-left: 15px;
     }
   }
-}
+}

src/views/tenantAllData/tenantDataSchool.tsx

@@ -1,39 +1,26 @@
 import { defineComponent, onMounted, reactive, ref } from 'vue';
 import styles from './index.module.less';
-import {
-  Cell,
-  CellGroup,
-  Col,
-  List,
-  Picker,
-  Popup,
-  Row,
-  Tab,
-  Tabs,
-  DatePicker,
-  Button,
-  Popover
-} from 'vant';
+import { List, Popup, DatePicker, Popover } from 'vant';
 import MSticky from '@/components/m-sticky';
 import personIcon from './images/personIcon.png';
 import homeIcon from './images/icon-class.png';
 import memberIcon from './images/memberIcon.png';
 import memberRateIcon from './images/memberRateIcon.png';
-import sanIcon from './images/san.png';
+// import sanIcon from './images/san.png';
 import iconArrow from './images/icon-arrow.png';
 import iconArrowActive from './images/icon-arrow-active.png';
 import request from '@/helpers/request';
 import topDot from './images/topDot.png';
 import { useRoute, useRouter } from 'vue-router';
-import { moneyFormat, numberFormat } from '@/helpers/utils';
+// import { moneyFormat, numberFormat } from '@/helpers/utils';
 import OFullRefresh from '@/components/m-full-refresh';
 import OEmpty from '@/components/m-empty';
-import arrowIcon from './images/arrowIcon.png';
-import OHeader from '@/components/m-header';
+// import arrowIcon from './images/arrowIcon.png';
+// import OHeader from '@/components/m-header';
 import OSearch from '@/components/m-search';
 import numeral from 'numeral';
-import MQrcode from '@/components/m-qrcode';
-import html2canvas from 'html2canvas';
+// import MQrcode from '@/components/m-qrcode';
+// import html2canvas from 'html2canvas';
 import MWxTip from '@/components/m-wx-tip';
 export default defineComponent({
   name: 'tenant-apply-data',
@@ -56,7 +43,7 @@ export default defineComponent({
         registerMemberShipNum: 0
       } as any,
       perponStatus: false,
-      sortKey: 'CLASS' as 'CLASS' | 'MEMBER',
+      sortKey: 'CLASS' as 'CLASS' | 'MEMBER' | 'GRADEYEAR',
       sortId: 'desc',
       sortName: '报名人数降序',
       sortType: 'desc',
@@ -64,7 +51,9 @@ export default defineComponent({
         { value: 'desc', text: '报名人数降序' },
         { value: 'asc', text: '报名人数升序' },
         { value: 'mdesc', text: '会员人数降序' },
-        { value: 'masc', text: '会员人数升序' }
+        { value: 'masc', text: '会员人数升序' },
+        { value: 'gdesc', text: '按学年降序' },
+        { value: 'gasc', text: '按学年升序' }
       ] as any,
       page: 1,
       rows: 20,
@@ -353,6 +342,16 @@ export default defineComponent({
                                 forms.sortKey = 'MEMBER';
                               }
 
+                              if (selectedOption.value === 'gdesc') {
+                                forms.sortId = 'desc';
+                                forms.sortKey = 'GRADEYEAR';
+                              }
+
+                              if (selectedOption.value === 'gasc') {
+                                forms.sortId = 'asc';
+                                forms.sortKey = 'GRADEYEAR';
+                              }
+
                               forms.sortType = selectedOption.value;
                               forms.sortName = selectedOption.text;
                               refreshing.value = true;
@@ -386,7 +385,10 @@ export default defineComponent({
                   <div class={styles.schoolItem}>
                     <div class={styles.schoolNameWrap}>
                       {/* <p class={styles.title}>学校名称</p> */}
-                      <p class={styles.schoolName}>{item.classGroupName}</p>
+                      <p class={styles.schoolName}>
+                        {item.classGroupName}
+                        {item.gradeYear && <span>({item.gradeYear}学年)</span>}
+                      </p>
                     </div>
                     <div class={styles.schoolCountWrap}>
                       <div>

vite.config.ts

@@ -16,7 +16,7 @@ function resolve(dir: string) {
 // const proxyUrl = 'https://test.lexiaoya.cn/';
 // const proxyUrl = 'https://kt.colexiu.com/';
 // const proxyUrl = 'http://192.168.3.143:7093/';
-const proxyUrl = 'https://test.kt.colexiu.com/';
+const proxyUrl = 'https://dev.kt.colexiu.com/';
 export default defineConfig({
   base: './',
   plugins: [