Sfoglia il codice sorgente

college list - define adjustment

abpcoder 6 giorni fa
parent
commit
cbd8254648

+ 6 - 4
src/pagesOther/pages/university/index/components/college-list.vue

@@ -3,7 +3,7 @@
         <z-paging ref="paging" v-model="list" @query="handleQuery">
             <template #top>
                 <slot name="top"/>
-                <college-conditions-picker :options="filter"/>
+                <college-conditions-picker :options="filterOptions"/>
                 <ie-search v-model="queryParams.name" placeholder="输入院校名称" @search="handleSearch"
                            @clear="handleSearch"/>
             </template>
@@ -31,10 +31,10 @@ const props = withDefaults(defineProps<{
 })
 const emits = defineEmits(['item-click'])
 
-const {transferTo} = useTransferPage()
+const {prevData, transferTo} = useTransferPage()
 const paging = ref<ZPagingInstance>()
 const list = ref<University[]>([])
-const filter = ref({})
+const filterOptions = ref<Record<string, any>>({})
 const queryParams = ref<UniversityQueryDto>({
     name: '',
     features: [],
@@ -75,7 +75,9 @@ watch([
 
 onMounted(async () => {
     const {data} = await getUniversityFilters()
-    filter.value = data
+    filterOptions.value = data
+    // accept default query parameters
+    if (prevData.tier) queryParams.value.tier = [prevData.tier]
 })
 
 </script>

+ 1 - 1
src/pagesOther/pages/university/index/components/plus/college-conditions-picker.vue

@@ -7,7 +7,7 @@ import {UNIVERSITY_FILTER} from "@/types/injectionSymbols";
 import {UniversityQueryDto} from "@/types/university";
 
 const props = defineProps<{
-    options: Record<string, string[]>;
+    options: Record<string, any>; // any: string[] | {id: name}
 }>()
 const filter = inject(UNIVERSITY_FILTER) || ref({} as UniversityQueryDto)
 

+ 1 - 1
tailwind.config.js

@@ -19,7 +19,7 @@ module.exports = {
     theme: {
         // 间距
         spacing: {
-            ...generateSize(500, "rpx"),
+            ...generateSize(600, "rpx"),
         },
         extend: {
             borderWidth: generateSize(100, "rpx"),