|
@@ -64,7 +64,8 @@ const pageInfo = { pageNo: 1, pageSize: 20}
|
|
const items = ref([])
|
|
const items = ref([])
|
|
const total = ref(0)
|
|
const total = ref(0)
|
|
let routeQuery = (route?.query && route.query && Object.keys(route?.query).length) ? reactive(route.query) : reactive({})
|
|
let routeQuery = (route?.query && route.query && Object.keys(route?.query).length) ? reactive(route.query) : reactive({})
|
|
-// provide('routeQuery', routeQuery)
|
|
|
|
|
|
+// if (routeQuery?.length) router.replace({ path: route.path, routeQuery })
|
|
|
|
+// console.log('1', routeQuery)
|
|
|
|
|
|
const headSearchText = ref(routeQuery?.content || '')
|
|
const headSearchText = ref(routeQuery?.content || '')
|
|
|
|
|
|
@@ -96,20 +97,22 @@ const getData = async () => {
|
|
})
|
|
})
|
|
total.value = number
|
|
total.value = number
|
|
}
|
|
}
|
|
-getData() // 不使用cityFilter情况下
|
|
|
|
|
|
+getData()
|
|
|
|
|
|
-// 页面刷新
|
|
|
|
-if (routeQuery && Object.keys(routeQuery).length) getData()
|
|
|
|
|
|
+// // 页面刷新
|
|
|
|
+// if (routeQuery && Object.keys(routeQuery).length) getData()
|
|
|
|
+// debugger
|
|
|
|
|
|
// 参数改变后刷新路由,触发数据刷新
|
|
// 参数改变后刷新路由,触发数据刷新
|
|
const updateRouter = () => {
|
|
const updateRouter = () => {
|
|
- let query = {}
|
|
|
|
|
|
+ let query = { index: 1 }
|
|
if (Object.keys(routeQuery).length) {
|
|
if (Object.keys(routeQuery).length) {
|
|
query = Object.keys(routeQuery).reduce((obj, key) => {
|
|
query = Object.keys(routeQuery).reduce((obj, key) => {
|
|
if (routeQuery[key] !== '') obj[key] = routeQuery[key]
|
|
if (routeQuery[key] !== '') obj[key] = routeQuery[key]
|
|
return obj
|
|
return obj
|
|
}, {})
|
|
}, {})
|
|
}
|
|
}
|
|
|
|
+ query.index = query.index ? (query.index-0)+1 : 1
|
|
router.push({ path: route.path, query })
|
|
router.push({ path: route.path, query })
|
|
pageInfo.pageNo = 1
|
|
pageInfo.pageNo = 1
|
|
getData()
|
|
getData()
|