refactor: 重构模型页面组件和路由结构

components/model-components/RecommendedColumnsV2.vue

@@ -1,17 +1,17 @@
 <template>
-  <div class="relative mt-34px w-100%">
+  <div class="relative mt-[34px] w-[100%]">
     <KlTabBar v-model="query.source" :data="tabBar" />
-    <div class="absolute right-0px top-10px text-16px text-[#999999] font-normal"
+    <div class="absolute right-[0px] top-[10px] text-[16px] text-[#999999] font-normal"
-      >共<span class="color-#1A65FF">{{ result.total }}</span
+      >共<span class="color-[#1A65FF]">{{ result?.total }}</span
       >个筛选结果</div
     >
-    <div class="content mt-10px">
+    <div class="content mt-[10px]">
       <el-row :gutter="20">
-        <el-col v-for="(item, index) in result.list" :key="index" :span="6">
+        <el-col v-for="(item, index) in result?.list" :key="index" :span="6">
           <CardPicture :item-info="item" />
         </el-col>
       </el-row>
-      <el-empty v-if="!result.list.length" :image="emptyImg"></el-empty>
+      <el-empty v-if="!result?.list.length" :image="emptyImg"></el-empty>
     </div>
   </div>
 </template>
@@ -26,14 +26,14 @@
   const query = defineModel<pageReq>('modelValue', {
     required: true,
   })
-  const result = defineModel<pageRes>('result', {
+  const result = defineModel<pageRes| null>('result', {
     required: true,
   })
 
   const tabBar = ref([
     {
       label: '模型推荐',
-      value: '',
+      value: -1,
     },
     {
       label: '原创模型',

pages/model/[projectType]/[pageNo]/[pageSize]/[[editions]]/[[source]].vue

@@ -0,0 +1,125 @@
+<template>
+  <!-- 导航 -->
+  <KlNavTab active="模型" :type="3" />
+  <div class="ma-auto w-[1440px]">
+    <!-- 图纸分类 -->
+    <KlWallpaperCategory v-model="query" v-model:level="level" :type="3" />
+    <!-- 推荐栏目 -->
+    <RecommendedColumnsV2 v-model="query" v-model:result="result"></RecommendedColumnsV2>
+    <!-- 精选专题 -->
+    <!-- <FeaturedSpecials></FeaturedSpecials> -->
+    <!-- 分页 -->
+    <div class="mt-[10px] flex justify-center">
+      <el-pagination
+        v-model:current-page="query.pageNo"
+        v-model:page-size="query.pageSize"
+        :page-sizes="[12, 24, 48]"
+        :total="result?.total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleClickSize"
+        @current-change="handeClickCurrent"
+      />
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+  import KlNavTab from '~/components/kl-nav-tab/index.vue'
+  import KlWallpaperCategory from '~/components/kl-wallpaper-category/index.vue'
+  import RecommendedColumnsV2 from '~/components/model-components/RecommendedColumnsV2.vue'
+  // import FeaturedSpecials from './components/FeaturedSpecials.vue'
+  import { useRoute } from 'vue-router'
+  import { reactive, watch, ref } from 'vue'
+  import { page } from '~/api/upnew/index'
+  import { getDictTree } from '~/api/home/index'
+  import type { pageRes, pageReq } from '~/api/upnew/types'
+  const route = useRoute()
+  const projectType = computed(() => (route.params?.projectType ? route.params?.projectType : ''))
+  const pageNo = computed(() => Number(route.params?.pageNo))
+  const pageSize = computed(() => Number(route.params?.pageSize))
+  const editions = computed(() => (route.params?.editions ? route.params?.editions : ''))
+  const source = computed(() => (route.params?.source ? Number(route.params?.source) : ''))
+
+  console.log('route.params----', route.params)
+
+  const level = ref(
+    route.query?.valuelevel
+      ? JSON.parse(route.query.valuelevel as string)
+      : [
+          {
+            id: -1,
+            name: '模型库',
+            isChildren: false,
+          },
+        ]
+  )
+  const keywords = ref((route.query?.valuekeywords as string) || '')
+
+  const query = ref<pageReq>({
+    pageNo: pageNo.value || 1,
+    pageSize: pageSize.value || 12,
+    projectType: projectType.value || '-1',
+    editions: editions.value || '-1',
+    source: source.value || -1,
+    type: 3,
+    title: keywords.value,
+  })
+  // const result = reactive<pageRes>({
+  //   list: [],
+  //   total: 0,
+  // })
+
+  // 如果id存在，则设置projectType
+  if (level.value.length) {
+    // query.value.projectType = level.value[level.value.length - 1].id || ''
+  }
+
+  const handleClickSize = (val: number) => {
+    query.value.pageSize = val
+    // getPage()
+    navigateTo(`/model/${query.value.projectType}/${query.value.pageNo}/${val}/${query.value.editions}/${query.value.source}`)
+  }
+
+  const handeClickCurrent = (val: number) => {
+    query.value.pageNo = val
+    // getPage()
+    navigateTo(`/model/${query.value.projectType}/${val}/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
+  }
+
+  const { data: result, refresh: getPage } = useAsyncData(
+    `draw-page-list-${query.value.projectType}-${query.value.editions}-${query.value.source}-${query.value.pageNo}-${query.value.pageSize}`,
+    async () => {
+      const res = await page({
+        ...query.value,
+        editions: query.value.editions === '-1' ? '' : query.value.editions,
+        source: query.value.source === -1 ? '' : query.value.source,
+        projectType: query.value.projectType === '-1' ? '' : query.value.projectType,
+      })
+      return res.data
+    },
+    {
+      immediate: true,
+    }
+  )
+  // const getPage = () => {
+  //   page(query).then((res) => {
+  //     const { data, code } = res
+  //     if (code === 0) {
+  //       result.list = data.list
+  //       result.total = data.total
+  //     }
+  //   })
+  // }
+
+  watch([() => query.value.projectType, () => query.value.editions, () => query.value.source], (val) => {
+    if (val) {
+      navigateTo(`/model/${query.value.projectType}/1/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
+    }
+  })
+</script>
+<style lang="scss" scoped>
+  :deep(.el-pagination) {
+    .el-input__inner {
+      text-align: center !important;
+    }
+  }
+</style>

pages/model/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 导航 -->
   <KlNavTab active="模型" :type="3" />
-  <div class="ma-auto w-1440px">
+  <div class="ma-auto w-[1440px]">
     <!-- 图纸分类 -->
     <KlWallpaperCategory v-model="query" v-model:level="level" :type="3" />
     <!-- 推荐栏目 -->
@@ -9,12 +9,12 @@
     <!-- 精选专题 -->
     <!-- <FeaturedSpecials></FeaturedSpecials> -->
     <!-- 分页 -->
-    <div class="mt-10px flex justify-center">
+    <div class="mt-[10px] flex justify-center">
       <el-pagination
         v-model:current-page="query.pageNo"
         v-model:page-size="query.pageSize"
         :page-sizes="[12, 24, 48]"
-        :total="result.total"
+        :total="result?.total"
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="handleChangeSize"
         @current-change="handleChangeCurrent"
@@ -25,7 +25,7 @@
 <script setup lang="ts">
   import KlNavTab from '~/components/kl-nav-tab/index.vue'
   import KlWallpaperCategory from '~/components/kl-wallpaper-category/index.vue'
-  import RecommendedColumnsV2 from './components/RecommendedColumnsV2.vue'
+  import RecommendedColumnsV2 from '~/components/model-components/RecommendedColumnsV2.vue'
   // import FeaturedSpecials from './components/FeaturedSpecials.vue'
 
   import { reactive, watch, ref } from 'vue'
@@ -38,57 +38,76 @@
       ? JSON.parse(route.query.level as string)
       : [
           {
-            id: '0',
+            id: -1,
             name: '模型库',
             isChildren: false,
           },
         ]
   )
 
-  const query = reactive<pageReq>({
+  const query = ref<pageReq>({
     pageNo: 1,
     pageSize: 12,
-    projectType: '',
+    projectType: '-1',
-    editions: '',
+    editions: '-1',
-    source: '',
+    source: -1,
     type: 3,
   })
-  const result = reactive<pageRes>({
+  // const result = reactive<pageRes>({
-    list: [],
+  //   list: [],
-    total: 0,
+  //   total: 0,
-  })
+  // })
 
   // 如果id存在，则设置projectType
   if (level.value.length) {
-    query.projectType = level.value[level.value.length - 1].id || ''
+    // query.projectType = level.value[level.value.length - 1].id || ''
   }
 
-  const getPage = () => {
+  const { data: result } = useAsyncData(
-    page(query).then((res) => {
+    `draw-page-list-${query.value.projectType}-${query.value.editions}-${query.value.source}-${query.value.pageNo}-${query.value.pageSize}`,
-      const { data, code } = res
+    async () => {
-      if (code === 0) {
+      const res = await page({
-        result.list = data.list
+        ...query.value,
-        result.total = data.total
+        editions: query.value.editions === '-1' ? '' : query.value.editions,
-      }
+        source: query.value.source === -1 ? '' : query.value.source,
-    })
+        projectType: query.value.projectType === '-1' ? '' : query.value.projectType,
-  }
+      })
+      return res.data
+    },
+    {
+      immediate: true,
+    }
+  )
 
-  getPage()
+  // const getPage = () => {
+  //   page(query).then((res) => {
+  //     const { data, code } = res
+  //     if (code === 0) {
+  //       result.list = data.list
+  //       result.total = data.total
+  //     }
+  //   })
+  // }
 
-  const handleChangeSize = (size: number) => {
+  // getPage()
-    query.pageSize = size
+
-    query.pageNo = 1
+  const handleChangeSize = (val: number) => {
-    getPage()
+    query.value.pageSize = val
+    // query.pageNo = 1
+    // getPage()
+    navigateTo(`/model/${query.value.projectType}/${query.value.pageNo}/${val}/${query.value.editions}/${query.value.source}`)
   }
 
   const handleChangeCurrent = (current: number) => {
-    query.pageNo = current
+    query.value.pageNo = current
-    getPage()
+    // getPage()
+    navigateTo(`/model/${query.value.projectType}/${current}/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
   }
 
-  watch([() => query.projectType, () => query.editions, () => query.source], (val) => {
+  watch([() => query.value.projectType, () => query.value.editions, () => query.value.source], (val) => {
     if (val) {
-      getPage()
+      // getPage()
+      navigateTo(`/model/${query.value.projectType}/1/${query.value.pageSize}/${query.value.editions}/${query.value.source}`)
     }
   })
 </script>